[NOT FOR COMMIT] Fully replace SkCanvas uses.

cc/playback/discardable_image_map_unittest.cc

 // Copyright 2015 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/playback/discardable_image_map.h"
 
 #include <stddef.h>
 
 #include <memory>
 
 #include "base/memory/ref_counted.h"
 #include "base/values.h"
 #include "cc/base/region.h"
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/fake_recording_source.h"
 #include "cc/test/skia_common.h"
+#include "skia/ext/cdl_paint.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkGraphics.h"
 #include "third_party/skia/include/core/SkImageGenerator.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/skia_util.h"
 
 namespace cc {
 namespace {
@@ skipping 45 matching lines @@
   // |---|---|---|---|
   // |   | x |   | x |
   // |---|---|---|---|
   // | x |   | x |   |
   // |---|---|---|---|
   sk_sp<SkImage> discardable_image[4][4];
   for (int y = 0; y < 4; ++y) {
     for (int x = 0; x < 4; ++x) {
       if ((x + y) & 1) {
         discardable_image[y][x] = CreateDiscardableImage(gfx::Size(500, 500));
-        SkPaint paint;
+        CdlPaint paint;
         content_layer_client.add_draw_image(
             discardable_image[y][x], gfx::Point(x * 512 + 6, y * 512 + 6),
             paint);
       }
     }
   }
 
   scoped_refptr<DisplayItemList> display_list =
       content_layer_client.PaintContentsToDisplayList(
           ContentLayerClient::PAINTING_BEHAVIOR_NORMAL);
@@ skipping 52 matching lines @@
   // |---|---|---|---|
   // |   | x |   | x |
   // |---|---|---|---|
   // | x |   | x |   |
   // |---|---|---|---|
   sk_sp<SkImage> discardable_image[4][4];
   for (int y = 0; y < 4; ++y) {
     for (int x = 0; x < 4; ++x) {
       if ((x + y) & 1) {
         discardable_image[y][x] = CreateDiscardableImage(gfx::Size(500, 500));
-        SkPaint paint;
+        CdlPaint paint;
         content_layer_client.add_draw_image(
             discardable_image[y][x],
             gfx::Point(1024 + x * 512 + 6, y * 512 + 6), paint);
       }
     }
   }
 
   scoped_refptr<DisplayItemList> display_list =
       content_layer_client.PaintContentsToDisplayList(
           ContentLayerClient::PAINTING_BEHAVIOR_NORMAL);
@@ skipping 75 matching lines @@
   // |---|---|---|---|
   // |   | x |   | x |
   // |---|---|---|---|
   // | x |   | x |   |
   // |---|---|---|---|
   sk_sp<SkImage> discardable_image[4][4];
   for (int y = 0; y < 4; ++y) {
     for (int x = 0; x < 4; ++x) {
       if ((x + y) & 1) {
         discardable_image[y][x] = CreateDiscardableImage(gfx::Size(500, 500));
-        SkPaint paint;
+        CdlPaint paint;
         content_layer_client.add_draw_image(
             discardable_image[y][x], gfx::Point(x * 512 + 6, y * 512 + 6),
             paint);
       }
     }
   }
 
   scoped_refptr<DisplayItemList> display_list =
       content_layer_client.PaintContentsToDisplayList(
           ContentLayerClient::PAINTING_BEHAVIOR_NORMAL);
@@ skipping 22 matching lines @@
   }
 }
 
 TEST_F(DiscardableImageMapTest, GetDiscardableImagesInRectMassiveImage) {
   gfx::Rect visible_rect(2048, 2048);
   FakeContentLayerClient content_layer_client;
   content_layer_client.set_bounds(visible_rect.size());
 
   sk_sp<SkImage> discardable_image =
       CreateDiscardableImage(gfx::Size(1 << 25, 1 << 25));
-  SkPaint paint;
+  CdlPaint paint;
   content_layer_client.add_draw_image(discardable_image, gfx::Point(0, 0),
                                       paint);
 
   scoped_refptr<DisplayItemList> display_list =
       content_layer_client.PaintContentsToDisplayList(
           ContentLayerClient::PAINTING_BEHAVIOR_NORMAL);
 
   DiscardableImageMap image_map;
   {
     DiscardableImageMap::ScopedMetadataGenerator generator(&image_map,
@@ skipping 12 matching lines @@
   FakeContentLayerClient content_layer_client;
   content_layer_client.set_bounds(visible_rect.size());
 
   sk_sp<SkImage> discardable_image = CreateDiscardableImage(gfx::Size(10, 10));
 
   DiscardableImageMap image_map;
   {
     DiscardableImageMap::ScopedMetadataGenerator generator(&image_map,
                                                            visible_rect.size());
     {
-      std::unique_ptr<SkPaint> paint(new SkPaint());
+      std::unique_ptr<CdlPaint> paint(new CdlPaint());
       generator.canvas()->saveLayer(gfx::RectToSkRect(visible_rect),
                                     paint.get());
     }
     generator.canvas()->drawImage(discardable_image, 0, 0, nullptr);
     generator.canvas()->restore();
   }
 
   std::vector<PositionDrawImage> images =
       GetDiscardableImagesInRect(image_map, gfx::Rect(0, 0, 1, 1));
   EXPECT_EQ(1u, images.size());
   EXPECT_TRUE(images[0].image == discardable_image);
 }
 
 TEST_F(DiscardableImageMapTest, GetDiscardableImagesInRectMaxImage) {
   gfx::Rect visible_rect(2048, 2048);
   FakeContentLayerClient content_layer_client;
   content_layer_client.set_bounds(visible_rect.size());
 
   int dimension = std::numeric_limits<int>::max();
   sk_sp<SkImage> discardable_image =
       CreateDiscardableImage(gfx::Size(dimension, dimension));
-  SkPaint paint;
+  CdlPaint paint;
   content_layer_client.add_draw_image(discardable_image, gfx::Point(42, 42),
                                       paint);
 
   scoped_refptr<DisplayItemList> display_list =
       content_layer_client.PaintContentsToDisplayList(
           ContentLayerClient::PAINTING_BEHAVIOR_NORMAL);
 
   DiscardableImageMap image_map;
   {
     DiscardableImageMap::ScopedMetadataGenerator generator(&image_map,
@@ skipping 14 matching lines @@
   // some draw calls, so we subtract 64 since we only care about "really large"
   // values, not necessarily max int values.
   int dimension = static_cast<int>(
       static_cast<float>(std::numeric_limits<int>::max() - 64));
   gfx::Rect visible_rect(dimension, dimension);
   FakeContentLayerClient content_layer_client;
   content_layer_client.set_bounds(visible_rect.size());
 
   sk_sp<SkImage> discardable_image =
       CreateDiscardableImage(gfx::Size(dimension, dimension));
-  SkPaint paint;
+  CdlPaint paint;
   content_layer_client.add_draw_image(discardable_image, gfx::Point(0, 0),
                                       paint);
   content_layer_client.add_draw_image(discardable_image, gfx::Point(10000, 0),
                                       paint);
   content_layer_client.add_draw_image(discardable_image,
                                       gfx::Point(-10000, 500), paint);
 
   scoped_refptr<DisplayItemList> display_list =
       content_layer_client.PaintContentsToDisplayList(
           ContentLayerClient::PAINTING_BEHAVIOR_NORMAL);
@@ skipping 30 matching lines @@
 TEST_F(DiscardableImageMapTest, GetDiscardableImagesRectInBounds) {
   gfx::Rect visible_rect(1000, 1000);
   FakeContentLayerClient content_layer_client;
   content_layer_client.set_bounds(visible_rect.size());
 
   sk_sp<SkImage> discardable_image =
       CreateDiscardableImage(gfx::Size(100, 100));
   sk_sp<SkImage> long_discardable_image =
       CreateDiscardableImage(gfx::Size(10000, 100));
 
-  SkPaint paint;
+  CdlPaint paint;
   content_layer_client.add_draw_image(discardable_image, gfx::Point(-10, -11),
                                       paint);
   content_layer_client.add_draw_image(discardable_image, gfx::Point(950, 951),
                                       paint);
   content_layer_client.add_draw_image(long_discardable_image,
                                       gfx::Point(-100, 500), paint);
 
   scoped_refptr<DisplayItemList> display_list =
       content_layer_client.PaintContentsToDisplayList(
           ContentLayerClient::PAINTING_BEHAVIOR_NORMAL);
@@ skipping 12 matching lines @@
   images = GetDiscardableImagesInRect(image_map, gfx::Rect(999, 999, 1, 1));
   EXPECT_EQ(1u, images.size());
   EXPECT_EQ(gfx::Rect(950, 951, 50, 49), images[0].image_rect);
 
   images = GetDiscardableImagesInRect(image_map, gfx::Rect(0, 500, 1, 1));
   EXPECT_EQ(1u, images.size());
   EXPECT_EQ(gfx::Rect(0, 500, 1000, 100), images[0].image_rect);
 }
 
 }  // namespace cc