cc: Update discardable image metadata generation to get PaintImages.

cc/raster/image_hijack_canvas_unittest.cc

 // Copyright 2016 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/raster/image_hijack_canvas.h"
 
 #include "cc/test/skia_common.h"
 #include "cc/tiles/image_decode_cache.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ skipping 70 matching lines @@
 
   SkPaint paint;
   canvas.drawImage(image, 0, 0, &paint);
   canvas.drawImageRect(image, SkRect::MakeXYWH(0, 0, 10, 10),
                        SkRect::MakeXYWH(10, 10, 10, 10), &paint);
   paint.setShader(image->makeShader(SkShader::kClamp_TileMode,
                                     SkShader::kClamp_TileMode, nullptr));
   canvas.drawRect(SkRect::MakeXYWH(10, 10, 10, 10), paint);
 }
 
+TEST(ImageHijackCanvasTest, ClippedOpsAreSkipped) {
+  testing::StrictMock<MockImageDecodeCache> image_decode_cache;
+  ImageIdFlatSet images_to_skip;
+  gfx::ColorSpace target_color_space = gfx::ColorSpace::CreateSRGB();
+  ImageHijackCanvas canvas(100, 100, &image_decode_cache, &images_to_skip,
+                           target_color_space);
+  SkPaint paint;
+  SkRect draw_rect = SkRect::MakeXYWH(200, 200, 100, 100);
+  sk_sp<SkImage> image = CreateDiscardableImage(gfx::Size(10, 10));
+  canvas.drawImage(image, 200, 200, &paint);
+  canvas.drawImageRect(image, SkRect::MakeXYWH(0, 0, 10, 10), draw_rect,
+                       &paint);
+  paint.setShader(image->makeShader(SkShader::kClamp_TileMode,
+                                    SkShader::kClamp_TileMode, nullptr));
+  canvas.drawRect(draw_rect, paint);
+  SkPath path;
+  path.addRect(draw_rect, SkPath::kCW_Direction);
+  canvas.drawPath(path, paint);
+  canvas.drawOval(draw_rect, paint);
+  canvas.drawArc(draw_rect, 0, 40, true, paint);
+  canvas.drawRRect(SkRRect::MakeRect(draw_rect), paint);
+}
+
 }  // namespace
 
 }  // namespace cc