Backed out changeset 452617569aeb (bug 1278294) for build bustage CLOSED TREE
authorWes Kocher <wkocher@mozilla.com>
Tue, 07 Jun 2016 14:48:22 -0700
changeset 300932 acc2acfacebd8f54c2d0afb22972936e16ec3dbd
parent 300931 376b59c84c6f652ac061a66a2c20899eb2476b3c
child 300933 707ad126d07645605f523c9da4b8e14cc7ad75a4
push id78147
push userkwierso@gmail.com
push dateTue, 07 Jun 2016 21:48:32 +0000
treeherdermozilla-inbound@acc2acfacebd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1278294
milestone50.0a1
backs out452617569aebabeb6da039064460347114a7ba00
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
Backed out changeset 452617569aeb (bug 1278294) for build bustage CLOSED TREE
accessible/base/Logging.cpp
accessible/generic/DocAccessible.cpp
--- a/accessible/base/Logging.cpp
+++ b/accessible/base/Logging.cpp
@@ -627,30 +627,31 @@ 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::aExtraFlags)) {
+  if (IsEnabledAll(logging::eTree | logging::eVerbose)) {
     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,18 +1851,26 @@ 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
-    logging::TreeInfo("process content removal", 0,
-                      "container", aContainer, "child", aChildNode);
+  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();
   }
 #endif
 
   TreeMutation mt(aContainer);
   if (child) {
     mt.BeforeRemoval(child);
     MOZ_ASSERT(aContainer == child->Parent(), "Wrong parent");
     aContainer->RemoveChild(child);