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

Unified Diff: cc/trees/property_tree_builder.cc

Issue 2801383002: cc : Delete layer's draw blend mode (Closed)
Patch Set: . Created 3 years, 8 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
« cc/layers/layer_impl.cc ('K') | « cc/trees/occlusion_tracker.cc ('k') | no next file » | 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 2a3aa45a5faf72e3a509525c32486e447aa2f0b8..02fb9bd306c2b8b93b48fffb6e998c17914f2db7 100644
--- a/cc/trees/property_tree_builder.cc
+++ b/cc/trees/property_tree_builder.cc
@@ -263,7 +263,6 @@ static inline bool Is3dSorted(LayerImpl* layer) {
template <typename LayerType>
void AddClipNodeIfNeeded(const DataForRecursion<LayerType>& data_from_ancestor,
LayerType* layer,
- bool created_render_surface,
bool created_transform_node,
DataForRecursion<LayerType>* data_for_children) {
const bool inherits_clip = !ClipParent(layer);
@@ -1131,17 +1130,13 @@ void BuildPropertyTreesInternal(
bool created_render_surface =
AddEffectNodeIfNeeded(data_from_parent, layer, &data_for_children);
- if (created_render_surface) {
+ if (created_render_surface)
data_for_children.render_target = data_for_children.effect_tree_parent;
- layer->set_draw_blend_mode(SkBlendMode::kSrcOver);
- } else {
- layer->set_draw_blend_mode(BlendMode(layer));
- }
bool created_transform_node = AddTransformNodeIfNeeded(
data_from_parent, layer, created_render_surface, &data_for_children);
- AddClipNodeIfNeeded(data_from_parent, layer, created_render_surface,
- created_transform_node, &data_for_children);
+ AddClipNodeIfNeeded(data_from_parent, layer, created_transform_node,
+ &data_for_children);
AddScrollNodeIfNeeded(data_from_parent, layer, &data_for_children);
« cc/layers/layer_impl.cc ('K') | « cc/trees/occlusion_tracker.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698