Bug 995519. Enable overlay scrollbars on root scrollframes in root content documents. r=roc
☠☠ backed out by d96127c37431 ☠ ☠
authorTimothy Nikkel <tnikkel@gmail.com>
Tue, 15 Jul 2014 00:09:24 -0500
changeset 215892 2b29602d985075f16e4386b306e28173f1ad0dc6
parent 215891 f8f7b0e89bcfdef690759c38b266ab1fb1002595
child 215893 3fadc02e2e841c3bb5f6fd7db6fc4fa9593817fa
push id515
push userraliiev@mozilla.com
push dateMon, 06 Oct 2014 12:51:51 +0000
treeherdermozilla-release@267c7a481bef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc
bugs995519
milestone33.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 995519. Enable overlay scrollbars on root scrollframes in root content documents. r=roc
layout/generic/nsGfxScrollFrame.cpp
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -2431,21 +2431,16 @@ ScrollFrameHelper::BuildDisplayList(nsDi
   if (aBuilder->GetIgnoreScrollFrame() == mOuter || IsIgnoringViewportClipping()) {
 
     // 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 &&
       nsLayoutUtils::GetDisplayPort(mOuter->GetContent()) &&
       !aBuilder->IsForEventDelivery();
-    // For now, don't add them for display root documents, cause we've never
-    // had them there.
-    if (aBuilder->RootReferenceFrame()->PresContext() == mOuter->PresContext()) {
-      addScrollBars = false;
-    }
 
     if (addScrollBars) {
       // Add classic scrollbars.
       AppendScrollPartsTo(aBuilder, aDirtyRect, aLists, createLayersForScrollbars,
                           false);
     }
 
     // Don't clip the scrolled child, and don't paint scrollbars/scrollcorner.