Bug 1278294 - UpdateTreeOnRemoval should use logging::TreeInfo, part2, r=yzen
☠☠ backed out by acc2acfacebd ☠ ☠
authorAlexander Surkov <surkov.alexander@gmail.com>
Tue, 07 Jun 2016 17:21:59 -0400
changeset 300926 452617569aebabeb6da039064460347114a7ba00
parent 300925 81bdc81c20b6888ec0ea39fecf4c6fd90a62cf83
child 300927 2836ccae457cfa6e3ecdc9a838274243bf4875ab
push id78141
push usersurkov.alexander@gmail.com
push dateTue, 07 Jun 2016 21:23:21 +0000
treeherdermozilla-inbound@452617569aeb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersyzen
bugs1278294
milestone50.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1278294 - UpdateTreeOnRemoval should use logging::TreeInfo, part2, r=yzen
accessible/base/Logging.cpp
accessible/generic/DocAccessible.cpp
--- a/accessible/base/Logging.cpp
+++ b/accessible/base/Logging.cpp
@@ -627,31 +627,30 @@ logging::TreeInfo(const char* aMsg, uint
       while ((descr = va_arg(vl, const char*))) {
         AccessibleInfo(descr, va_arg(vl, Accessible*));
       }
     }
     else {
       MsgBegin("TREE", aMsg);
     }
     va_end(vl);
-
     MsgEnd();
 
     if (aExtraFlags & eStack) {
       Stack();
     }
   }
 }
 
 void
 logging::TreeInfo(const char* aMsg, uint32_t aExtraFlags,
                   const char* aMsg1, Accessible* aAcc,
                   const char* aMsg2, nsINode* aNode)
 {
-  if (IsEnabledAll(logging::eTree | logging::eVerbose)) {
+  if (IsEnabledAll(logging::eTree | logging::aExtraFlags)) {
     MsgBegin("TREE", "%s; doc: %p", aMsg, aAcc ? aAcc->Document() : nullptr);
     AccessibleInfo(aMsg1, aAcc);
     Accessible* acc = aAcc->Document()->GetAccessible(aNode);
     if (acc) {
       AccessibleInfo(aMsg2, acc);
     }
     else {
       Node(aMsg2, aNode);
--- a/accessible/generic/DocAccessible.cpp
+++ b/accessible/generic/DocAccessible.cpp
@@ -1851,26 +1851,18 @@ DocAccessible::FireEventsOnInsertion(Acc
 }
 
 void
 DocAccessible::UpdateTreeOnRemoval(Accessible* aContainer, nsIContent* aChildNode)
 {
   // If child node is not accessible then look for its accessible children.
   Accessible* child = GetAccessible(aChildNode);
 #ifdef A11Y_LOG
-  if (logging::IsEnabled(logging::eTree)) {
-    logging::MsgBegin("TREE", "process content removal");
-    logging::Node("container", aContainer->GetNode());
-    logging::Node("child", aChildNode);
-    if (child)
-      logging::Address("child", child);
-    else
-      logging::MsgEntry("child accessible: null");
-
-    logging::MsgEnd();
+    logging::TreeInfo("process content removal", 0,
+                      "container", aContainer, "child", aChildNode);
   }
 #endif
 
   TreeMutation mt(aContainer);
   if (child) {
     mt.BeforeRemoval(child);
     MOZ_ASSERT(aContainer == child->Parent(), "Wrong parent");
     aContainer->RemoveChild(child);