Bug 967587 - Back out this hunk of bug 946502 part 3 until we can fix the regressions. r=mattwoodrow, a=sledru
authorRobert O'Callahan <robert@ocallahan.org>
Fri, 07 Feb 2014 13:17:52 +1300
changeset 183118 17dccd1aea3765c7df43f743eb293b9b0ccd4d3a
parent 183117 746c1ac50aa02ff92125d6840096ce07a6a0df83
child 183119 895357c0cf5c19f54b39c446c8dcc8ffcf202820
push id3343
push userffxbld
push dateMon, 17 Mar 2014 21:55:32 +0000
treeherdermozilla-beta@2f7d3415f79f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmattwoodrow, sledru
bugs967587, 946502
milestone29.0a2
Bug 967587 - Back out this hunk of bug 946502 part 3 until we can fix the regressions. r=mattwoodrow, a=sledru
layout/base/FrameLayerBuilder.cpp
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -2153,24 +2153,16 @@ ContainerState::FindThebesLayerFor(nsDis
     nsRefPtr<ThebesLayer> layer =
       CreateOrRecycleThebesLayer(aActiveScrolledRoot, aItem->ReferenceFrame(), aTopLeft);
 
     thebesLayerData = new ThebesLayerData();
     mThebesLayerDataStack.AppendElement(thebesLayerData);
     thebesLayerData->mLayer = layer;
     thebesLayerData->mAnimatedGeometryRoot = aActiveScrolledRoot;
     thebesLayerData->mReferenceFrame = aItem->ReferenceFrame();
-    if (!aActiveScrolledRoot->GetParent() &&
-        nsLayoutUtils::ViewportHasDisplayPort(aActiveScrolledRoot->PresContext())) {
-      // The active scrolled root is the viewport, so this is background-attachment:fixed
-      // or fixed-pos elements or something like that. Async scrolling may
-      // do magic things to move these layers, so don't allow any regular content
-      // to be pushed to layers below them; that might turn out to be incorrect.
-      thebesLayerData->SetAllDrawingAbove();
-    }
 
     NS_ASSERTION(!mNewChildLayers.Contains(layer), "Layer already in list???");
     *mNewChildLayers.AppendElement() = layer.forget();
   } else {
     thebesLayerData = mThebesLayerDataStack[lowestUsableLayerWithScrolledRoot];
   }
 
   return thebesLayerData;