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

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

Issue 445793002: Allow paint invalidation containers to cross frame boundaries. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed. 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
Index: Source/core/rendering/RenderObject.cpp
diff --git a/Source/core/rendering/RenderObject.cpp b/Source/core/rendering/RenderObject.cpp
index 94adce2fe09a9165785e2c19c7d3206a991f3672..0de351cd052681cfa9f7e5f0aa5095e6e3e32a82 100644
--- a/Source/core/rendering/RenderObject.cpp
+++ b/Source/core/rendering/RenderObject.cpp
@@ -1422,13 +1422,11 @@ const RenderLayerModelObject* RenderObject::containerForPaintInvalidation() cons
const RenderLayerModelObject* RenderObject::enclosingCompositedContainer() const
{
RenderLayerModelObject* container = 0;
- if (view()->usesCompositing()) {
- // FIXME: CompositingState is not necessarily up to date for many callers of this function.
- DisableCompositingQueryAsserts disabler;
+ // FIXME: CompositingState is not necessarily up to date for many callers of this function.
+ DisableCompositingQueryAsserts disabler;
- if (RenderLayer* compositingLayer = enclosingLayer()->enclosingLayerForPaintInvalidation())
- container = compositingLayer->renderer();
- }
+ if (RenderLayer* compositingLayer = enclosingLayer()->enclosingLayerForPaintInvalidationCrossingFrameBoundaries())
+ container = compositingLayer->renderer();
return container;
}
@@ -1508,14 +1506,12 @@ void RenderObject::invalidatePaintUsingContainer(const RenderLayerModelObject* p
return;
}
- RenderView* v = view();
if (paintInvalidationContainer->isRenderView()) {
- ASSERT(paintInvalidationContainer == v);
- v->invalidatePaintForRectangle(r);
+ toRenderView(paintInvalidationContainer)->invalidatePaintForRectangle(r);
return;
}
- if (v->usesCompositing()) {
+ if (view()->usesCompositing()) {
ASSERT(paintInvalidationContainer->hasLayer() && (paintInvalidationContainer->layer()->compositingState() == PaintsIntoOwnBacking || paintInvalidationContainer->layer()->compositingState() == PaintsIntoGroupedBacking));
paintInvalidationContainer->layer()->repainter().setBackingNeedsRepaintInRect(r);
}

Powered by Google App Engine
This is Rietveld 408576698