Bug 1154478 - Really force-enable the event-regions code when APZ is enabled. r=tn
authorKartikaya Gupta <kgupta@mozilla.com>
Wed, 22 Apr 2015 10:16:27 -0400
changeset 240504 48eaa5547dcc2c352c2f933b2abe303282f7d4a1
parent 240503 70d3946ee3e98759c4a6d79fcdad93456191f2ac
child 240505 c646f3bfcbd95ca880264942c99a3eb8bda03c43
push id58840
push userkgupta@mozilla.com
push dateWed, 22 Apr 2015 14:17:23 +0000
treeherdermozilla-inbound@c646f3bfcbd9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstn
bugs1154478
milestone40.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 1154478 - Really force-enable the event-regions code when APZ is enabled. r=tn
layout/generic/nsGfxScrollFrame.cpp
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -2996,17 +2996,17 @@ ScrollFrameHelper::BuildDisplayList(nsDi
 
   if (shouldBuildLayer) {
     // Make sure that APZ will dispatch events back to content so we can create
     // a displayport for this frame. We'll add the item later on.
     nsDisplayLayerEventRegions* inactiveRegionItem = nullptr;
     if (aBuilder->IsPaintingToWindow() &&
         !mShouldBuildScrollableLayer &&
         shouldBuildLayer &&
-        gfxPrefs::LayoutEventRegionsEnabled())
+        aBuilder->IsBuildingLayerEventRegions())
     {
       inactiveRegionItem = new (aBuilder) nsDisplayLayerEventRegions(aBuilder, mScrolledFrame);
       inactiveRegionItem->AddInactiveScrollPort(mScrollPort + aBuilder->ToReferenceFrame(mOuter));
     }
 
     // In case we are not using displayport or the nsDisplayScrollLayers are
     // flattened during visibility computation, we still need to export the
     // metadata about this scroll box to the compositor process.