Revert of Revert of Implement DisplayList GatherPixelRefs

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"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "ui/gfx/skia_util.h"
 
 namespace cc {
 
+FakeContentLayerClient::BitmapData::BitmapData(const SkBitmap& bitmap,
+                                               const gfx::Point& point,
+                                               const SkPaint& paint)
+    : bitmap(bitmap), point(point), paint(paint) {
+}
+
+FakeContentLayerClient::BitmapData::BitmapData(const SkBitmap& bitmap,
+                                               const gfx::Transform& transform,
+                                               const SkPaint& paint)
+    : bitmap(bitmap), transform(transform), paint(paint) {
+}
+
+FakeContentLayerClient::BitmapData::~BitmapData() {
+}
+
 FakeContentLayerClient::FakeContentLayerClient()
     : fill_with_nonsolid_color_(false), last_canvas_(NULL) {
 }
 
 FakeContentLayerClient::~FakeContentLayerClient() {
 }
 
 void FakeContentLayerClient::PaintContents(
     SkCanvas* canvas,
     const gfx::Rect& paint_rect,
@@ skipping 47 matching lines @@
     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.endRecording());
     list->AppendItem(DrawingDisplayItem::Create(picture));
   }
 
   for (BitmapVector::const_iterator it = draw_bitmaps_.begin();
        it != draw_bitmaps_.end(); ++it) {
+    if (!it->transform.IsIdentity()) {
+      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.endRecording());
     list->AppendItem(DrawingDisplayItem::Create(picture));
+    if (!it->transform.IsIdentity()) {
+      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.endRecording());
       list->AppendItem(DrawingDisplayItem::Create(picture));
       draw_rect.Inset(1, 1);
     }
   }
 
   list->AppendItem(EndClipDisplayItem::Create());
   return list;
 }
 
 bool FakeContentLayerClient::FillsBoundsCompletely() const { return false; }
 
 }  // namespace cc