cc: Refactor SkipImageCanvas and create it during playback.

cc/playback/display_list_raster_source_unittest.cc

 // Copyright 2013 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 <stddef.h>
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/playback/display_list_raster_source.h"
 #include "cc/test/fake_display_list_recording_source.h"
 #include "cc/test/skia_common.h"
@@ skipping 272 matching lines @@
       // up to one pixel outside the content rect is guaranteed to be opaque.
       // Outside of that is undefined.
       gfx::Rect canvas_rect(content_rect);
       canvas_rect.Inset(0, 0, -1, -1);
 
       SkBitmap bitmap;
       bitmap.allocN32Pixels(canvas_rect.width(), canvas_rect.height());
       SkCanvas canvas(bitmap);
       canvas.clear(SK_ColorTRANSPARENT);
 
+      const bool include_images = true;
       raster->PlaybackToCanvas(&canvas, canvas_rect, canvas_rect,
-                               contents_scale);
+                               contents_scale, include_images);
 
       SkColor* pixels = reinterpret_cast<SkColor*>(bitmap.getPixels());
       int num_pixels = bitmap.width() * bitmap.height();
       bool all_white = true;
       for (int i = 0; i < num_pixels; ++i) {
         EXPECT_EQ(SkColorGetA(pixels[i]), 255u);
         all_white &= (SkColorGetR(pixels[i]) == 255);
         all_white &= (SkColorGetG(pixels[i]) == 255);
         all_white &= (SkColorGetB(pixels[i]) == 255);
       }
@@ skipping 30 matching lines @@
       gfx::ScaleToCeiledSize(layer_bounds, contents_scale));
 
   SkBitmap bitmap;
   bitmap.allocN32Pixels(content_bounds.width(), content_bounds.height());
   SkCanvas canvas(bitmap);
   canvas.clear(SK_ColorTRANSPARENT);
 
   // Playback the full rect which should make everything white.
   gfx::Rect raster_full_rect(content_bounds);
   gfx::Rect playback_rect(content_bounds);
