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

Unified Diff: Source/core/rendering/RenderLayerClipper.cpp

Issue 131543013: Update scroll parent correctly for squashing layers. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: . Created 6 years, 9 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 | « Source/core/rendering/RenderLayer.cpp ('k') | Source/core/rendering/compositing/CompositedLayerMapping.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderLayerClipper.cpp
diff --git a/Source/core/rendering/RenderLayerClipper.cpp b/Source/core/rendering/RenderLayerClipper.cpp
index cbfe17b66e895834504340f593af97ce5323bd1e..9181b0a09220dcc3f29e9ffdf72ce61f1cbbc967 100644
--- a/Source/core/rendering/RenderLayerClipper.cpp
+++ b/Source/core/rendering/RenderLayerClipper.cpp
@@ -361,7 +361,7 @@ void RenderLayerClipper::parentClipRects(const ClipRectsContext& clipRectsContex
RenderLayer* RenderLayerClipper::clippingRootForPainting() const
{
- if (m_renderer->hasCompositedLayerMapping())
+ if (m_renderer->hasCompositedLayerMapping() || m_renderer->groupedMapping())
return const_cast<RenderLayer*>(m_renderer->layer());
const RenderLayer* current = m_renderer->layer();
@@ -371,9 +371,7 @@ RenderLayer* RenderLayerClipper::clippingRootForPainting() const
current = current->compositingContainer();
ASSERT(current);
- if (current->transform()
- || (current->compositingState() == PaintsIntoOwnBacking)
- )
+ if (current->transform() || (current->compositingState() == PaintsIntoOwnBacking) || current->groupedMapping())
return const_cast<RenderLayer*>(current);
}
« no previous file with comments | « Source/core/rendering/RenderLayer.cpp ('k') | Source/core/rendering/compositing/CompositedLayerMapping.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698