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

Unified Diff: cc/playback/compositing_display_item.h

Issue 2502373003: stop using SkXfermode -- use SkBlendMode instead (Closed)
Patch Set: rebase Created 4 years, 1 month 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/output/software_renderer_unittest.cc ('k') | cc/playback/compositing_display_item.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/playback/compositing_display_item.h
diff --git a/cc/playback/compositing_display_item.h b/cc/playback/compositing_display_item.h
index 1615512aac5ace67d8628bb31e8b44b966a38bce..48432828213967adba586d3e34ff3393db26fc56 100644
--- a/cc/playback/compositing_display_item.h
+++ b/cc/playback/compositing_display_item.h
@@ -16,7 +16,6 @@
#include "third_party/skia/include/core/SkColorFilter.h"
#include "third_party/skia/include/core/SkRect.h"
#include "third_party/skia/include/core/SkRefCnt.h"
-#include "third_party/skia/include/core/SkXfermode.h"
#include "ui/gfx/geometry/rect_f.h"
class SkCanvas;
@@ -26,7 +25,7 @@ namespace cc {
class CC_EXPORT CompositingDisplayItem : public DisplayItem {
public:
CompositingDisplayItem(uint8_t alpha,
- SkXfermode::Mode xfermode,
+ SkBlendMode xfermode,
SkRect* bounds,
sk_sp<SkColorFilter> color_filter,
bool lcd_text_requires_opaque_layer);
@@ -44,13 +43,13 @@ class CC_EXPORT CompositingDisplayItem : public DisplayItem {
private:
void SetNew(uint8_t alpha,
- SkXfermode::Mode xfermode,
+ SkBlendMode xfermode,
SkRect* bounds,
sk_sp<SkColorFilter> color_filter,
bool lcd_text_requires_opaque_layer);
uint8_t alpha_;
- SkXfermode::Mode xfermode_;
+ SkBlendMode xfermode_;
bool has_bounds_;
SkRect bounds_;
sk_sp<SkColorFilter> color_filter_;
« no previous file with comments | « cc/output/software_renderer_unittest.cc ('k') | cc/playback/compositing_display_item.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698