Remove cullRect() from PaintOpBuffer.

cc/paint/display_item_list_unittest.cc

 // 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 "cc/paint/display_item_list.h"
 
 #include <stddef.h>
 
 #include <vector>
 
@@ skipping 84 matching lines @@
 }
 
 void AppendFirstSerializationTestPicture(scoped_refptr<DisplayItemList> list,
                                          const gfx::Size& layer_size) {
   gfx::PointF offset(2.f, 3.f);
   PaintRecorder recorder;
 
   PaintFlags red_paint;
   red_paint.setColor(SK_ColorRED);
 
-  PaintCanvas* canvas = recorder.beginRecording(SkRect::MakeXYWH(
-      offset.x(), offset.y(), layer_size.width(), layer_size.height()));
+  SkRect bounds = SkRect::MakeXYWH(offset.x(), offset.y(), layer_size.width(),
+                                   layer_size.height());
+  PaintCanvas* canvas = recorder.beginRecording(bounds);
   canvas->translate(offset.x(), offset.y());
   canvas->drawRect(SkRect::MakeWH(4, 4), red_paint);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
-      kVisualRect, recorder.finishRecordingAsPicture());
+      kVisualRect, recorder.finishRecordingAsPicture(), bounds);
 }
 
 }  // namespace
 
 TEST(DisplayItemListTest, SingleDrawingItem) {
   gfx::Rect layer_rect(100, 100);
   PaintRecorder recorder;
   PaintFlags blue_flags;
   blue_flags.setColor(SK_ColorBLUE);
   PaintFlags red_paint;
   red_paint.setColor(SK_ColorRED);
   unsigned char pixels[4 * 100 * 100] = {0};
   auto list = make_scoped_refptr(new DisplayItemList);
 
   gfx::PointF offset(8.f, 9.f);
   gfx::RectF recording_rect(offset, gfx::SizeF(layer_rect.size()));
   PaintCanvas* canvas =
       recorder.beginRecording(gfx::RectFToSkRect(recording_rect));
   canvas->translate(offset.x(), offset.y());
   canvas->drawRect(SkRect::MakeLTRB(0.f, 0.f, 60.f, 60.f), red_paint);
   canvas->drawRect(SkRect::MakeLTRB(50.f, 50.f, 75.f, 75.f), blue_flags);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
-      kVisualRect, recorder.finishRecordingAsPicture());
+      kVisualRect, recorder.finishRecordingAsPicture(),
+      gfx::RectFToSkRect(recording_rect));
   list->Finalize();
   DrawDisplayList(pixels, layer_rect, list);
 
   SkBitmap expected_bitmap;
   unsigned char expected_pixels[4 * 100 * 100] = {0};
   SkImageInfo info =
       SkImageInfo::MakeN32Premul(layer_rect.width(), layer_rect.height());
   expected_bitmap.installPixels(info, expected_pixels, info.minRowBytes());
   SkiaPaintCanvas expected_canvas(expected_bitmap);
   expected_canvas.clipRect(gfx::RectToSkRect(layer_rect));
@@ skipping 19 matching lines @@
   unsigned char pixels[4 * 100 * 100] = {0};
   auto list = make_scoped_refptr(new DisplayItemList);
 
   gfx::PointF first_offset(8.f, 9.f);
   gfx::RectF first_recording_rect(first_offset, gfx::SizeF(layer_rect.size()));
   PaintCanvas* canvas =
       recorder.beginRecording(gfx::RectFToSkRect(first_recording_rect));
   canvas->translate(first_offset.x(), first_offset.y());
   canvas->drawRect(SkRect::MakeWH(60, 60), red_paint);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
-      kVisualRect, recorder.finishRecordingAsPicture());
+      kVisualRect, recorder.finishRecordingAsPicture(),
+      gfx::RectFToSkRect(first_recording_rect));
 
   gfx::Rect clip_rect(60, 60, 10, 10);
   list->CreateAndAppendPairedBeginItem<ClipDisplayItem>(
       clip_rect, std::vector<SkRRect>(), true);
 
   gfx::PointF second_offset(2.f, 3.f);
   gfx::RectF second_recording_rect(second_offset,
                                    gfx::SizeF(layer_rect.size()));
   canvas = recorder.beginRecording(gfx::RectFToSkRect(second_recording_rect));
   canvas->translate(second_offset.x(), second_offset.y());
   canvas->drawRect(SkRect::MakeLTRB(50.f, 50.f, 75.f, 75.f), blue_flags);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
