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

Unified Diff: cc/test/fake_content_layer_client.cc

Issue 1314943008: cc: Remove implicit conversions from Rect to RectF in src/cc/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rectfconvert-cc: rebase-and-sandwich-strategy Created 5 years, 3 months 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/fake_content_layer_client.h ('k') | cc/test/fake_delegated_renderer_layer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/fake_content_layer_client.cc
diff --git a/cc/test/fake_content_layer_client.cc b/cc/test/fake_content_layer_client.cc
index 789e21e8acf687e7754b2882456332948fc760e4..0cbb92a780fa20544ad015e71e29c24a4ae26937 100644
--- a/cc/test/fake_content_layer_client.cc
+++ b/cc/test/fake_content_layer_client.cc
@@ -49,11 +49,7 @@ void FakeContentLayerClient::PaintContents(
it != draw_rects_.end(); ++it) {
const gfx::RectF& draw_rect = it->first;
const SkPaint& paint = it->second;
- canvas->drawRectCoords(draw_rect.x(),
- draw_rect.y(),
- draw_rect.right(),
- draw_rect.bottom(),
- paint);
+ canvas->drawRect(gfx::RectFToSkRect(draw_rect), paint);
}
for (BitmapVector::const_iterator it = draw_bitmaps_.begin();
@@ -62,12 +58,12 @@ void FakeContentLayerClient::PaintContents(
}
if (fill_with_nonsolid_color_) {
- gfx::RectF draw_rect = paint_rect;
+ gfx::Rect draw_rect = paint_rect;
bool red = true;
while (!draw_rect.IsEmpty()) {
SkPaint paint;
paint.setColor(red ? SK_ColorRED : SK_ColorBLUE);
- canvas->drawRect(gfx::RectFToSkRect(draw_rect), paint);
+ canvas->drawIRect(gfx::RectToSkIRect(draw_rect), paint);
draw_rect.Inset(1, 1);
}
}
@@ -94,8 +90,7 @@ FakeContentLayerClient::PaintContentsToDisplayList(
const SkPaint& paint = it->second;
canvas =
skia::SharePtr(recorder.beginRecording(gfx::RectFToSkRect(draw_rect)));
- canvas->drawRectCoords(draw_rect.x(), draw_rect.y(), draw_rect.width(),
- draw_rect.height(), paint);
+ canvas->drawRect(gfx::RectFToSkRect(draw_rect), paint);
picture = skia::AdoptRef(recorder.endRecordingAsPicture());
auto* item = display_list->CreateAndAppendItem<DrawingDisplayItem>();
item->SetNew(picture.Pass());
@@ -119,14 +114,14 @@ FakeContentLayerClient::PaintContentsToDisplayList(
}
if (fill_with_nonsolid_color_) {
- gfx::RectF draw_rect = clip;
+ gfx::Rect 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);
+ canvas =
+ skia::SharePtr(recorder.beginRecording(gfx::RectToSkRect(draw_rect)));
+ canvas->drawIRect(gfx::RectToSkIRect(draw_rect), paint);
picture = skia::AdoptRef(recorder.endRecordingAsPicture());
auto* item = display_list->CreateAndAppendItem<DrawingDisplayItem>();
item->SetNew(picture.Pass());
« no previous file with comments | « cc/test/fake_content_layer_client.h ('k') | cc/test/fake_delegated_renderer_layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698