Move visual rect unioning between paired items to cc::DisplayItemList.

cc/playback/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/playback/display_item_list.h"
 
 #include <stddef.h>
 
 #include <vector>
 
@@ skipping 27 matching lines @@
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/skia_util.h"
 
 namespace cc {
 
 namespace {
 
 const gfx::Rect kVisualRect(0, 0, 42, 42);
 
+#define EXPECT_RECT_EQ(expected, actual)               \

[vmpstr, 2016/08/10 19:47:31]

Can you add this to cc/test/geometry_test_utils.h please.

[wkorman, 2016/08/10 21:04:25]

Done.

+  do {                                                 \
+    const gfx::Rect& actualRect = actual;              \
+    EXPECT_EQ(expected.x(), actualRect.x());           \
+    EXPECT_EQ(expected.y(), actualRect.y());           \
+    EXPECT_EQ(expected.width(), actualRect.width());   \
+    EXPECT_EQ(expected.height(), actualRect.height()); \
+  } while (false)
+
+scoped_refptr<DisplayItemList> CreateDefaultList() {
+  return DisplayItemList::Create(gfx::Rect(), DisplayItemListSettings());
+}
+
+sk_sp<const SkPicture> createRectPicture(const gfx::Rect& bounds) {

[vmpstr, 2016/08/10 19:47:31]

Capital c please. 

[wkorman, 2016/08/10 21:04:25]

Done.

+  SkPictureRecorder recorder;
+  sk_sp<SkCanvas> canvas;
+
+  canvas = sk_ref_sp(recorder.beginRecording(bounds.width(), bounds.height()));
+  canvas->drawRect(
+      SkRect::MakeXYWH(bounds.x(), bounds.y(), bounds.width(), bounds.height()),
+      SkPaint());
+  return recorder.finishRecordingAsPicture();
+}
+
 void AppendFirstSerializationTestPicture(scoped_refptr<DisplayItemList> list,
                                          const gfx::Size& layer_size) {
   gfx::PointF offset(2.f, 3.f);
   SkPictureRecorder recorder;
   sk_sp<SkCanvas> canvas;
 
   SkPaint red_paint;
   red_paint.setColor(SK_ColorRED);
 
   canvas = sk_ref_sp(recorder.beginRecording(SkRect::MakeXYWH(
       offset.x(), offset.y(), layer_size.width(), layer_size.height())));
   canvas->translate(offset.x(), offset.y());
   canvas->drawRectCoords(0.f, 0.f, 4.f, 4.f, red_paint);
-  list->CreateAndAppendItem<DrawingDisplayItem>(
+  list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
       kVisualRect, recorder.finishRecordingAsPicture());
 }
 
 void AppendSecondSerializationTestPicture(scoped_refptr<DisplayItemList> list,
                                           const gfx::Size& layer_size) {
   gfx::PointF offset(2.f, 2.f);
   SkPictureRecorder recorder;
   sk_sp<SkCanvas> canvas;
 
   SkPaint blue_paint;
   blue_paint.setColor(SK_ColorBLUE);
 
   canvas = sk_ref_sp(recorder.beginRecording(SkRect::MakeXYWH(
       offset.x(), offset.y(), layer_size.width(), layer_size.height())));
   canvas->translate(offset.x(), offset.y());
   canvas->drawRectCoords(3.f, 3.f, 7.f, 7.f, blue_paint);
-  list->CreateAndAppendItem<DrawingDisplayItem>(
+  list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
       kVisualRect, recorder.finishRecordingAsPicture());
 }
 
 void ValidateDisplayItemListSerialization(const gfx::Size& layer_size,
                                           scoped_refptr<DisplayItemList> list) {
   list->Finalize();
 
   std::unique_ptr<FakeImageSerializationProcessor>
       fake_image_serialization_processor =
           base::WrapUnique(new FakeImageSerializationProcessor);
@@ skipping 64 matching lines @@
   scoped_refptr<DisplayItemList> list =
       DisplayItemList::Create(gfx::Rect(layer_size), settings);
 
   // Build the DrawingDisplayItem.
   AppendFirstSerializationTestPicture(list, layer_size);
 
   // Build the ClipDisplayItem.
   gfx::Rect clip_rect(6, 6, 1, 1);
   std::vector<SkRRect> rrects;
   rrects.push_back(SkRRect::MakeOval(SkRect::MakeXYWH(5.f, 5.f, 4.f, 4.f)));
-  list->CreateAndAppendItem<ClipDisplayItem>(kVisualRect, clip_rect, rrects,
-                                             true);
+  list->CreateAndAppendPairedBeginItem<ClipDisplayItem>(clip_rect, rrects,
+                                                        true);
 
   // Build the second DrawingDisplayItem.
   AppendSecondSerializationTestPicture(list, layer_size);
 
   // Build the EndClipDisplayItem.
-  list->CreateAndAppendItem<EndClipDisplayItem>(kVisualRect);
+  list->CreateAndAppendPairedEndItem<EndClipDisplayItem>();
 
   ValidateDisplayItemListSerialization(layer_size, list);
 }
 
 TEST(DisplayItemListTest, SerializeClipPathItem) {
   gfx::Size layer_size(10, 10);
 
   DisplayItemListSettings settings;
   scoped_refptr<DisplayItemList> list =
       DisplayItemList::Create(gfx::Rect(layer_size), settings);
 
   // Build the DrawingDisplayItem.
   AppendFirstSerializationTestPicture(list, layer_size);
 
   // Build the ClipPathDisplayItem.
   SkPath path;
   path.addCircle(5.f, 5.f, 2.f, SkPath::Direction::kCW_Direction);
-  list->CreateAndAppendItem<ClipPathDisplayItem>(
-      kVisualRect, path, SkRegion::Op::kReplace_Op, false);
+  list->CreateAndAppendPairedBeginItem<ClipPathDisplayItem>(
+      path, SkRegion::Op::kReplace_Op, false);
 
   // Build the second DrawingDisplayItem.
   AppendSecondSerializationTestPicture(list, layer_size);
 
   // Build the EndClipPathDisplayItem.
-  list->CreateAndAppendItem<EndClipPathDisplayItem>(kVisualRect);
+  list->CreateAndAppendPairedEndItem<EndClipPathDisplayItem>();
 
   ValidateDisplayItemListSerialization(layer_size, list);
 }
 
 TEST(DisplayItemListTest, SerializeCompositingItem) {
   gfx::Size layer_size(10, 10);
 
   DisplayItemListSettings settings;
   scoped_refptr<DisplayItemList> list =
       DisplayItemList::Create(gfx::Rect(layer_size), settings);
 
   // Build the DrawingDisplayItem.
   AppendFirstSerializationTestPicture(list, layer_size);
 
   // Build the CompositingDisplayItem.
-  list->CreateAndAppendItem<CompositingDisplayItem>(
-      kVisualRect, 150, SkXfermode::Mode::kDst_Mode, nullptr,
+  list->CreateAndAppendPairedBeginItem<CompositingDisplayItem>(
+      150, SkXfermode::Mode::kDst_Mode, nullptr,
       SkColorMatrixFilter::MakeLightingFilter(SK_ColorRED, SK_ColorGREEN),
       false);
 
   // Build the second DrawingDisplayItem.
   AppendSecondSerializationTestPicture(list, layer_size);
 
   // Build the EndCompositingDisplayItem.
-  list->CreateAndAppendItem<EndCompositingDisplayItem>(kVisualRect);
+  list->CreateAndAppendPairedEndItem<EndCompositingDisplayItem>();
 
   ValidateDisplayItemListSerialization(layer_size, list);
 }
 
 TEST(DisplayItemListTest, SerializeFloatClipItem) {
   gfx::Size layer_size(10, 10);
 
   DisplayItemListSettings settings;
   scoped_refptr<DisplayItemList> list =
       DisplayItemList::Create(gfx::Rect(layer_size), settings);
 
   // Build the DrawingDisplayItem.
   AppendFirstSerializationTestPicture(list, layer_size);
 
   // Build the FloatClipDisplayItem.
   gfx::RectF clip_rect(6.f, 6.f, 1.f, 1.f);
-  list->CreateAndAppendItem<FloatClipDisplayItem>(kVisualRect, clip_rect);
+  list->CreateAndAppendPairedBeginItem<FloatClipDisplayItem>(clip_rect);
 
   // Build the second DrawingDisplayItem.
   AppendSecondSerializationTestPicture(list, layer_size);
 
   // Build the EndFloatClipDisplayItem.
-  list->CreateAndAppendItem<EndFloatClipDisplayItem>(kVisualRect);
+  list->CreateAndAppendPairedEndItem<EndFloatClipDisplayItem>();
 
   ValidateDisplayItemListSerialization(layer_size, list);
 }
 
 TEST(DisplayItemListTest, SerializeTransformItem) {
   gfx::Size layer_size(10, 10);
 
   DisplayItemListSettings settings;
   scoped_refptr<DisplayItemList> list =
       DisplayItemList::Create(gfx::Rect(layer_size), settings);
 
   // Build the DrawingDisplayItem.
   AppendFirstSerializationTestPicture(list, layer_size);
 
   // Build the TransformDisplayItem.
   gfx::Transform transform;
   transform.Scale(1.25f, 1.25f);
   transform.Translate(-1.f, -1.f);
-  list->CreateAndAppendItem<TransformDisplayItem>(kVisualRect, transform);
+  list->CreateAndAppendPairedBeginItem<TransformDisplayItem>(transform);
 
   // Build the second DrawingDisplayItem.
   AppendSecondSerializationTestPicture(list, layer_size);
 
   // Build the EndTransformDisplayItem.
-  list->CreateAndAppendItem<EndTransformDisplayItem>(kVisualRect);
+  list->CreateAndAppendPairedEndItem<EndTransformDisplayItem>();
 
   ValidateDisplayItemListSerialization(layer_size, list);
 }
 
 TEST(DisplayItemListTest, SingleDrawingItem) {
   gfx::Rect layer_rect(100, 100);
   SkPictureRecorder recorder;
   sk_sp<SkCanvas> canvas;
   SkPaint blue_paint;
   blue_paint.setColor(SK_ColorBLUE);
   SkPaint red_paint;
   red_paint.setColor(SK_ColorRED);
   unsigned char pixels[4 * 100 * 100] = {0};
   DisplayItemListSettings settings;
   scoped_refptr<DisplayItemList> list =
       DisplayItemList::Create(layer_rect, settings);
 
   gfx::PointF offset(8.f, 9.f);
   gfx::RectF recording_rect(offset, gfx::SizeF(layer_rect.size()));
   canvas =
       sk_ref_sp(recorder.beginRecording(gfx::RectFToSkRect(recording_rect)));
   canvas->translate(offset.x(), offset.y());
   canvas->drawRectCoords(0.f, 0.f, 60.f, 60.f, red_paint);
   canvas->drawRectCoords(50.f, 50.f, 75.f, 75.f, blue_paint);
-  list->CreateAndAppendItem<DrawingDisplayItem>(
+  list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
       kVisualRect, recorder.finishRecordingAsPicture());
   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());
   SkCanvas expected_canvas(expected_bitmap);
@@ skipping 21 matching lines @@
   settings.use_cached_picture = true;
   scoped_refptr<DisplayItemList> list =
       DisplayItemList::Create(layer_rect, settings);
 
   gfx::PointF first_offset(8.f, 9.f);
   gfx::RectF first_recording_rect(first_offset, gfx::SizeF(layer_rect.size()));
   canvas = sk_ref_sp(
       recorder.beginRecording(gfx::RectFToSkRect(first_recording_rect)));
   canvas->translate(first_offset.x(), first_offset.y());
   canvas->drawRectCoords(0.f, 0.f, 60.f, 60.f, red_paint);
-  list->CreateAndAppendItem<DrawingDisplayItem>(
+  list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
       kVisualRect, recorder.finishRecordingAsPicture());
 
   gfx::Rect clip_rect(60, 60, 10, 10);
-  list->CreateAndAppendItem<ClipDisplayItem>(kVisualRect, clip_rect,
-                                             std::vector<SkRRect>(), true);
+  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 = sk_ref_sp(
       recorder.beginRecording(gfx::RectFToSkRect(second_recording_rect)));
   canvas->translate(second_offset.x(), second_offset.y());
   canvas->drawRectCoords(50.f, 50.f, 75.f, 75.f, blue_paint);
-  list->CreateAndAppendItem<DrawingDisplayItem>(
+  list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
       kVisualRect, recorder.finishRecordingAsPicture());
 
-  list->CreateAndAppendItem<EndClipDisplayItem>(kVisualRect);
+  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());
   expected_bitmap.installPixels(info, expected_pixels, info.minRowBytes());
   SkCanvas expected_canvas(expected_bitmap);
@@ skipping 22 matching lines @@
   settings.use_cached_picture = true;
   scoped_refptr<DisplayItemList> list =
       DisplayItemList::Create(layer_rect, settings);
 
   gfx::PointF first_offset(8.f, 9.f);
   gfx::RectF first_recording_rect(first_offset, gfx::SizeF(layer_rect.size()));
   canvas = sk_ref_sp(
       recorder.beginRecording(gfx::RectFToSkRect(first_recording_rect)));
   canvas->translate(first_offset.x(), first_offset.y());
   canvas->drawRectCoords(0.f, 0.f, 60.f, 60.f, red_paint);
-  list->CreateAndAppendItem<DrawingDisplayItem>(
+  list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
       kVisualRect, recorder.finishRecordingAsPicture());
 
   gfx::Transform transform;
   transform.Rotate(45.0);
-  list->CreateAndAppendItem<TransformDisplayItem>(kVisualRect, transform);
+  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 = sk_ref_sp(
       recorder.beginRecording(gfx::RectFToSkRect(second_recording_rect)));
   canvas->translate(second_offset.x(), second_offset.y());
   canvas->drawRectCoords(50.f, 50.f, 75.f, 75.f, blue_paint);
-  list->CreateAndAppendItem<DrawingDisplayItem>(
+  list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
       kVisualRect, recorder.finishRecordingAsPicture());
 
-  list->CreateAndAppendItem<EndTransformDisplayItem>(kVisualRect);
+  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());
   expected_bitmap.installPixels(info, expected_pixels, info.minRowBytes());
   SkCanvas expected_canvas(expected_bitmap);
@@ skipping 31 matching lines @@
   // involve |src| at all. Incorrectly assuming such a relationship (e.g. by
   // translating |dst| after it is computed by computeFastBounds, rather than
   // translating |src| before it provided to computedFastBounds) can cause
   // incorrect clipping of filter output. To test for this, we include an
   // SkImageSource filter in |filters|. Here, |src| is |filter_bounds|, defined
   // below.
   sk_sp<SkImageFilter> image_filter = SkImageSource::Make(source_image);
   filters.Append(FilterOperation::CreateReferenceFilter(image_filter));
   filters.Append(FilterOperation::CreateBrightnessFilter(0.5f));
   gfx::RectF filter_bounds(10.f, 10.f, 50.f, 50.f);
-  list->CreateAndAppendItem<FilterDisplayItem>(kVisualRect, filters,
-                                               filter_bounds);
-  list->CreateAndAppendItem<EndFilterDisplayItem>(kVisualRect);
+  list->CreateAndAppendPairedBeginItem<FilterDisplayItem>(filters,
+                                                          filter_bounds);
+  list->CreateAndAppendPairedEndItem<EndFilterDisplayItem>();
   list->Finalize();
 
   DrawDisplayList(pixels, layer_rect, list);
 
   SkBitmap expected_bitmap;
   unsigned char expected_pixels[4 * 100 * 100] = {0};
   SkPaint paint;
   paint.setColor(SkColorSetRGB(64, 64, 64));
   SkImageInfo info =
       SkImageInfo::MakeN32Premul(layer_rect.width(), layer_rect.height());
@@ skipping 21 matching lines @@
   no_caching_settings.use_cached_picture = false;
   scoped_refptr<DisplayItemList> list_without_caching =
       DisplayItemList::Create(layer_rect, no_caching_settings);
 
   canvas =
       sk_ref_sp(recorder.beginRecording(gfx::RectFToSkRect(recording_rect)));
   canvas->translate(offset.x(), offset.y());
   canvas->drawRectCoords(0.f, 0.f, 60.f, 60.f, red_paint);
   canvas->drawRectCoords(50.f, 50.f, 75.f, 75.f, blue_paint);
   sk_sp<SkPicture> picture = recorder.finishRecordingAsPicture();
-  list_without_caching->CreateAndAppendItem<DrawingDisplayItem>(kVisualRect,
-                                                                picture);
+  list_without_caching->CreateAndAppendDrawingItem<DrawingDisplayItem>(
+      kVisualRect, picture);
   list_without_caching->Finalize();
   DrawDisplayList(pixels, layer_rect, list_without_caching);
 
   unsigned char expected_pixels[4 * 100 * 100] = {0};
   DisplayItemListSettings caching_settings;
   caching_settings.use_cached_picture = true;
   scoped_refptr<DisplayItemList> list_with_caching =
       DisplayItemList::Create(layer_rect, caching_settings);
-  list_with_caching->CreateAndAppendItem<DrawingDisplayItem>(kVisualRect,
-                                                             picture);
+  list_with_caching->CreateAndAppendDrawingItem<DrawingDisplayItem>(kVisualRect,
+                                                                    picture);
   list_with_caching->Finalize();
   DrawDisplayList(expected_pixels, layer_rect, list_with_caching);
 
   EXPECT_EQ(0, memcmp(pixels, expected_pixels, 4 * 100 * 100));
 }
 
 TEST(DisplayItemListTest, ApproximateMemoryUsage) {
   const int kNumCommandsInTestSkPicture = 1000;
   scoped_refptr<DisplayItemList> list;
   size_t memory_usage;
 
   // Make an SkPicture whose size is known.
   gfx::Rect layer_rect(100, 100);
   SkPictureRecorder recorder;
   SkPaint blue_paint;
   blue_paint.setColor(SK_ColorBLUE);
   SkCanvas* canvas = recorder.beginRecording(gfx::RectToSkRect(layer_rect));
   for (int i = 0; i < kNumCommandsInTestSkPicture; i++)
     canvas->drawPaint(blue_paint);
   sk_sp<SkPicture> picture = recorder.finishRecordingAsPicture();
   size_t picture_size = SkPictureUtils::ApproximateBytesUsed(picture.get());
   ASSERT_GE(picture_size, kNumCommandsInTestSkPicture * sizeof(blue_paint));
 
   // Using a cached picture, we should get about the right size.
   DisplayItemListSettings caching_settings;
   caching_settings.use_cached_picture = true;
   list = DisplayItemList::Create(layer_rect, caching_settings);
-  list->CreateAndAppendItem<DrawingDisplayItem>(kVisualRect, picture);
+  list->CreateAndAppendDrawingItem<DrawingDisplayItem>(kVisualRect, picture);
   list->Finalize();
   memory_usage = list->ApproximateMemoryUsage();
   EXPECT_GE(memory_usage, picture_size);
   EXPECT_LE(memory_usage, 2 * picture_size);
 
   // Using no cached picture, we should still get the right size.
   DisplayItemListSettings no_caching_settings;
   no_caching_settings.use_cached_picture = false;
   list = DisplayItemList::Create(layer_rect, no_caching_settings);
-  list->CreateAndAppendItem<DrawingDisplayItem>(kVisualRect, picture);
+  list->CreateAndAppendDrawingItem<DrawingDisplayItem>(kVisualRect, picture);
   list->Finalize();
   memory_usage = list->ApproximateMemoryUsage();
   EXPECT_GE(memory_usage, picture_size);
   EXPECT_LE(memory_usage, 2 * picture_size);
 
   // To avoid double counting, we expect zero size to be computed if both the
   // picture and items are retained (currently this only happens due to certain
   // categories being traced).
   list = new DisplayItemList(layer_rect, caching_settings, true);
-  list->CreateAndAppendItem<DrawingDisplayItem>(kVisualRect, picture);
+  list->CreateAndAppendDrawingItem<DrawingDisplayItem>(kVisualRect, picture);
   list->Finalize();
   memory_usage = list->ApproximateMemoryUsage();
   EXPECT_EQ(static_cast<size_t>(0), memory_usage);
 }
 
 TEST(DisplayItemListTest, AsValueWithRectAndNoItems) {
   scoped_refptr<DisplayItemList> list =
       DisplayItemList::Create(gfx::Rect(1, 2, 8, 9), DisplayItemListSettings());
   list->Finalize();
 
   std::string value = list->AsValue(true)->ToString();
   EXPECT_NE(value.find("\"items\":[]"), std::string::npos);
   EXPECT_NE(value.find("\"layer_rect\":[1,2,8,9]"), std::string::npos);
   EXPECT_NE(value.find("\"skp64\":"), std::string::npos);
 
   value = list->AsValue(false)->ToString();
   EXPECT_EQ(value.find("\"items\":"), std::string::npos);
   EXPECT_NE(value.find("\"layer_rect\":[1,2,8,9]"), std::string::npos);
   EXPECT_NE(value.find("\"skp64\":"), std::string::npos);
 }
 
 TEST(DisplayItemListTest, AsValueWithRectAndItems) {
   gfx::Rect layer_rect = gfx::Rect(1, 2, 8, 9);
   scoped_refptr<DisplayItemList> list =
       DisplayItemList::Create(layer_rect, DisplayItemListSettings());
   gfx::Transform transform;
   transform.Translate(6.f, 7.f);
-  list->CreateAndAppendItem<TransformDisplayItem>(kVisualRect, transform);
+  list->CreateAndAppendPairedBeginItem<TransformDisplayItem>(transform);
   AppendFirstSerializationTestPicture(list, layer_rect.size());
-  list->CreateAndAppendItem<EndTransformDisplayItem>(kVisualRect);
+  list->CreateAndAppendPairedEndItem<EndTransformDisplayItem>();
   list->Finalize();
 
   std::string value = list->AsValue(true)->ToString();
   EXPECT_NE(value.find("{\"items\":[\"TransformDisplayItem"),
             std::string::npos);
   EXPECT_NE(value.find("\"layer_rect\":[1,2,8,9]"), std::string::npos);
   EXPECT_NE(value.find("\"skp64\":"), std::string::npos);
 
   value = list->AsValue(false)->ToString();
   EXPECT_EQ(value.find("{\"items\":[\"TransformDisplayItem"),
             std::string::npos);
   EXPECT_NE(value.find("\"layer_rect\":[1,2,8,9]"), std::string::npos);
   EXPECT_NE(value.find("\"skp64\":"), std::string::npos);
 }
 
 TEST(DisplayItemListTest, AsValueWithEmptyRectAndNoItems) {
-  scoped_refptr<DisplayItemList> list =
-      DisplayItemList::Create(gfx::Rect(), DisplayItemListSettings());
+  scoped_refptr<DisplayItemList> list = CreateDefaultList();
   list->Finalize();
 
   std::string value = list->AsValue(true)->ToString();
   EXPECT_NE(value.find("\"items\":[]"), std::string::npos);
   EXPECT_NE(value.find("\"layer_rect\":[0,0,0,0]"), std::string::npos);
   EXPECT_EQ(value.find("\"skp64\":"), std::string::npos);
 
   value = list->AsValue(false)->ToString();
   EXPECT_EQ(value.find("\"items\":"), std::string::npos);
   EXPECT_NE(value.find("\"layer_rect\":[0,0,0,0]"), std::string::npos);
   EXPECT_EQ(value.find("\"skp64\":"), std::string::npos);
 }
 
 TEST(DisplayItemListTest, AsValueWithEmptyRectAndItems) {
-  scoped_refptr<DisplayItemList> list =
-      DisplayItemList::Create(gfx::Rect(), DisplayItemListSettings());
+  scoped_refptr<DisplayItemList> list = CreateDefaultList();
   gfx::Transform transform;
   transform.Translate(6.f, 7.f);
-  list->CreateAndAppendItem<TransformDisplayItem>(kVisualRect, transform);
+  list->CreateAndAppendPairedBeginItem<TransformDisplayItem>(transform);
   AppendFirstSerializationTestPicture(list, gfx::Size());
-  list->CreateAndAppendItem<EndTransformDisplayItem>(kVisualRect);
+  list->CreateAndAppendPairedEndItem<EndTransformDisplayItem>();
   list->Finalize();
 
   std::string value = list->AsValue(true)->ToString();
   EXPECT_NE(value.find("\"items\":[\"TransformDisplayItem"), std::string::npos);
   EXPECT_NE(value.find("\"layer_rect\":[0,0,0,0]"), std::string::npos);
   // There should be one skp64 entry present associated with the test picture
   // item, though the overall list has no skp64 as the layer rect is empty.
   EXPECT_NE(value.find("\"skp64\":"), std::string::npos);
 
   value = list->AsValue(false)->ToString();
   EXPECT_EQ(value.find("\"items\":"), std::string::npos);
   EXPECT_NE(value.find("\"layer_rect\":[0,0,0,0]"), std::string::npos);
   // There should be no skp64 entry present as the items aren't included and the
   // layer rect is empty.
   EXPECT_EQ(value.find("\"skp64\":"), std::string::npos);
 }
 
