Revert of Remove cullRect() from PaintOpBuffer.

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

Index: third_party/WebKit/Source/web/tests/FrameThrottlingTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/FrameThrottlingTest.cpp b/third_party/WebKit/Source/web/tests/FrameThrottlingTest.cpp
index 83b60d8d5da1fd161c99657427254c535d23e18b..00abe890d77cc154f076928878d7ed0212a29ea9 100644
--- a/third_party/WebKit/Source/web/tests/FrameThrottlingTest.cpp
+++ b/third_party/WebKit/Source/web/tests/FrameThrottlingTest.cpp
@@ -45,10 +45,8 @@ 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) {
@@ -835,7 +833,7 @@ TEST_P(FrameThrottlingTest, PaintingViaContentLayerDelegateIsThrottled) {
 
   // 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
@@ -852,7 +850,7 @@ TEST_P(FrameThrottlingTest, PaintingViaContentLayerDelegateIsThrottled) {
   // 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);
 }
 
@@ -879,7 +877,7 @@ TEST_P(FrameThrottlingTest, ThrottleInnerCompositedLayer) {
 
   // 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.
@@ -895,7 +893,7 @@ TEST_P(FrameThrottlingTest, ThrottleInnerCompositedLayer) {
   // 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.
@@ -919,7 +917,7 @@ TEST_P(FrameThrottlingTest, ThrottleInnerCompositedLayer) {
   }
 
   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.
@@ -934,7 +932,7 @@ TEST_P(FrameThrottlingTest, ThrottleInnerCompositedLayer) {
 
   // 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);