-      kVisualRect, recorder.finishRecordingAsPicture());
+      kVisualRect, recorder.finishRecordingAsPicture(),
+      gfx::RectFToSkRect(second_recording_rect));
 
   list->CreateAndAppendPairedEndItem<EndClipDisplayItem>();
   list->Finalize();
 
   DrawDisplayList(pixels, layer_rect, list);
 
   SkBitmap expected_bitmap;
   unsigned char expected_pixels[4 * 100 * 100] = {0};
   SkImageInfo info =
       SkImageInfo::MakeN32Premul(layer_rect.width(), layer_rect.height());
@@ skipping 23 matching lines @@
   unsigned char pixels[4 * 100 * 100] = {0};
   auto list = make_scoped_refptr(new DisplayItemList);
 
   gfx::PointF first_offset(8.f, 9.f);
   gfx::RectF first_recording_rect(first_offset, gfx::SizeF(layer_rect.size()));
   PaintCanvas* canvas =
       recorder.beginRecording(gfx::RectFToSkRect(first_recording_rect));
   canvas->translate(first_offset.x(), first_offset.y());
   canvas->drawRect(SkRect::MakeWH(60, 60), red_paint);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
-      kVisualRect, recorder.finishRecordingAsPicture());
+      kVisualRect, recorder.finishRecordingAsPicture(),
+      gfx::RectFToSkRect(first_recording_rect));
 
   gfx::Transform transform;
   transform.Rotate(45.0);
   list->CreateAndAppendPairedBeginItem<TransformDisplayItem>(transform);
 
   gfx::PointF second_offset(2.f, 3.f);
   gfx::RectF second_recording_rect(second_offset,
                                    gfx::SizeF(layer_rect.size()));
   canvas = recorder.beginRecording(gfx::RectFToSkRect(second_recording_rect));
   canvas->translate(second_offset.x(), second_offset.y());
   canvas->drawRect(SkRect::MakeLTRB(50.f, 50.f, 75.f, 75.f), blue_flags);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
-      kVisualRect, recorder.finishRecordingAsPicture());
+      kVisualRect, recorder.finishRecordingAsPicture(),
+      gfx::RectFToSkRect(second_recording_rect));
 
   list->CreateAndAppendPairedEndItem<EndTransformDisplayItem>();
   list->Finalize();
 
   DrawDisplayList(pixels, layer_rect, list);
 
   SkBitmap expected_bitmap;
   unsigned char expected_pixels[4 * 100 * 100] = {0};
   SkImageInfo info =
       SkImageInfo::MakeN32Premul(layer_rect.width(), layer_rect.height());
@@ skipping 42 matching lines @@
   list->CreateAndAppendPairedBeginItem<FilterDisplayItem>(
       filters, filter_bounds, filter_bounds.origin());
 
   // Include a rect drawing so that filter is actually applied to something.
   {
     PaintRecorder recorder;
 
     PaintFlags red_paint;
     red_paint.setColor(SK_ColorRED);
 
-    PaintCanvas* canvas = recorder.beginRecording(
-        SkRect::MakeXYWH(0, 0, layer_rect.width(), layer_rect.height()));
+    SkRect bounds =
+        SkRect::MakeXYWH(0, 0, layer_rect.width(), layer_rect.height());
+    PaintCanvas* canvas = recorder.beginRecording(bounds);
     canvas->drawRect(
         SkRect::MakeLTRB(filter_bounds.x(), filter_bounds.y(),
                          filter_bounds.right(), filter_bounds.bottom()),
         red_paint);
     list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
-        ToNearestRect(filter_bounds), recorder.finishRecordingAsPicture());
+        ToNearestRect(filter_bounds), recorder.finishRecordingAsPicture(),
+        bounds);
   }
 
   list->CreateAndAppendPairedEndItem<EndFilterDisplayItem>();
   list->Finalize();
 
   DrawDisplayList(pixels, layer_rect, list);
 
   SkBitmap expected_bitmap;
   unsigned char expected_pixels[4 * 100 * 100] = {0};
   PaintFlags paint;
