WIP: Fix foreignObject cullrect

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 102 matching lines @@
     settings.ToProtobuf(&proto);
     DisplayItemListSettings deserialized(proto);
     EXPECT_EQ(settings.use_cached_picture, deserialized.use_cached_picture);
   }
 }
 
 TEST(DisplayItemListTest, SerializeSingleDrawingItem) {
   gfx::Size layer_size(10, 10);
 
   DisplayItemListSettings settings;
-  scoped_refptr<DisplayItemList> list =
-      DisplayItemList::Create(gfx::Rect(layer_size), settings);
+  settings.use_cached_picture = true;
+  scoped_refptr<DisplayItemList> list = DisplayItemList::Create(settings);
+  list->SetRetainVisualRectsForTesting(true);
 
   // Build the DrawingDisplayItem.
   AppendFirstSerializationTestPicture(list, layer_size);
 
   ValidateDisplayItemListSerialization(layer_size, list);
 }
 
 TEST(DisplayItemListTest, SerializeClipItem) {
   gfx::Size layer_size(10, 10);
 
   DisplayItemListSettings settings;
-  scoped_refptr<DisplayItemList> list =
-      DisplayItemList::Create(gfx::Rect(layer_size), settings);
+  settings.use_cached_picture = true;
+  scoped_refptr<DisplayItemList> list = DisplayItemList::Create(settings);
+  list->SetRetainVisualRectsForTesting(true);
 
   // 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);
 
   // Build the second DrawingDisplayItem.
   AppendSecondSerializationTestPicture(list, layer_size);
 
   // Build the EndClipDisplayItem.
   list->CreateAndAppendItem<EndClipDisplayItem>(kVisualRect);
 
   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);
+  settings.use_cached_picture = true;
+  scoped_refptr<DisplayItemList> list = DisplayItemList::Create(settings);
+  list->SetRetainVisualRectsForTesting(true);
 
   // 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);
 
   // Build the second DrawingDisplayItem.
   AppendSecondSerializationTestPicture(list, layer_size);
 
   // Build the EndClipPathDisplayItem.
   list->CreateAndAppendItem<EndClipPathDisplayItem>(kVisualRect);
 
   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);
+  settings.use_cached_picture = true;
+  scoped_refptr<DisplayItemList> list = DisplayItemList::Create(settings);
+  list->SetRetainVisualRectsForTesting(true);
 
   // Build the DrawingDisplayItem.
   AppendFirstSerializationTestPicture(list, layer_size);
 
   // Build the CompositingDisplayItem.
   skia::RefPtr<SkColorFilter> filter = skia::AdoptRef(
       SkColorMatrixFilter::CreateLightingFilter(SK_ColorRED, SK_ColorGREEN));
   list->CreateAndAppendItem<CompositingDisplayItem>(
       kVisualRect, 150, SkXfermode::Mode::kDst_Mode, nullptr, filter, false);
 
   // Build the second DrawingDisplayItem.
   AppendSecondSerializationTestPicture(list, layer_size);
 
   // Build the EndCompositingDisplayItem.
   list->CreateAndAppendItem<EndCompositingDisplayItem>(kVisualRect);
 
   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);
+  settings.use_cached_picture = true;
+  scoped_refptr<DisplayItemList> list = DisplayItemList::Create(settings);
+  list->SetRetainVisualRectsForTesting(true);
 
   // 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);
 
   // Build the second DrawingDisplayItem.
   AppendSecondSerializationTestPicture(list, layer_size);
 
   // Build the EndFloatClipDisplayItem.
   list->CreateAndAppendItem<EndFloatClipDisplayItem>(kVisualRect);
 
   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);
+  settings.use_cached_picture = true;
+  scoped_refptr<DisplayItemList> list = DisplayItemList::Create(settings);
+  list->SetRetainVisualRectsForTesting(true);
 
   // 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);
 
   // Build the second DrawingDisplayItem.
   AppendSecondSerializationTestPicture(list, layer_size);
 
   // Build the EndTransformDisplayItem.
   list->CreateAndAppendItem<EndTransformDisplayItem>(kVisualRect);
 
   ValidateDisplayItemListSerialization(layer_size, list);
 }
 
 TEST(DisplayItemListTest, SingleDrawingItem) {
   gfx::Rect layer_rect(100, 100);
   SkPictureRecorder recorder;
   skia::RefPtr<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);
