Index: Source/core/rendering/RenderObject.cpp |
diff --git a/Source/core/rendering/RenderObject.cpp b/Source/core/rendering/RenderObject.cpp |
index 1de82be21a94517a11222fe0a1bc68bee7563242..60a7424559020258b4221481adf5e0267133926a 100644 |
--- a/Source/core/rendering/RenderObject.cpp |
+++ b/Source/core/rendering/RenderObject.cpp |
@@ -1511,17 +1511,8 @@ void RenderObject::invalidatePaintUsingContainer(const RenderLayerModelObject* p |
"object", this->debugName().ascii(), |
"info", TracedValue::fromJSONValue(jsonObjectForPaintInvalidationInfo(r, invalidationReasonToString(invalidationReason)))); |
- // FIXME: Don't read compositing state here since we do this in the middle of recalc/layout. |
+ // For querying RenderLayer::compositingState() |
DisableCompositingQueryAsserts disabler; |
dsinclair
2014/06/13 17:50:04
Can this be moved down into the if (v->usesComposi
chrishtr
2014/06/13 22:46:49
Per top-level comments, it can't be moved down.
|
- if (paintInvalidationContainer->compositingState() == PaintsIntoGroupedBacking) { |
- ASSERT(paintInvalidationContainer->groupedMapping()); |
- ASSERT(paintInvalidationContainer->layer()); |
- |
- // Not clean, but if squashing layer does not yet exist here (e.g. paint invalidation coming from within recomputing compositing requirements) |
- // then it's ok to just exit here, since the squashing layer will get invalidate when it is newly created. |
- if (!paintInvalidationContainer->groupedMapping()->squashingLayer()) |
- return; |
- } |
if (paintInvalidationContainer->isRenderFlowThread()) { |
toRenderFlowThread(paintInvalidationContainer)->repaintRectangleInRegions(r); |