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

Unified Diff: cc/layers/render_surface_impl.cc

Issue 2184773002: cc: Move blend_mode to the effect tree (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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
« no previous file with comments | « cc/layers/render_surface_impl.h ('k') | cc/layers/render_surface_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/render_surface_impl.cc
diff --git a/cc/layers/render_surface_impl.cc b/cc/layers/render_surface_impl.cc
index dbd7569dd34f1f67e02c665ed15aa369617f4687..843cb38edb568bb856238025a2f8f95cf4cb4aad 100644
--- a/cc/layers/render_surface_impl.cc
+++ b/cc/layers/render_surface_impl.cc
@@ -105,6 +105,14 @@ gfx::RectF RenderSurfaceImpl::DrawableContentRect() const {
return drawable_content_rect;
}
+SkXfermode::Mode RenderSurfaceImpl::BlendMode() const {
+ return OwningEffectNode()->blend_mode;
+}
+
+bool RenderSurfaceImpl::UsesDefaultBlendMode() const {
+ return BlendMode() == SkXfermode::kSrcOver_Mode;
+}
+
SkColor RenderSurfaceImpl::GetDebugBorderColor() const {
return DebugColors::SurfaceBorderColor();
}
@@ -362,11 +370,11 @@ void RenderSurfaceImpl::AppendQuads(RenderPass* render_pass,
SharedQuadState* shared_quad_state =
render_pass->CreateAndAppendSharedQuadState();
- shared_quad_state->SetAll(
- draw_transform, content_rect().size(), content_rect(),
- draw_properties_.clip_rect, draw_properties_.is_clipped,
- draw_properties_.draw_opacity, owning_layer_->blend_mode(),
- owning_layer_->sorting_context_id());
+ shared_quad_state->SetAll(draw_transform, content_rect().size(),
+ content_rect(), draw_properties_.clip_rect,
+ draw_properties_.is_clipped,
+ draw_properties_.draw_opacity, BlendMode(),
+ owning_layer_->sorting_context_id());
if (owning_layer_->ShowDebugBorders()) {
DebugBorderDrawQuad* debug_border_quad =
« no previous file with comments | « cc/layers/render_surface_impl.h ('k') | cc/layers/render_surface_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698