Revert of Remove cullRect() from PaintOpBuffer.

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 "bindings/core/v8/ScriptSourceCode.h"
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
@@ skipping 27 matching lines @@
 using namespace HTMLNames;
 
 // NOTE: This test uses <iframe sandbox> to create cross origin iframes.
 
 namespace {
 
 class MockWebDisplayItemList : public WebDisplayItemList {
  public:
   ~MockWebDisplayItemList() override {}
 
-  MOCK_METHOD3(AppendDrawingItem,
-               void(const WebRect& visual_rect,
-                    sk_sp<const cc::PaintRecord>,
-                    const WebRect& record_bounds));
+  MOCK_METHOD2(AppendDrawingItem,
+               void(const WebRect&, sk_sp<const PaintRecord>));
 };
 
 void PaintRecursively(GraphicsLayer* layer, WebDisplayItemList* display_items) {
   if (layer->DrawsContent()) {
     layer->SetNeedsDisplay();
     layer->ContentLayerDelegateForTesting()->PaintContents(
         display_items, ContentLayerDelegate::kPaintDefaultBehaviorForTest);
   }
   for (const auto& child : layer->Children())
     PaintRecursively(child, display_items);
@@ skipping 766 matching lines @@
   SimRequest main_resource("https://example.com/", "text/html");
   SimRequest frame_resource("https://example.com/iframe.html", "text/html");
 
   LoadURL("https://example.com/");
   main_resource.Complete("<iframe id=frame sandbox src=iframe.html></iframe>");
   frame_resource.Complete("throttled");
   CompositeFrame();
 
   // Before the iframe is throttled, we should create all drawing items.
   MockWebDisplayItemList display_items_not_throttled;
-  EXPECT_CALL(display_items_not_throttled, AppendDrawingItem(_, _, _)).Times(3);
+  EXPECT_CALL(display_items_not_throttled, AppendDrawingItem(_, _)).Times(3);
   PaintRecursively(WebView().RootGraphicsLayer(), &display_items_not_throttled);
 
   // Move the frame offscreen to throttle it and make sure it is backed by a
   // graphics layer.
   auto* frame_element =
       toHTMLIFrameElement(GetDocument().getElementById("frame"));
   frame_element->setAttribute(styleAttr,
                               "transform: translateY(480px) translateZ(0px)");
   EXPECT_FALSE(
       frame_element->contentDocument()->View()->CanThrottleRendering());
   CompositeFrame();
   EXPECT_TRUE(frame_element->contentDocument()->View()->CanThrottleRendering());
 
   // If painting of the iframe is throttled, we should only receive two
   // drawing items.
   MockWebDisplayItemList display_items_throttled;
-  EXPECT_CALL(display_items_throttled, AppendDrawingItem(_, _, _)).Times(2);
+  EXPECT_CALL(display_items_throttled, AppendDrawingItem(_, _)).Times(2);
   PaintRecursively(WebView().RootGraphicsLayer(), &display_items_throttled);
 }
 
 TEST_P(FrameThrottlingTest, ThrottleInnerCompositedLayer) {
   WebView().GetSettings()->SetAcceleratedCompositingEnabled(true);
   WebView().GetSettings()->SetPreferCompositingToLCDTextEnabled(true);
 
   // Create a hidden frame which is throttled.
   SimRequest main_resource("https://example.com/", "text/html");
   SimRequest frame_resource("https://example.com/iframe.html", "text/html");
 
   LoadURL("https://example.com/");
   main_resource.Complete("<iframe id=frame sandbox src=iframe.html></iframe>");
   frame_resource.Complete(
       "<div id=div style='will-change: transform; background: blue'>DIV</div>");
   CompositeFrame();
 
   auto* frame_element =
       toHTMLIFrameElement(GetDocument().getElementById("frame"));
   // The inner div is composited.
   auto* inner_div = frame_element->contentDocument()->getElementById("div");
   EXPECT_NE(nullptr,
             inner_div->GetLayoutBox()->Layer()->GraphicsLayerBacking());
 
   // Before the iframe is throttled, we should create all drawing items.
   MockWebDisplayItemList display_items_not_throttled;
-  EXPECT_CALL(display_items_not_throttled, AppendDrawingItem(_, _, _)).Times(4);
+  EXPECT_CALL(display_items_not_throttled, AppendDrawingItem(_, _)).Times(4);
   PaintRecursively(WebView().RootGraphicsLayer(), &display_items_not_throttled);
 
   // Move the frame offscreen to throttle it.
   frame_element->setAttribute(styleAttr, "transform: translateY(480px)");
   EXPECT_FALSE(
       frame_element->contentDocument()->View()->CanThrottleRendering());
   CompositeFrame();
   EXPECT_TRUE(frame_element->contentDocument()->View()->CanThrottleRendering());
   // The inner div should still be composited.
   EXPECT_NE(nullptr,
             inner_div->GetLayoutBox()->Layer()->GraphicsLayerBacking());
 
   // If painting of the iframe is throttled, we should only receive two
   // drawing items.
   MockWebDisplayItemList display_items_throttled;
-  EXPECT_CALL(display_items_throttled, AppendDrawingItem(_, _, _)).Times(2);
+  EXPECT_CALL(display_items_throttled, AppendDrawingItem(_, _)).Times(2);
   PaintRecursively(WebView().RootGraphicsLayer(), &display_items_throttled);
 
   // Remove compositing trigger of inner_div.
   inner_div->setAttribute(styleAttr, "background: yellow; overflow: hidden");
   // Do an unthrottled style and layout update, simulating the situation
   // triggered by script style/layout access.
   GetDocument().View()->UpdateLifecycleToLayoutClean();
   {
     // And a throttled full lifecycle update.
     DocumentLifecycle::AllowThrottlingScope throttling_scope(
         GetDocument().Lifecycle());
     GetDocument().View()->UpdateAllLifecyclePhases();
   }
   // The inner div should still be composited because compositing update is
   // throttled, though the inner_div's self-painting status has been updated.
   EXPECT_FALSE(inner_div->GetLayoutBox()->Layer()->IsSelfPaintingLayer());
   {
     DisableCompositingQueryAsserts disabler;
     EXPECT_NE(nullptr,
               inner_div->GetLayoutBox()->Layer()->GraphicsLayerBacking());
   }
 
   MockWebDisplayItemList display_items_throttled1;
-  EXPECT_CALL(display_items_throttled1, AppendDrawingItem(_, _, _)).Times(2);
+  EXPECT_CALL(display_items_throttled1, AppendDrawingItem(_, _)).Times(2);
   PaintRecursively(WebView().RootGraphicsLayer(), &display_items_throttled1);
 
   // Move the frame back on screen.
   frame_element->setAttribute(styleAttr, "");
   CompositeFrame();
   EXPECT_FALSE(
       frame_element->contentDocument()->View()->CanThrottleRendering());
   CompositeFrame();
   // The inner div is no longer composited.
   EXPECT_EQ(nullptr,
             inner_div->GetLayoutBox()->Layer()->GraphicsLayerBacking());
 
   // After the iframe is unthrottled, we should create all drawing items.
   MockWebDisplayItemList display_items_not_throttled1;
-  EXPECT_CALL(display_items_not_throttled1, AppendDrawingItem(_, _, _))
+  EXPECT_CALL(display_items_not_throttled1, AppendDrawingItem(_, _))
       .Times(4);
   PaintRecursively(WebView().RootGraphicsLayer(),
                    &display_items_not_throttled1);
 }
 
 TEST_P(FrameThrottlingTest, ThrottleSubtreeAtomically) {
   // Create two nested frames which are throttled.
   SimRequest main_resource("https://example.com/", "text/html");
   SimRequest frame_resource("https://example.com/iframe.html", "text/html");
   SimRequest child_frame_resource("https://example.com/child-iframe.html",
@@ skipping 274 matching lines @@
   // the child. This behavior matches Safari.
   frame_element->setAttribute(styleAttr, "display: none");
   CompositeFrame();
   EXPECT_FALSE(
       frame_element->contentDocument()->View()->CanThrottleRendering());
   EXPECT_TRUE(
       child_frame_element->contentDocument()->View()->CanThrottleRendering());
 }
 
 }  // namespace blink