Reland "Raster display item lists via a visual rect RTree."

cc/test/fake_content_layer_client.cc

 // Copyright 2012 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/test/fake_content_layer_client.h"
 
 #include <stddef.h>
 
 #include "cc/playback/clip_display_item.h"
 #include "cc/playback/display_item_list_settings.h"
@@ skipping 37 matching lines @@
 }
 
 scoped_refptr<DisplayItemList>
 FakeContentLayerClient::PaintContentsToDisplayList(
     PaintingControlSetting painting_control) {
   // Cached picture is used because unit tests expect to be able to
   // use GatherPixelRefs.
   DisplayItemListSettings settings;
   settings.use_cached_picture = display_list_use_cached_picture_;
   scoped_refptr<DisplayItemList> display_list =
-      DisplayItemList::Create(PaintableRegion(), settings);
+      DisplayItemList::Create(settings);
+  display_list->SetRetainVisualRectsForTesting(true);
   SkPictureRecorder recorder;
   sk_sp<SkCanvas> canvas;
 
   for (RectPaintVector::const_iterator it = draw_rects_.begin();
        it != draw_rects_.end(); ++it) {
     const gfx::RectF& draw_rect = it->first;
     const SkPaint& paint = it->second;
     canvas = sk_ref_sp(recorder.beginRecording(gfx::RectFToSkRect(draw_rect)));
     canvas->drawRect(gfx::RectFToSkRect(draw_rect), paint);
     display_list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
@@ skipping 35 matching lines @@
   return display_list;
 }
 
 bool FakeContentLayerClient::FillsBoundsCompletely() const { return false; }
 
 size_t FakeContentLayerClient::GetApproximateUnsharedMemoryUsage() const {
   return reported_memory_usage_;
 }
 
 }  // namespace cc