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

Unified Diff: cc/playback/compositing_display_item.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/playback/compositing_display_item.h ('k') | cc/playback/discardable_image_map.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/playback/compositing_display_item.cc
diff --git a/cc/playback/compositing_display_item.cc b/cc/playback/compositing_display_item.cc
index 2d8197d030fdc273b2e9529a4a3d1903984ea8dc..a72aa603f8dc38999ffdf22c9bd7f263357546c7 100644
--- a/cc/playback/compositing_display_item.cc
+++ b/cc/playback/compositing_display_item.cc
@@ -12,6 +12,7 @@
#include "cc/proto/display_item.pb.h"
#include "cc/proto/gfx_conversions.h"
#include "cc/proto/skia_conversions.h"
+#include "skia/ext/cdl_paint.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkData.h"
#include "third_party/skia/include/core/SkFlattenable.h"
@@ -95,10 +96,9 @@ void CompositingDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
details->set_lcd_text_requires_opaque_layer(lcd_text_requires_opaque_layer_);
}
-void CompositingDisplayItem::Raster(
- SkCanvas* canvas,
- SkPicture::AbortCallback* callback) const {
- SkPaint paint;
+void CompositingDisplayItem::Raster(CdlCanvas* canvas,
+ SkPicture::AbortCallback* callback) const {
+ CdlPaint paint;
paint.setBlendMode(xfermode_);
paint.setAlpha(alpha_);
paint.setColorFilter(color_filter_);
@@ -144,7 +144,7 @@ void EndCompositingDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
}
void EndCompositingDisplayItem::Raster(
- SkCanvas* canvas,
+ CdlCanvas* canvas,
SkPicture::AbortCallback* callback) const {
canvas->restore();
}
« no previous file with comments | « cc/playback/compositing_display_item.h ('k') | cc/playback/discardable_image_map.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698