From 495422fb07af3baf7aef80bb95d0556d9f30364d Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Tue, 15 Jul 2014 10:30:09 +0200
Subject: [PATCH] Backed out changeset c413b946dbc4 (bug 1022612)

---
 layout/base/FrameLayerBuilder.cpp | 6 +++---
 layout/base/nsLayoutUtils.cpp     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/layout/base/FrameLayerBuilder.cpp b/layout/base/FrameLayerBuilder.cpp
index dc7666f743f..39484d977dd 100644
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -1608,9 +1608,9 @@ AppUnitsPerDevPixel(nsDisplayItem* aItem)
  * 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
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index 08c5edc14ff..8bb035fad98 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -1483,7 +1483,7 @@ 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