+  const bool include_images = true;
   raster->PlaybackToCanvas(&canvas, raster_full_rect, playback_rect,
-                           contents_scale);
+                           contents_scale, include_images);
 
   {
     SkColor* pixels = reinterpret_cast<SkColor*>(bitmap.getPixels());
     for (int i = 0; i < bitmap.width(); ++i) {
       for (int j = 0; j < bitmap.height(); ++j) {
         SCOPED_TRACE(i);
         SCOPED_TRACE(j);
         EXPECT_EQ(255u, SkColorGetA(pixels[i + j * bitmap.width()]));
         EXPECT_EQ(255u, SkColorGetR(pixels[i + j * bitmap.width()]));
         EXPECT_EQ(255u, SkColorGetG(pixels[i + j * bitmap.width()]));
@@ skipping 10 matching lines @@
   recording_source->Rerecord();
 
   // Make a new DisplayListRasterSource from the new recording.
   raster = DisplayListRasterSource::CreateFromDisplayListRecordingSource(
       recording_source.get(), false);
 
   // We're going to playback from "everything is black" into a smaller area,
   // that touches the edge pixels of the recording.
   playback_rect.Inset(1, 2, 0, 1);
   raster->PlaybackToCanvas(&canvas, raster_full_rect, playback_rect,
-                           contents_scale);
+                           contents_scale, include_images);
 
   SkColor* pixels = reinterpret_cast<SkColor*>(bitmap.getPixels());
   int num_black = 0;
   int num_white = 0;
   for (int i = 0; i < bitmap.width(); ++i) {
     for (int j = 0; j < bitmap.height(); ++j) {
       SCOPED_TRACE(j);
       SCOPED_TRACE(i);
       bool expect_black = playback_rect.Contains(i, j);
       if (expect_black) {
@@ skipping 43 matching lines @@
       gfx::ScaleToCeiledSize(layer_bounds, contents_scale));
 
   SkBitmap bitmap;
   bitmap.allocN32Pixels(content_bounds.width(), content_bounds.height());
   SkCanvas canvas(bitmap);
   canvas.clear(SK_ColorTRANSPARENT);
 
   // Playback the full rect which should make everything light gray (alpha=10).
   gfx::Rect raster_full_rect(content_bounds);
   gfx::Rect playback_rect(content_bounds);
+  const bool include_images = true;
   raster->PlaybackToCanvas(&canvas, raster_full_rect, playback_rect,
-                           contents_scale);
+                           contents_scale, include_images);
 
   {
     SkColor* pixels = reinterpret_cast<SkColor*>(bitmap.getPixels());
     for (int i = 0; i < bitmap.width(); ++i) {
       for (int j = 0; j < bitmap.height(); ++j) {
         SCOPED_TRACE(i);
         SCOPED_TRACE(j);
         EXPECT_EQ(alpha_dark, SkColorGetA(pixels[i + j * bitmap.width()]));
         EXPECT_EQ(alpha_dark, SkColorGetR(pixels[i + j * bitmap.width()]));
         EXPECT_EQ(alpha_dark, SkColorGetG(pixels[i + j * bitmap.width()]));
@@ skipping 18 matching lines @@
   // Make a new DisplayListRasterSource from the new recording.
   raster = DisplayListRasterSource::CreateFromDisplayListRecordingSource(
       recording_source_light.get(), false);
 
   // We're going to playback from alpha(18) white rectangle into a smaller area
   // of the recording resulting in a smaller lighter white rectangle over a
   // darker white background rectangle.
   playback_rect =
       gfx::Rect(gfx::ScaleToCeiledSize(partial_bounds, contents_scale));
   raster->PlaybackToCanvas(&canvas, raster_full_rect, playback_rect,
-                           contents_scale);
+                           contents_scale, include_images);
 
   // Test that the whole playback_rect was cleared and repainted with new alpha.
   SkColor* pixels = reinterpret_cast<SkColor*>(bitmap.getPixels());
   for (int i = 0; i < playback_rect.width(); ++i) {
     for (int j = 0; j < playback_rect.height(); ++j) {
       SCOPED_TRACE(j);
       SCOPED_TRACE(i);
       EXPECT_EQ(alpha_light, SkColorGetA(pixels[i + j * bitmap.width()]));
       EXPECT_EQ(alpha_light, SkColorGetR(pixels[i + j * bitmap.width()]));
       EXPECT_EQ(alpha_light, SkColorGetG(pixels[i + j * bitmap.width()]));
@@ skipping 19 matching lines @@
   gfx::Size content_bounds(
       gfx::ScaleToCeiledSize(layer_bounds, contents_scale));
 
   gfx::Rect canvas_rect(content_bounds);
   canvas_rect.Inset(0, 0, -1, -1);
 
   SkBitmap bitmap;
   bitmap.allocN32Pixels(canvas_rect.width(), canvas_rect.height());
   SkCanvas canvas(bitmap);
 
-  raster->PlaybackToCanvas(&canvas, canvas_rect, canvas_rect, contents_scale);
+  const bool include_images = true;
+  raster->PlaybackToCanvas(&canvas, canvas_rect, canvas_rect, contents_scale,
+                           include_images);
 
   SkColor* pixels = reinterpret_cast<SkColor*>(bitmap.getPixels());
   int num_pixels = bitmap.width() * bitmap.height();
   for (int i = 0; i < num_pixels; ++i) {
     EXPECT_EQ(SkColorGetA(pixels[i]), 0u);
   }
 }
 
 TEST(DisplayListRasterSourceTest,
      GetPictureMemoryUsageIncludesClientReportedMemory) {
   const size_t kReportedMemoryUsageInBytes = 100 * 1024 * 1024;
   gfx::Size layer_bounds(5, 3);
   scoped_ptr<FakeDisplayListRecordingSource> recording_source =
       FakeDisplayListRecordingSource::CreateFilledRecordingSource(layer_bounds);
   recording_source->set_reported_memory_usage(kReportedMemoryUsageInBytes);
   recording_source->Rerecord();
 
   scoped_refptr<DisplayListRasterSource> raster =
       DisplayListRasterSource::CreateFromDisplayListRecordingSource(
           recording_source.get(), false);
   size_t total_memory_usage = raster->GetPictureMemoryUsage();
   EXPECT_GE(total_memory_usage, kReportedMemoryUsageInBytes);
   EXPECT_LT(total_memory_usage, 2 * kReportedMemoryUsageInBytes);
 }
 
 }  // namespace
 }  // namespace cc