Fix GraphicsLayer traversal in SimCompositor

third_party/WebKit/Source/web/tests/FrameThrottlingTest.cpp

 // Copyright 2015 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 "bindings/core/v8/ScriptController.h"
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLIFrameElement.h"
 #include "core/page/FocusController.h"
 #include "core/page/Page.h"
 #include "core/paint/PaintLayer.h"
 #include "platform/testing/URLTestHelpers.h"
 #include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/WebDisplayItemList.h"
 #include "public/platform/WebLayer.h"
 #include "public/web/WebFrameContentDumper.h"
 #include "public/web/WebHitTestResult.h"
+#include "public/web/WebRuntimeFeatures.h"
 #include "public/web/WebSettings.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebRemoteFrameImpl.h"
 #include "web/tests/sim/SimCompositor.h"
 #include "web/tests/sim/SimDisplayItemList.h"
 #include "web/tests/sim/SimRequest.h"
 #include "web/tests/sim/SimTest.h"
 
 using testing::_;
@@ skipping 36 matching lines @@
     {
         SimDisplayItemList displayItems = compositor().beginFrame();
         // Ensure intersection observer notifications get delivered.
         testing::runPendingTasks();
         return displayItems;
     }
 
     // Number of rectangles that make up the root layer's touch handler region.
     size_t touchHandlerRegionSize()
     {
-        return webView().mainFrameImpl()->frame()->contentLayoutItem().layer()->graphicsLayerBacking()->platformLayer()->touchEventHandlerRegion().size();
+        return webView().mainFrameImpl()->frame()->contentLayoutItem().layer()->graphicsLayerBackingForScrolling()->platformLayer()->touchEventHandlerRegion().size();
     }
 };
 
 TEST_F(FrameThrottlingTest, ThrottleInvisibleFrames)
 {
     SimRequest mainResource("https://example.com/", "text/html");
 
     loadURL("https://example.com/");
     mainResource.complete("<iframe sandbox id=frame></iframe>");
 
@@ skipping 217 matching lines @@
 
     // Move the frame offscreen to throttle it.
     auto* frameElement = toHTMLIFrameElement(document().getElementById("frame"));
     frameElement->setAttribute(styleAttr, "transform: translateY(480px)");
     EXPECT_FALSE(frameElement->contentDocument()->view()->canThrottleRendering());
     compositeFrame();
     EXPECT_TRUE(frameElement->contentDocument()->view()->canThrottleRendering());
 
     // Scroll down to unthrottle the frame. The first frame we composite after
     // scrolling won't contain the frame yet, but will schedule another repaint.
-    webView().mainFrameImpl()->frameView()->setScrollPosition(DoublePoint(0, 480), ProgrammaticScroll);
+    webView().mainFrameImpl()->frameView()->layoutViewportScrollableArea()->setScrollPosition(DoublePoint(0, 480), ProgrammaticScroll);
     auto displayItems = compositeFrame();
     EXPECT_FALSE(displayItems.contains(SimCanvas::Rect, "green"));
 
     // Now the frame contents should be visible again.
     auto displayItems2 = compositeFrame();
     EXPECT_TRUE(displayItems2.contains(SimCanvas::Rect, "green"));
 }
 
 TEST_F(FrameThrottlingTest, UnthrottlingTriggersRepaintInCompositedChild)
 {
@@ skipping 15 matching lines @@
 
     // Move the frame offscreen to throttle it.
     auto* frameElement = toHTMLIFrameElement(document().getElementById("frame"));
     frameElement->setAttribute(styleAttr, "transform: translateY(480px)");
     EXPECT_FALSE(frameElement->contentDocument()->view()->canThrottleRendering());
     compositeFrame();
     EXPECT_TRUE(frameElement->contentDocument()->view()->canThrottleRendering());
 
     // Scroll down to unthrottle the frame. The first frame we composite after
     // scrolling won't contain the frame yet, but will schedule another repaint.
-    webView().mainFrameImpl()->frameView()->setScrollPosition(DoublePoint(0, 480), ProgrammaticScroll);
+    webView().mainFrameImpl()->frameView()->layoutViewportScrollableArea()->setScrollPosition(DoublePoint(0, 480), ProgrammaticScroll);
     auto displayItems = compositeFrame();
     EXPECT_FALSE(displayItems.contains(SimCanvas::Rect, "green"));
 
     // Now the composited child contents should be visible again.
     auto displayItems2 = compositeFrame();
     EXPECT_TRUE(displayItems2.contains(SimCanvas::Rect, "green"));
 }
 
+

[Sami, 2016/09/07 14:48:43]

Unintended whitespace?

[szager1, 2016/09/07 16:53:01]

Fixed.

 TEST_F(FrameThrottlingTest, ChangeStyleInThrottledFrame)
 {
     // Create a hidden frame which is throttled.
     SimRequest mainResource("https://example.com/", "text/html");
     SimRequest frameResource("https://example.com/iframe.html", "text/html");
 
     loadURL("https://example.com/");
     mainResource.complete("<iframe id=frame sandbox src=iframe.html></iframe>");
     frameResource.complete("<style> html { background: red; } </style>");
 
     // Move the frame offscreen to throttle it.
     auto* frameElement = toHTMLIFrameElement(document().getElementById("frame"));
     frameElement->setAttribute(styleAttr, "transform: translateY(480px)");
     EXPECT_FALSE(frameElement->contentDocument()->view()->canThrottleRendering());
     compositeFrame();
     EXPECT_TRUE(frameElement->contentDocument()->view()->canThrottleRendering());
 
     // Change the background color of the frame's contents from red to green.
     frameElement->contentDocument()->body()->setAttribute(styleAttr, "background: green");
 
     // Scroll down to unthrottle the frame.
-    webView().mainFrameImpl()->frameView()->setScrollPosition(DoublePoint(0, 480), ProgrammaticScroll);
+    webView().mainFrameImpl()->frameView()->layoutViewportScrollableArea()->setScrollPosition(DoublePoint(0, 480), ProgrammaticScroll);
     auto displayItems = compositeFrame();
     EXPECT_FALSE(displayItems.contains(SimCanvas::Rect, "red"));
     EXPECT_FALSE(displayItems.contains(SimCanvas::Rect, "green"));
 
     // Make sure the new style shows up instead of the old one.
     auto displayItems2 = compositeFrame();
     EXPECT_TRUE(displayItems2.contains(SimCanvas::Rect, "green"));
 }
 
 TEST_F(FrameThrottlingTest, ThrottledFrameWithFocus)
@@ skipping 454 matching lines @@
     localFrame->script().executeScriptInMainWorld(
         "window.requestAnimationFrame(function() {\n"
         "  var throttledFrame = window.parent.frames.first;\n"
         "  throttledFrame.document.documentElement.style = 'margin: 50px';\n"
         "  throttledFrame.document.querySelector('#d').getBoundingClientRect();\n"
         "});\n");
     compositeFrame();
 }
 
 } // namespace blink