@@ skipping 17 matching lines @@
   PaintFlags blue_flags;
   blue_flags.setColor(SK_ColorBLUE);
   PaintCanvas* canvas = recorder.beginRecording(gfx::RectToSkRect(layer_rect));
   for (int i = 0; i < kNumCommandsInTestSkPicture; i++)
     canvas->drawRect(SkRect(), blue_flags);
   sk_sp<PaintRecord> record = recorder.finishRecordingAsPicture();
   size_t record_size = record->bytes_used();
   ASSERT_GE(record_size, kNumCommandsInTestSkPicture * sizeof(SkRect));
 
   auto list = make_scoped_refptr(new DisplayItemList);
-  list->CreateAndAppendDrawingItem<DrawingDisplayItem>(kVisualRect, record);
+  list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
+      kVisualRect, record, gfx::RectToSkRect(layer_rect));
   list->Finalize();
   memory_usage = list->ApproximateMemoryUsage();
   EXPECT_GE(memory_usage, record_size);
   EXPECT_LE(memory_usage, 2 * record_size);
 }
 
 TEST(DisplayItemListTest, AsValueWithNoItems) {
   auto list = make_scoped_refptr(new DisplayItemList);
   list->SetRetainVisualRectsForTesting(true);
   list->Finalize();
@@ skipping 39 matching lines @@
 
 TEST(DisplayItemListTest, SizeEmpty) {
   auto list = make_scoped_refptr(new DisplayItemList);
   EXPECT_EQ(0u, list->size());
 }
 
 TEST(DisplayItemListTest, SizeOne) {
   auto list = make_scoped_refptr(new DisplayItemList);
   gfx::Rect drawing_bounds(5, 6, 1, 1);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
-      drawing_bounds, CreateRectPicture(drawing_bounds));
+      drawing_bounds, CreateRectPicture(drawing_bounds),
+      gfx::RectToSkRect(drawing_bounds));
   EXPECT_EQ(1u, list->size());
 }
 
 TEST(DisplayItemListTest, SizeMultiple) {
   auto list = make_scoped_refptr(new DisplayItemList);
   gfx::Rect clip_bounds(5, 6, 7, 8);
   list->CreateAndAppendPairedBeginItem<ClipDisplayItem>(
       clip_bounds, std::vector<SkRRect>(), true);
   list->CreateAndAppendPairedEndItem<EndClipDisplayItem>();
   EXPECT_EQ(2u, list->size());
 }
 
 TEST(DisplayItemListTest, AppendVisualRectSimple) {
   auto list = make_scoped_refptr(new DisplayItemList);
 
   // One drawing: D.
 
   gfx::Rect drawing_bounds(5, 6, 7, 8);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
-      drawing_bounds, CreateRectPicture(drawing_bounds));
+      drawing_bounds, CreateRectPicture(drawing_bounds),
+      gfx::RectToSkRect(drawing_bounds));
 
   EXPECT_EQ(1u, list->size());
   EXPECT_RECT_EQ(drawing_bounds, list->VisualRectForTesting(0));
 }
 
 TEST(DisplayItemListTest, AppendVisualRectEmptyBlock) {
   auto list = make_scoped_refptr(new DisplayItemList);
 
   // One block: B1, E1.
 
@@ skipping 31 matching lines @@
   auto list = make_scoped_refptr(new DisplayItemList);
 
   // One block with one drawing: B1, Da, E1.
 
   gfx::Rect clip_bounds(5, 6, 7, 8);
   list->CreateAndAppendPairedBeginItem<ClipDisplayItem>(
       clip_bounds, std::vector<SkRRect>(), true);
 
   gfx::Rect drawing_bounds(5, 6, 1, 1);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
-      drawing_bounds, CreateRectPicture(drawing_bounds));
+      drawing_bounds, CreateRectPicture(drawing_bounds),
+      gfx::RectToSkRect(drawing_bounds));
 
   list->CreateAndAppendPairedEndItem<EndClipDisplayItem>();
 
   EXPECT_EQ(3u, list->size());
   EXPECT_RECT_EQ(drawing_bounds, list->VisualRectForTesting(0));
   EXPECT_RECT_EQ(drawing_bounds, list->VisualRectForTesting(1));
   EXPECT_RECT_EQ(drawing_bounds, list->VisualRectForTesting(2));
 }
 
 TEST(DisplayItemListTest, AppendVisualRectBlockContainingEscapedDrawing) {
   auto list = make_scoped_refptr(new DisplayItemList);
 
   // One block with one drawing: B1, Da (escapes), E1.
 
   gfx::Rect clip_bounds(5, 6, 7, 8);
   list->CreateAndAppendPairedBeginItem<ClipDisplayItem>(
       clip_bounds, std::vector<SkRRect>(), true);
 
   gfx::Rect drawing_bounds(1, 2, 3, 4);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
-      drawing_bounds, CreateRectPicture(drawing_bounds));
+      drawing_bounds, CreateRectPicture(drawing_bounds),
+      gfx::RectToSkRect(drawing_bounds));
 
   list->CreateAndAppendPairedEndItem<EndClipDisplayItem>();
 
   EXPECT_EQ(3u, list->size());
   EXPECT_RECT_EQ(drawing_bounds, list->VisualRectForTesting(0));
   EXPECT_RECT_EQ(drawing_bounds, list->VisualRectForTesting(1));
   EXPECT_RECT_EQ(drawing_bounds, list->VisualRectForTesting(2));
 }
 
 TEST(DisplayItemListTest,
      AppendVisualRectDrawingFollowedByBlockContainingEscapedDrawing) {
   auto list = make_scoped_refptr(new DisplayItemList);
 
   // One drawing followed by one block with one drawing: Da, B1, Db (escapes),
   // E1.
 
   gfx::Rect drawing_a_bounds(1, 2, 3, 4);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
-      drawing_a_bounds, CreateRectPicture(drawing_a_bounds));
+      drawing_a_bounds, CreateRectPicture(drawing_a_bounds),
+      gfx::RectToSkRect(drawing_a_bounds));
 
   gfx::Rect clip_bounds(5, 6, 7, 8);
   list->CreateAndAppendPairedBeginItem<ClipDisplayItem>(
       clip_bounds, std::vector<SkRRect>(), true);
 
   gfx::Rect drawing_b_bounds(13, 14, 1, 1);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
