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

Unified Diff: cc/layers/layer_impl.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/layers/layer.cc ('k') | cc/layers/layer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/layer_impl.h
diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h
index 1e522beea9a6a0b17ec6f36d7dd746f064ada66c..457e790c2c967777bc1d465e384b14b1e08aede8 100644
--- a/cc/layers/layer_impl.h
+++ b/cc/layers/layer_impl.h
@@ -35,7 +35,6 @@
#include "cc/trees/mutator_host_client.h"
#include "cc/trees/target_property.h"
#include "third_party/skia/include/core/SkColor.h"
-#include "third_party/skia/include/core/SkXfermode.h"
#include "ui/gfx/geometry/point3_f.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/geometry/rect_f.h"
@@ -195,10 +194,10 @@ class CC_EXPORT LayerImpl {
void SetMutableProperties(uint32_t properties);
uint32_t mutable_properties() const { return mutable_properties_; }
- void set_draw_blend_mode(SkXfermode::Mode blend_mode) {
+ void set_draw_blend_mode(SkBlendMode blend_mode) {
draw_blend_mode_ = blend_mode;
}
- SkXfermode::Mode draw_blend_mode() const { return draw_blend_mode_; }
+ SkBlendMode draw_blend_mode() const { return draw_blend_mode_; }
void SetPosition(const gfx::PointF& position);
gfx::PointF position() const { return position_; }
@@ -525,7 +524,7 @@ class CC_EXPORT LayerImpl {
SkColor background_color_;
SkColor safe_opaque_background_color_;
- SkXfermode::Mode draw_blend_mode_;
+ SkBlendMode draw_blend_mode_;
gfx::PointF position_;
gfx::Rect clip_rect_in_target_space_;
« no previous file with comments | « cc/layers/layer.cc ('k') | cc/layers/layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698