Bug 606125 followup: Reattach comment to the code that it was commenting (and rewrap it to a shorter line length too). No review.
authorL. David Baron <dbaron@dbaron.org>
Mon, 01 Jul 2013 15:22:24 -0700
changeset 137071 80ad04db9f3ce0fe92c8913154c79c0144dc6aa3
parent 137070 0f10e9f063239d026f8df16e1ebf713908ad54c8
child 137072 95e83b0f7cb28bcfbdb4782ea374810ad3399218
push id24909
push userkhuey@mozilla.com
push dateTue, 02 Jul 2013 16:45:38 +0000
treeherdermozilla-central@23ce4eab8fb1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs606125
milestone25.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 606125 followup: Reattach comment to the code that it was commenting (and rewrap it to a shorter line length too). No review.
layout/base/nsFrameManager.cpp
--- a/layout/base/nsFrameManager.cpp
+++ b/layout/base/nsFrameManager.cpp
@@ -1479,17 +1479,23 @@ nsFrameManager::ReResolveStyleContext(ns
             NS_UpdateHint(aMinChange, nsChangeHint_ReconstructFrame);
             aChangeList->AppendChange(aFrame, content,
                                       nsChangeHint_ReconstructFrame);
           }
         }      
       }
     }
 
+    // There is no need to waste time crawling into a frame's children
+    // on a frame change.  The act of reconstructing frames will force
+    // new style contexts to be resolved on all of this frame's
+    // descendants anyway, so we want to avoid wasting time processing
+    // style contexts that we're just going to throw away anyway. - dwh
     if (!(aMinChange & nsChangeHint_ReconstructFrame)) {
+
       DesiredA11yNotifications kidsDesiredA11yNotification =
         aDesiredA11yNotifications;
 #ifdef ACCESSIBILITY
       A11yNotificationType ourA11yNotification = eDontNotify;
       // Notify a11y for primary frame only if it's a root frame of visibility
       // changes or its parent frame was hidden while it stays visible and
       // it is not inside a {ib} split or is the first frame of {ib} split.
       if (nsIPresShell::IsAccessibilityActive() &&
@@ -1519,21 +1525,16 @@ nsFrameManager::ReResolveStyleContext(ns
           // Notify a11y that element stayed visible while its parent was
           // hidden.
           aVisibleKidsOfHiddenElement.AppendElement(aFrame->GetContent());
           kidsDesiredA11yNotification = eSkipNotifications;
         }
       }
 #endif
 
-      // There is no need to waste time crawling into a frame's children on a frame change.
-      // The act of reconstructing frames will force new style contexts to be resolved on all
-      // of this frame's descendants anyway, so we want to avoid wasting time processing
-      // style contexts that we're just going to throw away anyway. - dwh
-
       // now do children
       nsIFrame::ChildListIterator lists(aFrame);
       for (TreeMatchContext::AutoAncestorPusher
              pushAncestor(!lists.IsDone(),
                           aTreeMatchContext,
                           content && content->IsElement() ? content->AsElement()
                                                           : nullptr);
            !lists.IsDone(); lists.Next()) {