Use correct clip container when computing acl for scroll children

third_party/WebKit/Source/core/layout/compositing/CompositedLayerMappingTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/layout/compositing/CompositedLayerMapping.h"
 
 #include "core/frame/FrameView.h"
 #include "core/layout/LayoutBoxModelObject.h"
 #include "core/layout/LayoutTestHelper.h"
 #include "core/layout/LayoutView.h"
@@ skipping 608 matching lines @@
     Element* negativeCompositedChild = document().getElementById("negative-composited-child");
     negativeCompositedChild->parentNode()->removeChild(negativeCompositedChild);
     document().view()->updateAllLifecyclePhases();
 
     mapping = toLayoutBlock(getLayoutObjectByElementId("container"))->layer()->compositedLayerMapping();
     ASSERT_TRUE(mapping->scrollingContentsLayer());
     EXPECT_EQ(static_cast<GraphicsLayerPaintingPhase>(GraphicsLayerPaintOverflowContents | GraphicsLayerPaintCompositedScroll | GraphicsLayerPaintForeground), mapping->scrollingContentsLayer()->paintingPhase());
     EXPECT_FALSE(mapping->foregroundLayer());
 }
 
+TEST_F(CompositedLayerMappingTest, OverflowAndClippingWithACL)
+{
+    document().frame()->settings()->setPreferCompositingToLCDTextEnabled(true);
+    setBodyInnerHTML(
+        "<div style='height:700px; overflow-y:scroll; background-color:red;'>"
+        "  <div style='overflow:hidden; width: 700px; height:2000px;'>"
+        "    <div id='hidden' style='background-color:blue; width: 700px; height:2000px; position:relative;'></div>"
+        "  </div>"
+        "</div>");
+    CompositedLayerMapping* mapping = toLayoutBlock(getLayoutObjectByElementId("hidden"))->layer()->compositedLayerMapping();
+    ASSERT_TRUE(mapping->ancestorClippingLayer());
+    EXPECT_EQ(2000.f, mapping->ancestorClippingLayer()->size().height());
+}
+
 } // namespace blink