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

Unified Diff: cc/test/fake_content_layer_client.cc

Issue 951673002: Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b" (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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/data/blue.png ('k') | cc/test/fake_layer_tree_host_client.h » ('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 ab958e97bdc572e06e1bbd0f1c4ff79118d50098..23b73f5f18a7fbc7d0921425d219a62d5fae04de 100644
--- a/cc/test/fake_content_layer_client.cc
+++ b/cc/test/fake_content_layer_client.cc
@@ -69,12 +69,13 @@ FakeContentLayerClient::PaintContentsToDisplayList(
it != draw_rects_.end(); ++it) {
const gfx::RectF& draw_rect = it->first;
const SkPaint& paint = it->second;
- canvas =
- skia::SharePtr(recorder.beginRecording(gfx::RectFToSkRect(draw_rect)));
+ canvas = skia::SharePtr(
+ recorder.beginRecording(draw_rect.width(), draw_rect.height()));
canvas->drawRectCoords(0.f, 0.f, draw_rect.width(), draw_rect.height(),
paint);
picture = skia::AdoptRef(recorder.endRecording());
- list->AppendItem(DrawingDisplayItem::Create(picture));
+ list->AppendItem(DrawingDisplayItem::Create(
+ picture, gfx::PointF(draw_rect.x(), draw_rect.y())));
}
for (BitmapVector::const_iterator it = draw_bitmaps_.begin();
@@ -83,7 +84,8 @@ FakeContentLayerClient::PaintContentsToDisplayList(
recorder.beginRecording(it->bitmap.width(), it->bitmap.height()));
canvas->drawBitmap(it->bitmap, 0.f, 0.f, &it->paint);
picture = skia::AdoptRef(recorder.endRecording());
- list->AppendItem(DrawingDisplayItem::Create(picture));
+ list->AppendItem(DrawingDisplayItem::Create(
+ picture, gfx::PointF(it->point.x(), it->point.y())));
}
if (fill_with_nonsolid_color_) {
@@ -92,11 +94,11 @@ FakeContentLayerClient::PaintContentsToDisplayList(
while (!draw_rect.IsEmpty()) {
SkPaint paint;
paint.setColor(red ? SK_ColorRED : SK_ColorBLUE);
- canvas = skia::SharePtr(
- recorder.beginRecording(gfx::RectFToSkRect(draw_rect)));
+ canvas =
+ skia::SharePtr(recorder.beginRecording(clip.width(), clip.height()));
canvas->drawRect(gfx::RectFToSkRect(draw_rect), paint);
picture = skia::AdoptRef(recorder.endRecording());
- list->AppendItem(DrawingDisplayItem::Create(picture));
+ list->AppendItem(DrawingDisplayItem::Create(picture, gfx::PointF()));
draw_rect.Inset(1, 1);
}
}
« no previous file with comments | « cc/test/data/blue.png ('k') | cc/test/fake_layer_tree_host_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698