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

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

Issue 845093002: Delete an assortment of unneeded 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
« no previous file with comments | « sky/engine/core/rendering/RenderBlock.h ('k') | sky/engine/core/rendering/RenderImage.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/RenderBlock.cpp
diff --git a/sky/engine/core/rendering/RenderBlock.cpp b/sky/engine/core/rendering/RenderBlock.cpp
index 4fb86708a20babc29e3543ac691bdfff16ef0f48..91f8249c1dd65db0672efb683e62ee1ca15771ea 100644
--- a/sky/engine/core/rendering/RenderBlock.cpp
+++ b/sky/engine/core/rendering/RenderBlock.cpp
@@ -235,37 +235,6 @@ void RenderBlock::invalidateTreeIfNeeded(const PaintInvalidationState& paintInva
PaintInvalidationState childPaintInvalidationState(paintInvalidationState, *this, newPaintInvalidationContainer);
for (TrackedRendererListHashSet::iterator it = positionedObjects->begin(); it != end; ++it) {
RenderBox* box = *it;
-
- // One of the renderers we're skipping over here may be the child's paint invalidation container,
- // so we can't pass our own paint invalidation container along.
- const RenderLayerModelObject& paintInvalidationContainerForChild = *box->containerForPaintInvalidation();
-
- // If it's a new paint invalidation container, we won't have properly accumulated the offset into the
- // PaintInvalidationState.
- // FIXME: Teach PaintInvalidationState to handle this case. crbug.com/371485
- if (&paintInvalidationContainerForChild != newPaintInvalidationContainer) {
- ForceHorriblySlowRectMapping slowRectMapping(&childPaintInvalidationState);
- PaintInvalidationState disabledPaintInvalidationState(childPaintInvalidationState, *this, paintInvalidationContainerForChild);
- box->invalidateTreeIfNeeded(disabledPaintInvalidationState);
- continue;
- }
-
- // If the positioned renderer is absolutely positioned and it is inside
- // a relatively positioned inline element, we need to account for
- // the inline elements position in PaintInvalidationState.
- if (box->style()->position() == AbsolutePosition) {
- RenderObject* container = box->container(&paintInvalidationContainerForChild, 0);
- if (container->isRelPositioned() && container->isRenderInline()) {
- // FIXME: We should be able to use PaintInvalidationState for this.
- // Currently, we will place absolutely positioned elements inside
- // relatively positioned inline blocks in the wrong location. crbug.com/371485
- ForceHorriblySlowRectMapping slowRectMapping(&childPaintInvalidationState);
- PaintInvalidationState disabledPaintInvalidationState(childPaintInvalidationState, *this, paintInvalidationContainerForChild);
- box->invalidateTreeIfNeeded(disabledPaintInvalidationState);
- continue;
- }
- }
-
box->invalidateTreeIfNeeded(childPaintInvalidationState);
}
}
« no previous file with comments | « sky/engine/core/rendering/RenderBlock.h ('k') | sky/engine/core/rendering/RenderImage.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698