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

Unified Diff: third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp

Issue 2859483006: cc: Enable composited border-radius scrolling.
Patch Set: Calculate mask layer opacity. Created 3 years, 7 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/layout/compositing/CompositedLayerMapping.cpp
diff --git a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
index b938ccffbe207cb53c29ea507fcb973da2d904a8..e0fc2ccb153e943aef7b137bca291bb70c6e39f0 100644
--- a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
+++ b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
@@ -583,9 +583,6 @@ void CompositedLayerMapping::
if (!clipping_container)
return;
- if (clipping_container->EnclosingLayer() == scroll_parent)
- return;
-
if (compositing_ancestor->GetLayoutObject().IsDescendantOf(
clipping_container))
return;
@@ -616,6 +613,9 @@ void CompositedLayerMapping::
owning_layer_is_clipped &&
clipping_container->Style()->HasBorderRadius() &&
!AncestorRoundedCornersWontClip(GetLayoutObject(), *clipping_container);
+
+ if (clipping_container->EnclosingLayer() == scroll_parent)
+ owning_layer_is_clipped = owning_layer_is_masked;
}
const PaintLayer* CompositedLayerMapping::ScrollParent() {

Powered by Google App Engine
This is Rietveld 408576698