-      drawing_b_bounds, CreateRectPicture(drawing_b_bounds));
+      drawing_b_bounds, CreateRectPicture(drawing_b_bounds),
+      gfx::RectToSkRect(drawing_b_bounds));
 
   list->CreateAndAppendPairedEndItem<EndClipDisplayItem>();
 
   EXPECT_EQ(4u, list->size());
   EXPECT_RECT_EQ(drawing_a_bounds, list->VisualRectForTesting(0));
   EXPECT_RECT_EQ(drawing_b_bounds, list->VisualRectForTesting(1));
   EXPECT_RECT_EQ(drawing_b_bounds, list->VisualRectForTesting(2));
   EXPECT_RECT_EQ(drawing_b_bounds, list->VisualRectForTesting(3));
 }
 
 TEST(DisplayItemListTest, AppendVisualRectTwoBlocksTwoDrawings) {
   auto list = make_scoped_refptr(new DisplayItemList);
 
   // Multiple nested blocks with drawings amidst: B1, Da, B2, Db, E2, E1.
 
   gfx::Rect clip_bounds(5, 6, 7, 8);
   list->CreateAndAppendPairedBeginItem<ClipDisplayItem>(
       clip_bounds, std::vector<SkRRect>(), true);
 
   gfx::Rect drawing_a_bounds(5, 6, 1, 1);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
-      drawing_a_bounds, CreateRectPicture(drawing_a_bounds));
+      drawing_a_bounds, CreateRectPicture(drawing_a_bounds),
+      gfx::RectToSkRect(drawing_a_bounds));
 
   list->CreateAndAppendPairedBeginItem<TransformDisplayItem>(gfx::Transform());
 
   gfx::Rect drawing_b_bounds(7, 8, 1, 1);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
