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

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

Issue 445263002: Remove cached bounds in RenderLayer. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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/RenderTreeAsText.cpp
diff --git a/Source/core/rendering/RenderTreeAsText.cpp b/Source/core/rendering/RenderTreeAsText.cpp
index d0dd1601200e5ede7f03291bf8d0963700e45152..d7841be752879459fcd77dd06ef875d3b915a434 100644
--- a/Source/core/rendering/RenderTreeAsText.cpp
+++ b/Source/core/rendering/RenderTreeAsText.cpp
@@ -575,14 +575,13 @@ static void write(TextStream& ts, RenderLayer& l,
}
void RenderTreeAsText::writeLayers(TextStream& ts, const RenderLayer* rootLayer, RenderLayer* layer,
- const LayoutRect& paintRect, int indent, RenderAsTextBehavior behavior)
+ const LayoutRect& paintRect, int indent, RenderAsTextBehavior behavior)
{
- // FIXME: Apply overflow to the root layer to not break every test. Complete hack. Sigh.
+ // FIXME: Apply overflow to the root layer to not break every test. Complete hack. Sigh.
LayoutRect paintDirtyRect(paintRect);
if (rootLayer == layer) {
paintDirtyRect.setWidth(max<LayoutUnit>(paintDirtyRect.width(), rootLayer->renderBox()->layoutOverflowRect().maxX()));
paintDirtyRect.setHeight(max<LayoutUnit>(paintDirtyRect.height(), rootLayer->renderBox()->layoutOverflowRect().maxY()));
- layer->setSizeHackForRenderTreeAsText(layer->size().expandedTo(pixelSnappedIntSize(layer->renderBox()->maxLayoutOverflow(), LayoutPoint(0, 0))));
}
// Calculate the clip rects we should use.
@@ -590,6 +589,10 @@ void RenderTreeAsText::writeLayers(TextStream& ts, const RenderLayer* rootLayer,
ClipRect damageRect, clipRectToApply, outlineRect;
layer->clipper().calculateRects(ClipRectsContext(rootLayer, UncachedClipRects), paintDirtyRect, layerBounds, damageRect, clipRectToApply, outlineRect);
+ // FIXME: Apply overflow to the root layer to not break every test. Complete hack. Sigh.
+ if (rootLayer == layer)
+ layerBounds.setSize(layer->size().expandedTo(pixelSnappedIntSize(layer->renderBox()->maxLayoutOverflow(), LayoutPoint(0, 0))));
+
// Ensure our lists are up-to-date.
layer->stackingNode()->updateLayerListsIfNeeded();
« Source/core/rendering/RenderLayer.cpp ('K') | « Source/core/rendering/RenderLayerScrollableArea.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698