+  settings.use_cached_picture = true;
+  scoped_refptr<DisplayItemList> list = DisplayItemList::Create(settings);
 
   gfx::PointF offset(8.f, 9.f);
   gfx::RectF recording_rect(offset, gfx::SizeF(layer_rect.size()));
   canvas = skia::SharePtr(
       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>(
       kVisualRect, recorder.finishRecordingAsPicture());
@@ skipping 21 matching lines @@
   gfx::Rect layer_rect(100, 100);
   SkPictureRecorder recorder;
   skia::RefPtr<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;
   settings.use_cached_picture = true;
-  scoped_refptr<DisplayItemList> list =
-      DisplayItemList::Create(layer_rect, settings);
+  scoped_refptr<DisplayItemList> list = DisplayItemList::Create(settings);
 
   gfx::PointF first_offset(8.f, 9.f);
   gfx::RectF first_recording_rect(first_offset, gfx::SizeF(layer_rect.size()));
   canvas = skia::SharePtr(
       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>(
       kVisualRect, recorder.finishRecordingAsPicture());
 
@@ skipping 38 matching lines @@
   gfx::Rect layer_rect(100, 100);
   SkPictureRecorder recorder;
   skia::RefPtr<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;
   settings.use_cached_picture = true;
-  scoped_refptr<DisplayItemList> list =
-      DisplayItemList::Create(layer_rect, settings);
+  scoped_refptr<DisplayItemList> list = DisplayItemList::Create(settings);
 
   gfx::PointF first_offset(8.f, 9.f);
   gfx::RectF first_recording_rect(first_offset, gfx::SizeF(layer_rect.size()));
   canvas = skia::SharePtr(
       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>(
       kVisualRect, recorder.finishRecordingAsPicture());
 
@@ skipping 31 matching lines @@
       50.f + second_offset.x(), 50.f + second_offset.y(),
       75.f + second_offset.x(), 75.f + second_offset.y(), blue_paint);
 
   EXPECT_EQ(0, memcmp(pixels, expected_pixels, 4 * 100 * 100));
 }
 
 TEST(DisplayItemListTest, FilterItem) {
   gfx::Rect layer_rect(100, 100);
   FilterOperations filters;
   unsigned char pixels[4 * 100 * 100] = {0};
-  DisplayItemListSettings settings;
-  settings.use_cached_picture = true;
   scoped_refptr<DisplayItemList> list =
-      DisplayItemList::Create(layer_rect, settings);
+      DisplayItemList::Create(DisplayItemListSettings());
 
   skia::RefPtr<SkSurface> source_surface =
       skia::AdoptRef(SkSurface::NewRasterN32Premul(50, 50));
   SkCanvas* source_canvas = source_surface->getCanvas();
   source_canvas->clear(SkColorSetRGB(128, 128, 128));
   skia::RefPtr<SkImage> source_image =
       skia::AdoptRef(source_surface->newImageSnapshot());
 
   // For most SkImageFilters, the |dst| bounds computed by computeFastBounds are
   // dependent on the provided |src| bounds. This means, for example, that
@@ skipping 38 matching lines @@
   SkPaint blue_paint;
   blue_paint.setColor(SK_ColorBLUE);
   SkPaint red_paint;
   red_paint.setColor(SK_ColorRED);
   unsigned char pixels[4 * 100 * 100] = {0};
 
   gfx::PointF offset(8.f, 9.f);
   gfx::RectF recording_rect(offset, gfx::SizeF(layer_rect.size()));
 
   DisplayItemListSettings no_caching_settings;
-  no_caching_settings.use_cached_picture = false;
   scoped_refptr<DisplayItemList> list_without_caching =
-      DisplayItemList::Create(layer_rect, no_caching_settings);
+      DisplayItemList::Create(no_caching_settings);
 
   canvas = skia::SharePtr(
       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->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);
+      DisplayItemList::Create(caching_settings);
   list_with_caching->CreateAndAppendItem<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, IsSuitableForGpuRasterizationWithCachedPicture) {
-  gfx::Rect layer_rect(1000, 1000);
-  SkPictureRecorder recorder;
-  skia::RefPtr<SkCanvas> canvas;
-
-  DisplayItemListSettings settings;
-  settings.use_cached_picture = true;
-  scoped_refptr<DisplayItemList> list =
-      DisplayItemList::Create(layer_rect, settings);
-  canvas =
-      skia::SharePtr(recorder.beginRecording(gfx::RectToSkRect(layer_rect)));
-
-  SkPath path;
-  path.moveTo(0, 0);
-  path.lineTo(0, 100);
-  path.lineTo(50, 50);
-  path.lineTo(100, 100);
-  path.lineTo(100, 0);
-  path.close();
-
-  SkPaint paint;
-  paint.setAntiAlias(true);
-  canvas->drawPath(path, paint);
-
-  sk_sp<SkPicture> suitable_picture = recorder.finishRecordingAsPicture();
-  list->CreateAndAppendItem<DrawingDisplayItem>(kVisualRect, suitable_picture);
-  list->Finalize();
-
-  // A single DrawingDisplayItem with a large AA concave path shouldn't trigger
-  // a veto.
-  EXPECT_TRUE(list->IsSuitableForGpuRasterization());
-
-  // Now check the RasterIntoCanvas path.
-  list = DisplayItemList::Create(layer_rect, settings);
-  DrawingDisplayItem suitable_item(suitable_picture);
-  list->RasterIntoCanvas(suitable_item);
-  list->Finalize();
-  EXPECT_TRUE(list->IsSuitableForGpuRasterization());
-
-  list = DisplayItemList::Create(layer_rect, settings);
-  canvas =
-      skia::SharePtr(recorder.beginRecording(gfx::RectToSkRect(layer_rect)));
-  for (int i = 0; i < 10; ++i)
-    canvas->drawPath(path, paint);
-  sk_sp<SkPicture> unsuitable_picture = recorder.finishRecordingAsPicture();
-  list->CreateAndAppendItem<DrawingDisplayItem>(kVisualRect,
-                                                unsuitable_picture);
-  list->Finalize();
-
-  // A single DrawingDisplayItem with several large AA concave paths should
-  // trigger a veto.
-  EXPECT_FALSE(list->IsSuitableForGpuRasterization());
-
-  // Now check the RasterIntoCanvas path.
-  list = DisplayItemList::Create(layer_rect, settings);
-  DrawingDisplayItem unsuitable_item(unsuitable_picture);
-  list->RasterIntoCanvas(unsuitable_item);
-  list->Finalize();
-  EXPECT_FALSE(list->IsSuitableForGpuRasterization());
-}
-
 TEST(DisplayItemListTest, IsSuitableForGpuRasterizationWithoutCachedPicture) {
   gfx::Rect layer_rect(1000, 1000);
   SkPictureRecorder recorder;
   skia::RefPtr<SkCanvas> canvas;
   skia::RefPtr<SkPicture> picture;
 
   DisplayItemListSettings settings;
   settings.use_cached_picture = false;
-  scoped_refptr<DisplayItemList> list =
-      DisplayItemList::Create(layer_rect, settings);
+  scoped_refptr<DisplayItemList> list = DisplayItemList::Create(settings);
   canvas =
       skia::SharePtr(recorder.beginRecording(gfx::RectToSkRect(layer_rect)));
 
   SkPath path;
   path.moveTo(0, 0);
   path.lineTo(0, 100);
   path.lineTo(50, 50);
   path.lineTo(100, 100);
   path.lineTo(100, 0);
   path.close();
 
   SkPaint paint;
   paint.setAntiAlias(true);
   canvas->drawPath(path, paint);
 
   list->CreateAndAppendItem<DrawingDisplayItem>(
       kVisualRect, recorder.finishRecordingAsPicture());
   list->Finalize();
 
   // A single DrawingDisplayItem with a large AA concave path shouldn't trigger
   // a veto.
   EXPECT_TRUE(list->IsSuitableForGpuRasterization());
 
-  list = DisplayItemList::Create(layer_rect, settings);
+  list = DisplayItemList::Create(settings);
   canvas =
       skia::SharePtr(recorder.beginRecording(gfx::RectToSkRect(layer_rect)));
   for (int i = 0; i < 10; ++i)
     canvas->drawPath(path, paint);
   list->CreateAndAppendItem<DrawingDisplayItem>(
       kVisualRect, recorder.finishRecordingAsPicture());
   list->Finalize();
 
   // A single DrawingDisplayItem with several large AA concave paths should
   // trigger a veto.
   EXPECT_FALSE(list->IsSuitableForGpuRasterization());
 
-  list = DisplayItemList::Create(layer_rect, settings);
+  list = DisplayItemList::Create(settings);
   for (int i = 0; i < 10; ++i) {
     canvas =
         skia::SharePtr(recorder.beginRecording(gfx::RectToSkRect(layer_rect)));
     canvas->drawPath(path, paint);
     list->CreateAndAppendItem<DrawingDisplayItem>(
         kVisualRect, recorder.finishRecordingAsPicture());
   }
   list->Finalize();
 
   // Without a cached picture, having several DrawingDisplayItems that each
@@ skipping 15 matching lines @@
   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 = DisplayItemList::Create(caching_settings);
   list->CreateAndAppendItem<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 = DisplayItemList::Create(no_caching_settings);
   list->CreateAndAppendItem<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->Finalize();
-  memory_usage = list->ApproximateMemoryUsage();
-  EXPECT_EQ(static_cast<size_t>(0), memory_usage);
 }
 
-TEST(DisplayItemListTest, AsValueWithRectAndNoItems) {
+TEST(DisplayItemListTest, AsValueWithNoItems) {
   scoped_refptr<DisplayItemList> list =
-      DisplayItemList::Create(gfx::Rect(1, 2, 8, 9), DisplayItemListSettings());
+      DisplayItemList::Create(DisplayItemListSettings());
+  list->SetRetainVisualRectsForTesting(true);
   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_EQ(value.find("visualRect: [0,0 42x42]"), 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_EQ(value.find("visualRect: [0,0 42x42]"), std::string::npos);
   EXPECT_NE(value.find("\"skp64\":"), std::string::npos);
 }
 
-TEST(DisplayItemListTest, AsValueWithRectAndItems) {
+TEST(DisplayItemListTest, AsValueWithItems) {
   gfx::Rect layer_rect = gfx::Rect(1, 2, 8, 9);
   scoped_refptr<DisplayItemList> list =
-      DisplayItemList::Create(layer_rect, DisplayItemListSettings());
+      DisplayItemList::Create(DisplayItemListSettings());
+  list->SetRetainVisualRectsForTesting(true);
   gfx::Transform transform;
   transform.Translate(6.f, 7.f);
   list->CreateAndAppendItem<TransformDisplayItem>(kVisualRect, transform);
   AppendFirstSerializationTestPicture(list, layer_rect.size());
   list->CreateAndAppendItem<EndTransformDisplayItem>(kVisualRect);
   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("visualRect: [0,0 42x42]"), 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_EQ(value.find("visualRect: [0,0 42x42]"), std::string::npos);
   EXPECT_NE(value.find("\"skp64\":"), std::string::npos);
 }
 
-TEST(DisplayItemListTest, AsValueWithEmptyRectAndNoItems) {
-  scoped_refptr<DisplayItemList> list =
-      DisplayItemList::Create(gfx::Rect(), DisplayItemListSettings());
-  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());
-  gfx::Transform transform;
-  transform.Translate(6.f, 7.f);
-  list->CreateAndAppendItem<TransformDisplayItem>(kVisualRect, transform);
-  AppendFirstSerializationTestPicture(list, gfx::Size());
-  list->CreateAndAppendItem<EndTransformDisplayItem>(kVisualRect);
-  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);
-}
-
 }  // namespace cc