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..182066444e36e168f3a08d9e1a537f6c43835faf 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,7 +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()) { |
+ if (paintInfo.renderLayer->compositingState() != PaintsIntoGroupedBacking && paintsIntoCompositedAncestor()) { |
ASSERT_NOT_REACHED(); |
return; |
} |
abarth-chromium
2014/08/14 20:56:29
We should just make this a RELEASE_ASSERT
|