-      drawing_b_bounds, CreateRectPicture(drawing_b_bounds));
+      drawing_b_bounds, CreateRectPicture(drawing_b_bounds),
+      gfx::RectToSkRect(drawing_b_bounds));
 
   list->CreateAndAppendPairedEndItem<EndTransformDisplayItem>();
   list->CreateAndAppendPairedEndItem<EndClipDisplayItem>();
 
   EXPECT_EQ(6u, list->size());
   gfx::Rect merged_drawing_bounds = gfx::Rect(drawing_a_bounds);
   merged_drawing_bounds.Union(drawing_b_bounds);
   EXPECT_RECT_EQ(merged_drawing_bounds, list->VisualRectForTesting(0));
   EXPECT_RECT_EQ(drawing_a_bounds, list->VisualRectForTesting(1));
   EXPECT_RECT_EQ(drawing_b_bounds, list->VisualRectForTesting(2));
   EXPECT_RECT_EQ(drawing_b_bounds, list->VisualRectForTesting(3));
   EXPECT_RECT_EQ(drawing_b_bounds, list->VisualRectForTesting(4));
   EXPECT_RECT_EQ(merged_drawing_bounds, list->VisualRectForTesting(5));
 }
 
 TEST(DisplayItemListTest,
      AppendVisualRectTwoBlocksTwoDrawingsInnerDrawingEscaped) {
   auto list = make_scoped_refptr(new DisplayItemList);
 
   // Multiple nested blocks with drawings amidst: B1, Da, B2, Db (escapes), E2,
   // E1.
 
   gfx::Rect clip_bounds(5, 6, 7, 8);
   list->CreateAndAppendPairedBeginItem<ClipDisplayItem>(
       clip_bounds, std::vector<SkRRect>(), true);
 
   gfx::Rect drawing_a_bounds(5, 6, 1, 1);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
-      drawing_a_bounds, CreateRectPicture(drawing_a_bounds));
+      drawing_a_bounds, CreateRectPicture(drawing_a_bounds),
+      gfx::RectToSkRect(drawing_a_bounds));
 
   list->CreateAndAppendPairedBeginItem<TransformDisplayItem>(gfx::Transform());
 
   gfx::Rect drawing_b_bounds(1, 2, 3, 4);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
-      drawing_b_bounds, CreateRectPicture(drawing_b_bounds));
+      drawing_b_bounds, CreateRectPicture(drawing_b_bounds),
+      gfx::RectToSkRect(drawing_b_bounds));
 
   list->CreateAndAppendPairedEndItem<EndTransformDisplayItem>();
   list->CreateAndAppendPairedEndItem<EndClipDisplayItem>();
 
   EXPECT_EQ(6u, list->size());
   gfx::Rect merged_drawing_bounds = gfx::Rect(drawing_a_bounds);
   merged_drawing_bounds.Union(drawing_b_bounds);
   EXPECT_RECT_EQ(merged_drawing_bounds, list->VisualRectForTesting(0));
   EXPECT_RECT_EQ(drawing_a_bounds, list->VisualRectForTesting(1));
   EXPECT_RECT_EQ(drawing_b_bounds, list->VisualRectForTesting(2));
   EXPECT_RECT_EQ(drawing_b_bounds, list->VisualRectForTesting(3));
   EXPECT_RECT_EQ(drawing_b_bounds, list->VisualRectForTesting(4));
   EXPECT_RECT_EQ(merged_drawing_bounds, list->VisualRectForTesting(5));
 }
 
 TEST(DisplayItemListTest,
      AppendVisualRectTwoBlocksTwoDrawingsOuterDrawingEscaped) {
   auto list = make_scoped_refptr(new DisplayItemList);
 
   // Multiple nested blocks with drawings amidst: B1, Da (escapes), B2, Db, E2,
   // E1.
 
   gfx::Rect clip_bounds(5, 6, 7, 8);
   list->CreateAndAppendPairedBeginItem<ClipDisplayItem>(
       clip_bounds, std::vector<SkRRect>(), true);
 
   gfx::Rect drawing_a_bounds(1, 2, 3, 4);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
-      drawing_a_bounds, CreateRectPicture(drawing_a_bounds));
+      drawing_a_bounds, CreateRectPicture(drawing_a_bounds),
+      gfx::RectToSkRect(drawing_a_bounds));
 
   list->CreateAndAppendPairedBeginItem<TransformDisplayItem>(gfx::Transform());
 
   gfx::Rect drawing_b_bounds(7, 8, 1, 1);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
