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

Unified Diff: cc/trees/property_tree_builder.cc

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/trees/occlusion_tracker_unittest.cc ('k') | chrome/browser/chromeos/display/overscan_calibrator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/property_tree_builder.cc
diff --git a/cc/trees/property_tree_builder.cc b/cc/trees/property_tree_builder.cc
index 75d597f333df62e1711dca90b556671e52acf03e..521d1bfe23d40471436d9054b80de279db057b8e 100644
--- a/cc/trees/property_tree_builder.cc
+++ b/cc/trees/property_tree_builder.cc
@@ -805,11 +805,11 @@ static inline float Opacity(LayerImpl* layer) {
return layer->test_properties()->opacity;
}
-static inline SkXfermode::Mode BlendMode(Layer* layer) {
+static inline SkBlendMode BlendMode(Layer* layer) {
return layer->blend_mode();
}
-static inline SkXfermode::Mode BlendMode(LayerImpl* layer) {
+static inline SkBlendMode BlendMode(LayerImpl* layer) {
return layer->test_properties()->blend_mode;
}
@@ -912,7 +912,7 @@ bool ShouldCreateRenderSurface(LayerType* layer,
// TODO(rosca): this is temporary, until blending is implemented for other
// types of quads than RenderPassDrawQuad. Layers having descendants that draw
// content will still create a separate rendering surface.
- if (BlendMode(layer) != SkXfermode::kSrcOver_Mode) {
+ if (BlendMode(layer) != SkBlendMode::kSrcOver) {
TRACE_EVENT_INSTANT0(
"cc", "PropertyTreeBuilder::ShouldCreateRenderSurface blending",
TRACE_EVENT_SCOPE_THREAD);
@@ -1244,7 +1244,7 @@ void BuildPropertyTreesInternal(
if (created_render_surface) {
data_for_children.render_target = data_for_children.effect_tree_parent;
- layer->set_draw_blend_mode(SkXfermode::kSrcOver_Mode);
+ layer->set_draw_blend_mode(SkBlendMode::kSrcOver);
} else {
layer->set_draw_blend_mode(BlendMode(layer));
}
« no previous file with comments | « cc/trees/occlusion_tracker_unittest.cc ('k') | chrome/browser/chromeos/display/overscan_calibrator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698