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

Unified Diff: third_party/WebKit/Source/core/paint/InlineFlowBoxPainter.cpp

Issue 2641173008: [SPv2] Add CSS mask support (Closed)
Patch Set: rebase Created 3 years, 10 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
Index: third_party/WebKit/Source/core/paint/InlineFlowBoxPainter.cpp
diff --git a/third_party/WebKit/Source/core/paint/InlineFlowBoxPainter.cpp b/third_party/WebKit/Source/core/paint/InlineFlowBoxPainter.cpp
index ee6bf7ab92fa771a20e65535faf2ea8bb34b9eca..e362d636dd2f96bbc2898ff0925c90b673d2a9d5 100644
--- a/third_party/WebKit/Source/core/paint/InlineFlowBoxPainter.cpp
+++ b/third_party/WebKit/Source/core/paint/InlineFlowBoxPainter.cpp
@@ -350,13 +350,16 @@ void InlineFlowBoxPainter::paintMask(const PaintInfo& paintInfo,
// Figure out if we need to push a transparency layer to render our mask.
bool pushTransparencyLayer = false;
- bool compositedMask =
- m_inlineFlowBox.getLineLayoutItem().hasLayer() &&
- m_inlineFlowBox.boxModelObject().layer()->hasCompositedMask();
bool flattenCompositingLayers =
paintInfo.getGlobalPaintFlags() & GlobalPaintFlattenCompositingLayers;
+ bool maskBlendingAppliedByCompositor =
+ !flattenCompositingLayers &&
+ m_inlineFlowBox.getLineLayoutItem().hasLayer() &&
+ m_inlineFlowBox.boxModelObject()
+ .layer()
+ ->maskBlendingAppliedByCompositor();
SkBlendMode compositeOp = SkBlendMode::kSrcOver;
- if (!compositedMask || flattenCompositingLayers) {
+ if (!maskBlendingAppliedByCompositor) {
if ((maskBoxImage &&
m_inlineFlowBox.getLineLayoutItem()
.style()
« no previous file with comments | « third_party/WebKit/Source/core/paint/BoxPainter.cpp ('k') | third_party/WebKit/Source/core/paint/ObjectPaintProperties.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698