-      drawing_b_bounds, CreateRectPicture(drawing_b_bounds));
+      drawing_b_bounds, CreateRectPicture(drawing_b_bounds),
+      gfx::RectToSkRect(drawing_b_bounds));
 
   list->CreateAndAppendPairedEndItem<EndTransformDisplayItem>();
   list->CreateAndAppendPairedEndItem<EndClipDisplayItem>();
 
   EXPECT_EQ(6u, list->size());
   gfx::Rect merged_drawing_bounds = gfx::Rect(drawing_a_bounds);
   merged_drawing_bounds.Union(drawing_b_bounds);
   EXPECT_RECT_EQ(merged_drawing_bounds, list->VisualRectForTesting(0));
   EXPECT_RECT_EQ(drawing_a_bounds, list->VisualRectForTesting(1));
   EXPECT_RECT_EQ(drawing_b_bounds, list->VisualRectForTesting(2));
   EXPECT_RECT_EQ(drawing_b_bounds, list->VisualRectForTesting(3));
   EXPECT_RECT_EQ(drawing_b_bounds, list->VisualRectForTesting(4));
   EXPECT_RECT_EQ(merged_drawing_bounds, list->VisualRectForTesting(5));
 }
 
 TEST(DisplayItemListTest,
      AppendVisualRectTwoBlocksTwoDrawingsBothDrawingsEscaped) {
   auto list = make_scoped_refptr(new DisplayItemList);
 
   // Multiple nested blocks with drawings amidst:
   // B1, Da (escapes to the right), B2, Db (escapes to the left), E2, E1.
 
   gfx::Rect clip_bounds(5, 6, 7, 8);
   list->CreateAndAppendPairedBeginItem<ClipDisplayItem>(
       clip_bounds, std::vector<SkRRect>(), true);
 
   gfx::Rect drawing_a_bounds(13, 14, 1, 1);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
-      drawing_a_bounds, CreateRectPicture(drawing_a_bounds));
+      drawing_a_bounds, CreateRectPicture(drawing_a_bounds),
+      gfx::RectToSkRect(drawing_a_bounds));
 
   list->CreateAndAppendPairedBeginItem<TransformDisplayItem>(gfx::Transform());
 
   gfx::Rect drawing_b_bounds(1, 2, 3, 4);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
-      drawing_b_bounds, CreateRectPicture(drawing_b_bounds));
+      drawing_b_bounds, CreateRectPicture(drawing_b_bounds),
+      gfx::RectToSkRect(drawing_b_bounds));
 
   list->CreateAndAppendPairedEndItem<EndTransformDisplayItem>();
   list->CreateAndAppendPairedEndItem<EndClipDisplayItem>();
 
   EXPECT_EQ(6u, list->size());
   gfx::Rect merged_drawing_bounds = gfx::Rect(drawing_a_bounds);
   merged_drawing_bounds.Union(drawing_b_bounds);
   EXPECT_RECT_EQ(merged_drawing_bounds, list->VisualRectForTesting(0));
   EXPECT_RECT_EQ(drawing_a_bounds, list->VisualRectForTesting(1));
   EXPECT_RECT_EQ(drawing_b_bounds, list->VisualRectForTesting(2));
