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

Unified Diff: Source/core/rendering/compositing/CompositedLayerMapping.cpp

Issue 476583002: Fix a bogus assertion in CLM (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: . Created 6 years, 4 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 | « LayoutTests/compositing/squashing/squashing-into-ancestor-painted-layer-expected.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/compositing/CompositedLayerMapping.cpp
diff --git a/Source/core/rendering/compositing/CompositedLayerMapping.cpp b/Source/core/rendering/compositing/CompositedLayerMapping.cpp
index 7b12faf328b8ea2cb7ef3e79c9094083645b05aa..947a3480fca4156514b2db371ca58081ff203ef4 100644
--- a/Source/core/rendering/compositing/CompositedLayerMapping.cpp
+++ b/Source/core/rendering/compositing/CompositedLayerMapping.cpp
@@ -1888,6 +1888,7 @@ bool CompositedLayerMapping::updateRequiresOwnBackingStoreForAncestorReasons(con
if (paintsIntoCompositedAncestor() != previousPaintsIntoCompositedAncestor)
compositor()->paintInvalidationOnCompositingChange(&m_owningLayer);
+ // FIXME: this is bogus. We need to make this assignment before the check above.
m_requiresOwnBackingStoreForAncestorReasons = !canPaintIntoAncestor;
return m_requiresOwnBackingStoreForAncestorReasons != previousRequiresOwnBackingStoreForAncestorReasons;
@@ -2015,10 +2016,7 @@ IntRect CompositedLayerMapping::localClipRectForSquashedLayer(const RenderLayer&
void CompositedLayerMapping::doPaintTask(const GraphicsLayerPaintInfo& paintInfo, const PaintLayerFlags& paintLayerFlags, GraphicsContext* context,
const IntRect& clip) // In the coords of rootLayer.
{
- if (paintsIntoCompositedAncestor()) {
- ASSERT_NOT_REACHED();
- return;
- }
+ RELEASE_ASSERT(paintInfo.renderLayer->compositingState() == PaintsIntoGroupedBacking || !paintsIntoCompositedAncestor());
FontCachePurgePreventer fontCachePurgePreventer;
« no previous file with comments | « LayoutTests/compositing/squashing/squashing-into-ancestor-painted-layer-expected.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698