+TEST(DisplayItemListTest, Size_Empty) {

[vmpstr, 2016/08/10 19:47:31]

s/_//g here and throughout. 

[wkorman, 2016/08/10 21:04:26]

Ah, that's unfortunate, I find this style much easier to interpret, but ok.

+  scoped_refptr<DisplayItemList> list = CreateDefaultList();
+  EXPECT_EQ(static_cast<size_t>(0), list->size());
+}
+
+TEST(DisplayItemListTest, Size_One) {
+  scoped_refptr<DisplayItemList> list = CreateDefaultList();
+  gfx::Rect drawing_bounds(5, 6, 1, 1);
+  list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
+      drawing_bounds, createRectPicture(drawing_bounds));
+  EXPECT_EQ(static_cast<size_t>(1), list->size());

[vmpstr, 2016/08/10 19:47:31]

1u instead of static_cast here and throughout.

[wkorman, 2016/08/10 21:04:25]

Done.

+}
+
+TEST(DisplayItemListTest, Size_Multiple) {
+  scoped_refptr<DisplayItemList> list = CreateDefaultList();
+  gfx::Rect clip_bounds(5, 6, 7, 8);
+  list->CreateAndAppendPairedBeginItem<ClipDisplayItem>(
+      clip_bounds, std::vector<SkRRect>(), true);
+  list->CreateAndAppendPairedEndItem<EndClipDisplayItem>();
+  EXPECT_EQ(static_cast<size_t>(2), list->size());
+}
+
+TEST(DisplayItemListTest, AppendVisualRect_Simple) {
+  scoped_refptr<DisplayItemList> list = CreateDefaultList();
+
+  // One drawing: D.
+
+  gfx::Rect drawing_bounds(5, 6, 7, 8);
+  list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
+      drawing_bounds, createRectPicture(drawing_bounds));
+
+  EXPECT_EQ(static_cast<size_t>(1), list->size());
+  EXPECT_RECT_EQ(drawing_bounds, list->VisualRectForTesting(0));
+}
+
+TEST(DisplayItemListTest, AppendVisualRect_EmptyBlock) {
+  scoped_refptr<DisplayItemList> list = CreateDefaultList();
+
+  // One block: B1, E1.
+
+  gfx::Rect clip_bounds(5, 6, 7, 8);
+  list->CreateAndAppendPairedBeginItem<ClipDisplayItem>(
+      clip_bounds, std::vector<SkRRect>(), true);
+
+  list->CreateAndAppendPairedEndItem<EndClipDisplayItem>();
+
+  EXPECT_EQ(static_cast<size_t>(2), list->size());
+  EXPECT_RECT_EQ(gfx::Rect(), list->VisualRectForTesting(0));
+  EXPECT_RECT_EQ(gfx::Rect(), list->VisualRectForTesting(1));
+}
+
+TEST(DisplayItemListTest, AppendVisualRect_EmptyBlockContainingEmptyBlock) {
+  scoped_refptr<DisplayItemList> list = CreateDefaultList();
+
+  // Two nested blocks: B1, B2, E2, E1.
+
+  gfx::Rect clip_bounds(5, 6, 7, 8);
+  list->CreateAndAppendPairedBeginItem<ClipDisplayItem>(
+      clip_bounds, std::vector<SkRRect>(), true);
+  list->CreateAndAppendPairedBeginItem<TransformDisplayItem>(gfx::Transform());
+  list->CreateAndAppendPairedEndItem<EndTransformDisplayItem>();
+  list->CreateAndAppendPairedEndItem<EndClipDisplayItem>();
+
+  EXPECT_EQ(static_cast<size_t>(4), list->size());
+  EXPECT_RECT_EQ(gfx::Rect(), list->VisualRectForTesting(0));
+  EXPECT_RECT_EQ(gfx::Rect(), list->VisualRectForTesting(1));
+  EXPECT_RECT_EQ(gfx::Rect(), list->VisualRectForTesting(2));
+  EXPECT_RECT_EQ(gfx::Rect(), list->VisualRectForTesting(3));
+}
+
+TEST(DisplayItemListTest, AppendVisualRect_BlockContainingDrawing) {
+  scoped_refptr<DisplayItemList> list = CreateDefaultList();
+
+  // 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));
+
+  list->CreateAndAppendPairedEndItem<EndClipDisplayItem>();
+
+  EXPECT_EQ(static_cast<size_t>(3), 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, AppendVisualRect_BlockContainingEscapedDrawing) {
+  scoped_refptr<DisplayItemList> list = CreateDefaultList();
+
+  // One block with one drawing: B1, Da (escapes), E1.

[vmpstr, 2016/08/10 19:47:31]

What does "escapes" mean in this case?

[wkorman, 2016/08/10 21:04:25]

It means "escapes the clip", as in, the drawing's bounds are outside of the clip
bounds. Prior to this patch the naming made a bit more sense, since the clip had
its own visual rect, so in addition to the contained drawing "escaping the
clip", it also escaped the visual rect of the clip.

I think the tests are still useful. Their focus has changed to one where they
validate that paired items end up with a visual rect unioned from their
contained drawings, whereas previously it was their pre-existing visual rect,
unioned with that of the drawing's.

I didn't immediately think of better naming, but open to thoughts.

+
+  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));
+
+  list->CreateAndAppendPairedEndItem<EndClipDisplayItem>();
+
+  EXPECT_EQ(static_cast<size_t>(3), 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,
+     AppendVisualRect_DrawingFollowedByBlockContainingEscapedDrawing) {
+  scoped_refptr<DisplayItemList> list = CreateDefaultList();
+
+  // 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));
+
+  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));
+
+  list->CreateAndAppendPairedEndItem<EndClipDisplayItem>();
+
+  EXPECT_EQ(static_cast<size_t>(4), 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, AppendVisualRect_TwoBlocksTwoDrawings) {
+  scoped_refptr<DisplayItemList> list = CreateDefaultList();
+
+  // 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));
+
+  list->CreateAndAppendPairedBeginItem<TransformDisplayItem>(gfx::Transform());
+
+  gfx::Rect drawing_b_bounds(7, 8, 1, 1);
+  list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
+      drawing_b_bounds, createRectPicture(drawing_b_bounds));
+
+  list->CreateAndAppendPairedEndItem<EndTransformDisplayItem>();
+  list->CreateAndAppendPairedEndItem<EndClipDisplayItem>();
+
+  EXPECT_EQ(static_cast<size_t>(6), 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,
+     AppendVisualRect_TwoBlocksTwoDrawingsInnerDrawingEscaped) {
+  scoped_refptr<DisplayItemList> list = CreateDefaultList();
+
+  // 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));
+
+  list->CreateAndAppendPairedBeginItem<TransformDisplayItem>(gfx::Transform());
+
+  gfx::Rect drawing_b_bounds(1, 2, 3, 4);
+  list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
+      drawing_b_bounds, createRectPicture(drawing_b_bounds));
+
+  list->CreateAndAppendPairedEndItem<EndTransformDisplayItem>();
+  list->CreateAndAppendPairedEndItem<EndClipDisplayItem>();
+
+  EXPECT_EQ(static_cast<size_t>(6), 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,
+     AppendVisualRect_TwoBlocksTwoDrawingsOuterDrawingEscaped) {
+  scoped_refptr<DisplayItemList> list = CreateDefaultList();
+
+  // 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));
+
+  list->CreateAndAppendPairedBeginItem<TransformDisplayItem>(gfx::Transform());
+
+  gfx::Rect drawing_b_bounds(7, 8, 1, 1);
+  list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
+      drawing_b_bounds, createRectPicture(drawing_b_bounds));
+
+  list->CreateAndAppendPairedEndItem<EndTransformDisplayItem>();
+  list->CreateAndAppendPairedEndItem<EndClipDisplayItem>();
+
+  EXPECT_EQ(static_cast<size_t>(6), 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,
+     AppendVisualRect_TwoBlocksTwoDrawingsBothDrawingsEscaped) {
+  scoped_refptr<DisplayItemList> list = CreateDefaultList();
+
+  // 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));
+
+  list->CreateAndAppendPairedBeginItem<TransformDisplayItem>(gfx::Transform());
+
+  gfx::Rect drawing_b_bounds(1, 2, 3, 4);
+  list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
+      drawing_b_bounds, createRectPicture(drawing_b_bounds));
+
+  list->CreateAndAppendPairedEndItem<EndTransformDisplayItem>();
+  list->CreateAndAppendPairedEndItem<EndClipDisplayItem>();
+
+  EXPECT_EQ(static_cast<size_t>(6), 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));
+}
+
 }  // namespace cc