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

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

Issue 331563005: Get rid of hack in invalidatePaintUsingContainer for partially computed (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698