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

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

Issue 2825743002: Fix clipping of squashed sibling layers with border radius masks (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
« no previous file with comments | « third_party/WebKit/LayoutTests/compositing/nested-border-radius-composited-child-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp b/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp
index df10d3cbeb2c046be32caad70f366c872530367f..039a63448a6a8a8ad736045e68bf9cf0ce584d04 100644
--- a/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp
@@ -974,6 +974,13 @@ void PaintLayerPainter::PaintFragmentWithPhase(
case kPaintPhaseMask: // Mask painting will handle clipping to self.
clipping_rule = LayerClipRecorder::kDoNotIncludeSelfForBorderRadius;
break;
+ case kPaintPhaseClippingMask:
+ if (paint_flags & kPaintLayerPaintingAncestorClippingMaskPhase) {
+ // The ancestor is the thing that needs to clip, so do not include
+ // this layer's clips.
+ clipping_rule = LayerClipRecorder::kDoNotIncludeSelfForBorderRadius;
+ break;
+ }
default:
clipping_rule = LayerClipRecorder::kIncludeSelfForBorderRadius;
break;
« no previous file with comments | « third_party/WebKit/LayoutTests/compositing/nested-border-radius-composited-child-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698