Commit 074c4131 authored by chrishtr@chromium.org's avatar chrishtr@chromium.org

Get rid of hack in invalidatePaintUsingContainer for partially computed

squashing layer state. This is no longer necessary after crrev.com/311813005.

BUG=

Review URL: https://codereview.chromium.org/331563005

git-svn-id: svn://svn.chromium.org/blink/trunk@176138 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 7641befa
...@@ -1511,17 +1511,8 @@ void RenderObject::invalidatePaintUsingContainer(const RenderLayerModelObject* p ...@@ -1511,17 +1511,8 @@ void RenderObject::invalidatePaintUsingContainer(const RenderLayerModelObject* p
"object", this->debugName().ascii(), "object", this->debugName().ascii(),
"info", TracedValue::fromJSONValue(jsonObjectForPaintInvalidationInfo(r, invalidationReasonToString(invalidationReason)))); "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; DisableCompositingQueryAsserts disabler;
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()) { if (paintInvalidationContainer->isRenderFlowThread()) {
toRenderFlowThread(paintInvalidationContainer)->repaintRectangleInRegions(r); toRenderFlowThread(paintInvalidationContainer)->repaintRectangleInRegions(r);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment