Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(244)

Unified Diff: cc/tiles/tile_manager_unittest.cc

Issue 2523673004: [NOT FOR COMMIT] Fully replace SkCanvas uses.
Patch Set: Support Android build. Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/test/solid_color_content_layer_client.cc ('k') | cc/trees/layer_tree_host_pixeltest_masks.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/tiles/tile_manager_unittest.cc
diff --git a/cc/tiles/tile_manager_unittest.cc b/cc/tiles/tile_manager_unittest.cc
index 04aaabc6c4d6b50e1337c7b39de1a2283eb0cb3f..31748db6800e10a9b2e6682a5b2096854469354c 100644
--- a/cc/tiles/tile_manager_unittest.cc
+++ b/cc/tiles/tile_manager_unittest.cc
@@ -34,6 +34,7 @@
#include "cc/tiles/tile_priority.h"
#include "cc/tiles/tiling_set_raster_queue_all.h"
#include "cc/trees/layer_tree_impl.h"
+#include "skia/ext/cdl_paint.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/skia/include/core/SkRefCnt.h"
@@ -1416,7 +1417,7 @@ TEST_F(TileManagerTilePriorityQueueTest, NoRasterTasksforSolidColorTiles) {
std::unique_ptr<FakeRecordingSource> recording_source =
FakeRecordingSource::CreateFilledRecordingSource(layer_bounds);
- SkPaint solid_paint;
+ CdlPaint solid_paint;
SkColor solid_color = SkColorSetARGB(255, 12, 23, 34);
solid_paint.setColor(solid_color);
recording_source->add_draw_rect_with_paint(gfx::Rect(layer_bounds),
@@ -1424,7 +1425,7 @@ TEST_F(TileManagerTilePriorityQueueTest, NoRasterTasksforSolidColorTiles) {
// Create non solid tile as well, otherwise tilings wouldnt be created.
SkColor non_solid_color = SkColorSetARGB(128, 45, 56, 67);
- SkPaint non_solid_paint;
+ CdlPaint non_solid_paint;
non_solid_paint.setColor(non_solid_color);
recording_source->add_draw_rect_with_paint(gfx::Rect(0, 0, 10, 10),
@@ -1586,7 +1587,7 @@ TEST_F(TileManagerTest, LowResHasNoImage) {
recording_source->SetBackgroundColor(SK_ColorTRANSPARENT);
recording_source->SetRequiresClear(true);
recording_source->SetClearCanvasWithDebugColor(false);
- SkPaint paint;
+ CdlPaint paint;
paint.setColor(SK_ColorGREEN);
recording_source->add_draw_rect_with_paint(gfx::Rect(size), paint);
recording_source->add_draw_image(std::move(blue_image), gfx::Point());
@@ -1678,7 +1679,7 @@ TEST_F(ActivationTasksDoNotBlockReadyToDrawTest,
std::unique_ptr<FakeRecordingSource> active_tree_recording_source =
FakeRecordingSource::CreateFilledRecordingSource(layer_bounds);
- SkPaint solid_paint;
+ CdlPaint solid_paint;
SkColor solid_color = SkColorSetARGB(255, 12, 23, 34);
solid_paint.setColor(solid_color);
active_tree_recording_source->add_draw_rect_with_paint(
@@ -1690,7 +1691,7 @@ TEST_F(ActivationTasksDoNotBlockReadyToDrawTest,
std::unique_ptr<FakeRecordingSource> pending_tree_recording_source =
FakeRecordingSource::CreateFilledRecordingSource(layer_bounds);
SkColor non_solid_color = SkColorSetARGB(128, 45, 56, 67);
- SkPaint non_solid_paint;
+ CdlPaint non_solid_paint;
non_solid_paint.setColor(non_solid_color);
pending_tree_recording_source->add_draw_rect_with_paint(
« no previous file with comments | « cc/test/solid_color_content_layer_client.cc ('k') | cc/trees/layer_tree_host_pixeltest_masks.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698