@@ skipping 45 matching lines @@
 
 // Verify that raster time optimizations for compositing item / draw single op /
 // end compositing item can be collapsed together into a single draw op
 // with the opacity from the compositing item folded in.
 TEST(DisplayItemListTest, SaveDrawRestore) {
   auto list = make_scoped_refptr(new DisplayItemList);
 
   list->CreateAndAppendPairedBeginItem<CompositingDisplayItem>(
       80, SkBlendMode::kSrcOver, nullptr, nullptr, false);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
-      kVisualRect, CreateRectPictureWithAlpha(kVisualRect, 40));
+      kVisualRect, CreateRectPictureWithAlpha(kVisualRect, 40),
+      gfx::RectToSkRect(kVisualRect));
   list->CreateAndAppendPairedEndItem<EndCompositingDisplayItem>();
   list->Finalize();
 
   SaveCountingCanvas canvas;
   list->Raster(&canvas);
 
   EXPECT_EQ(0, canvas.save_count_);
   EXPECT_EQ(0, canvas.restore_count_);
   EXPECT_EQ(gfx::RectToSkRect(kVisualRect), canvas.draw_rect_);
 
@@ skipping 29 matching lines @@
 // The same as SaveDrawRestore, but with save flags that prevent the
 // optimization.
 TEST(DisplayItemListTest, SaveDrawRestoreFail_BadSaveFlags) {
   auto list = make_scoped_refptr(new DisplayItemList);
 
   // Use a blend mode that's not compatible with the SaveDrawRestore
   // optimization.
   list->CreateAndAppendPairedBeginItem<CompositingDisplayItem>(
       80, SkBlendMode::kSrc, nullptr, nullptr, false);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
-      kVisualRect, CreateRectPictureWithAlpha(kVisualRect, 40));
+      kVisualRect, CreateRectPictureWithAlpha(kVisualRect, 40),
+      gfx::RectToSkRect(kVisualRect));
   list->CreateAndAppendPairedEndItem<EndCompositingDisplayItem>();
   list->Finalize();
 
   SaveCountingCanvas canvas;
   list->Raster(&canvas);
 
   EXPECT_EQ(1, canvas.save_count_);
   EXPECT_EQ(1, canvas.restore_count_);
   EXPECT_EQ(gfx::RectToSkRect(kVisualRect), canvas.draw_rect_);
   EXPECT_LE(40, canvas.paint_.getAlpha());
 }
 
 // The same as SaveDrawRestore, but with too many ops in the PaintRecord.
 TEST(DisplayItemListTest, SaveDrawRestoreFail_TooManyOps) {
   sk_sp<const PaintRecord> record;
+  SkRect bounds = SkRect::MakeWH(kVisualRect.width(), kVisualRect.height());
   {
     PaintRecorder recorder;
-    PaintCanvas* canvas =
-        recorder.beginRecording(kVisualRect.width(), kVisualRect.height());
+    PaintCanvas* canvas = recorder.beginRecording(bounds);
     PaintFlags flags;
     flags.setAlpha(40);
     canvas->drawRect(gfx::RectToSkRect(kVisualRect), flags);
     // Add an extra op here.
     canvas->drawRect(gfx::RectToSkRect(kVisualRect), flags);
     record = recorder.finishRecordingAsPicture();
   }
   EXPECT_GT(record->size(), 1u);
 
   auto list = make_scoped_refptr(new DisplayItemList);
 
   list->CreateAndAppendPairedBeginItem<CompositingDisplayItem>(
       80, SkBlendMode::kSrcOver, nullptr, nullptr, false);
-  list->CreateAndAppendDrawingItem<DrawingDisplayItem>(kVisualRect,
-                                                       std::move(record));
+  list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
+      kVisualRect, std::move(record), bounds);
   list->CreateAndAppendPairedEndItem<EndCompositingDisplayItem>();
   list->Finalize();
 
   SaveCountingCanvas canvas;
   list->Raster(&canvas);
 
   EXPECT_EQ(1, canvas.save_count_);
   EXPECT_EQ(1, canvas.restore_count_);
   EXPECT_EQ(gfx::RectToSkRect(kVisualRect), canvas.draw_rect_);
   EXPECT_LE(40, canvas.paint_.getAlpha());
 }
 
 }  // namespace cc