Bug 1204535 - Relocate comment to go with the line of code it's commenting. r=tn
authorKartikaya Gupta <kgupta@mozilla.com>
Tue, 15 Sep 2015 16:09:35 -0400
changeset 296982 f0f0bf01b3a805de8d931dea6e9ad13405d7a38f
parent 296981 c60510f350b18105795c213502e78640ae2e3a64
child 296983 8d05eefc5da2eb9ddaaa9308db5634d023d4f7ad
push id962
push userjlund@mozilla.com
push dateFri, 04 Dec 2015 23:28:54 +0000
treeherdermozilla-release@23a2d286e80f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstn
bugs1204535
milestone43.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 1204535 - Relocate comment to go with the line of code it's commenting. r=tn
layout/generic/nsGfxScrollFrame.cpp
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -2816,29 +2816,29 @@ ScrollFrameHelper::BuildDisplayList(nsDi
   bool createLayersForScrollbars = mIsRoot &&
     mOuter->PresContext()->IsRootContentDocument();
 
   if (aBuilder->GetIgnoreScrollFrame() == mOuter || IsIgnoringViewportClipping()) {
     // Root scrollframes have FrameMetrics and clipping on their container
     // layers, so don't apply clipping again.
     mAddClipRectToLayer = false;
 
-    // If we are a root scroll frame that has a display port we want to add
-    // scrollbars, they will be children of the scrollable layer, but they get
-    // adjusted by the APZC automatically.
     bool usingDisplayPort = aBuilder->IsPaintingToWindow() &&
         nsLayoutUtils::GetDisplayPort(mOuter->GetContent());
 
     if (usingDisplayPort) {
       // There is a display port for this frame, so we want to appear as having
       // active scrolling, so that animated geometry roots are assigned correctly.
       mShouldBuildScrollableLayer = true;
       mIsScrollableLayerInRootContainer = true;
     }
 
+    // If we are a root scroll frame that has a display port we want to add
+    // scrollbars, they will be children of the scrollable layer, but they get
+    // adjusted by the APZC automatically.
     bool addScrollBars = mIsRoot && usingDisplayPort && !aBuilder->IsForEventDelivery();
 
     if (addScrollBars) {
       // Add classic scrollbars.
       AppendScrollPartsTo(aBuilder, aDirtyRect, aLists, usingDisplayPort,
                           createLayersForScrollbars, false);
     }