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

Unified Diff: sky/engine/core/rendering/RenderLayerModelObject.cpp

Issue 840403003: First pass at deleting paint invalidation code. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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: sky/engine/core/rendering/RenderLayerModelObject.cpp
diff --git a/sky/engine/core/rendering/RenderLayerModelObject.cpp b/sky/engine/core/rendering/RenderLayerModelObject.cpp
index efe2847b4adb4629b6a281f0d6bfad6bb6785279..65dfa643c2bcb9a92cdb6e031ba408bd19b1e318 100644
--- a/sky/engine/core/rendering/RenderLayerModelObject.cpp
+++ b/sky/engine/core/rendering/RenderLayerModelObject.cpp
@@ -120,22 +120,6 @@ void RenderLayerModelObject::styleDidChange(StyleDifference diff, const RenderSt
}
}
-InvalidationReason RenderLayerModelObject::invalidatePaintIfNeeded(const PaintInvalidationState& paintInvalidationState, const RenderLayerModelObject& newPaintInvalidationContainer)
-{
- const LayoutRect oldPaintInvalidationRect = previousPaintInvalidationRect();
- const LayoutPoint oldPositionFromPaintInvalidationContainer = previousPositionFromPaintInvalidationContainer();
- setPreviousPaintInvalidationRect(boundsRectForPaintInvalidation(&newPaintInvalidationContainer, &paintInvalidationState));
- setPreviousPositionFromPaintInvalidationContainer(RenderLayer::positionFromPaintInvalidationContainer(this, &newPaintInvalidationContainer, &paintInvalidationState));
-
- // If we are set to do a full paint invalidation that means the RenderView will issue
- // paint invalidations. We can then skip issuing of paint invalidations for the child
- // renderers as they'll be covered by the RenderView.
- if (view()->doingFullPaintInvalidation())
- return InvalidationNone;
-
- return RenderObject::invalidatePaintIfNeeded(newPaintInvalidationContainer, oldPaintInvalidationRect, oldPositionFromPaintInvalidationContainer, paintInvalidationState);
-}
-
void RenderLayerModelObject::invalidateTreeIfNeeded(const PaintInvalidationState& paintInvalidationState)
{
// FIXME: SVG should probably also go through this unified paint invalidation system.
@@ -147,11 +131,7 @@ void RenderLayerModelObject::invalidateTreeIfNeeded(const PaintInvalidationState
const RenderLayerModelObject& newPaintInvalidationContainer = *adjustCompositedContainerForSpecialAncestors(&paintInvalidationState.paintInvalidationContainer());
ASSERT(&newPaintInvalidationContainer == containerForPaintInvalidation());
- InvalidationReason reason = invalidatePaintIfNeeded(paintInvalidationState, newPaintInvalidationContainer);
-
PaintInvalidationState childTreeWalkState(paintInvalidationState, *this, newPaintInvalidationContainer);
- if (reason == InvalidationLocationChange || reason == InvalidationFull)
- childTreeWalkState.setForceCheckForPaintInvalidation();
RenderObject::invalidateTreeIfNeeded(childTreeWalkState);
}
« no previous file with comments | « sky/engine/core/rendering/RenderLayerModelObject.h ('k') | sky/engine/core/rendering/RenderLayerRepainter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698