Speculative revert by sheriff

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 "cc/resources/clip_display_item.h"
 #include "cc/resources/drawing_display_item.h"
 #include "cc/resources/transform_display_item.h"
 #include "third_party/skia/include/core/SkCanvas.h"
@@ skipping 53 matching lines @@
     bool red = true;
     while (!draw_rect.IsEmpty()) {
       SkPaint paint;
       paint.setColor(red ? SK_ColorRED : SK_ColorBLUE);
       canvas->drawRect(gfx::RectFToSkRect(draw_rect), paint);
       draw_rect.Inset(1, 1);
     }
   }
 }
 
-void FakeContentLayerClient::PaintContentsToDisplayList(
-    DisplayItemList* display_list,
+scoped_refptr<DisplayItemList>
+FakeContentLayerClient::PaintContentsToDisplayList(
     const gfx::Rect& clip,
     PaintingControlSetting painting_control) {
   SkPictureRecorder recorder;
   skia::RefPtr<SkCanvas> canvas;
   skia::RefPtr<SkPicture> picture;
-  display_list->AppendItem(
-      ClipDisplayItem::Create(clip, std::vector<SkRRect>()));
+  scoped_refptr<DisplayItemList> list = DisplayItemList::Create();
+  list->AppendItem(ClipDisplayItem::Create(clip, std::vector<SkRRect>()));
 
   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 =
         skia::SharePtr(recorder.beginRecording(gfx::RectFToSkRect(draw_rect)));
     canvas->drawRectCoords(draw_rect.x(), draw_rect.y(), draw_rect.width(),
                            draw_rect.height(), paint);
     picture = skia::AdoptRef(recorder.endRecordingAsPicture());
-    display_list->AppendItem(DrawingDisplayItem::Create(picture));
+    list->AppendItem(DrawingDisplayItem::Create(picture));
   }
 
   for (BitmapVector::const_iterator it = draw_bitmaps_.begin();
        it != draw_bitmaps_.end(); ++it) {
     if (!it->transform.IsIdentity()) {
-      display_list->AppendItem(TransformDisplayItem::Create(it->transform));
+      list->AppendItem(TransformDisplayItem::Create(it->transform));
     }
     canvas = skia::SharePtr(
         recorder.beginRecording(it->bitmap.width(), it->bitmap.height()));
     canvas->drawBitmap(it->bitmap, it->point.x(), it->point.y(), &it->paint);
     picture = skia::AdoptRef(recorder.endRecordingAsPicture());
-    display_list->AppendItem(DrawingDisplayItem::Create(picture));
+    list->AppendItem(DrawingDisplayItem::Create(picture));
     if (!it->transform.IsIdentity()) {
-      display_list->AppendItem(EndTransformDisplayItem::Create());
+      list->AppendItem(EndTransformDisplayItem::Create());
     }
   }
 
   if (fill_with_nonsolid_color_) {
     gfx::RectF draw_rect = clip;
     bool red = true;
     while (!draw_rect.IsEmpty()) {
       SkPaint paint;
       paint.setColor(red ? SK_ColorRED : SK_ColorBLUE);
       canvas = skia::SharePtr(
           recorder.beginRecording(gfx::RectFToSkRect(draw_rect)));
       canvas->drawRect(gfx::RectFToSkRect(draw_rect), paint);
       picture = skia::AdoptRef(recorder.endRecordingAsPicture());
-      display_list->AppendItem(DrawingDisplayItem::Create(picture));
+      list->AppendItem(DrawingDisplayItem::Create(picture));
       draw_rect.Inset(1, 1);
     }
   }
 
-  display_list->AppendItem(EndClipDisplayItem::Create());
+  list->AppendItem(EndClipDisplayItem::Create());
+  return list;
 }
 
 bool FakeContentLayerClient::FillsBoundsCompletely() const { return false; }
 
 }  // namespace cc