Backed out changeset c413b946dbc4 (bug 1022612)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Tue, 15 Jul 2014 10:30:09 +0200
changeset 215973 69000c2fca489e4584db35315dd27baf3a1d6878
parent 215972 4e37a22253404fc5375e02f1ec478aab2b50a3cc
child 215974 80f5b926874132a0e741d618943481db53516fe0
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)
bugs1022612
milestone33.0a1
backs outc413b946dbc440645ec7308554ae3b3cdeb187c5
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
Backed out changeset c413b946dbc4 (bug 1022612)
layout/base/FrameLayerBuilder.cpp
layout/base/nsLayoutUtils.cpp
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -1603,19 +1603,19 @@ AppUnitsPerDevPixel(nsDisplayItem* aItem
 }
 #endif
 
 /**
  * Restrict the visible region of aLayer to the region that is actually visible.
  * Because we only reduce the visible region here, we don't need to worry
  * about whether CONTENT_OPAQUE is set; if layer was opaque in the old
  * visible region, it will still be opaque in the new one.
- * @param aLayerVisibleRect if non-null, the visible rect of the layer, in
- * the layer's coordinate space
- * @param aOuterVisibleRect the rect to restrict the visible region to, in the
+ * @param aLayerVisibleRegion the visible region of the layer, in the layer's
+ * coordinate space
+ * @param aRestrictToRect the rect to restrict the visible region to, in the
  * parent's coordinate system
  */
 static void
 SetVisibleRegionForLayer(Layer* aLayer, const nsIntRect* aLayerVisibleRect,
                          const nsIntRect& aOuterVisibleRect)
 {
   gfx3DMatrix transform;
   To3DMatrix(aLayer->GetTransform(), transform);
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -1478,17 +1478,17 @@ nsLayoutUtils::FindSiblingViewFor(nsView
 }
 
 //static
 nsIScrollableFrame*
 nsLayoutUtils::GetScrollableFrameFor(const nsIFrame *aScrolledFrame)
 {
   nsIFrame *frame = aScrolledFrame->GetParent();
   nsIScrollableFrame *sf = do_QueryFrame(frame);
-  return sf && sf->GetScrolledFrame() == aScrolledFrame ? sf : nullptr;
+  return sf;
 }
 
 /* static */ void
 nsLayoutUtils::SetFixedPositionLayerData(Layer* aLayer,
                                          const nsIFrame* aViewportFrame,
                                          const nsRect& aAnchorRect,
                                          const nsIFrame* aFixedPosFrame,
                                          nsPresContext* aPresContext,