| Index: Source/core/layout/LayoutTreeAsText.cpp
|
| diff --git a/Source/core/layout/LayoutTreeAsText.cpp b/Source/core/layout/LayoutTreeAsText.cpp
|
| index c0c918e2c63e4c280152bdb574277bc2e78b61b0..8b8a7695c9f8d7b8659df18e1cc7c311543c66e1 100644
|
| --- a/Source/core/layout/LayoutTreeAsText.cpp
|
| +++ b/Source/core/layout/LayoutTreeAsText.cpp
|
| @@ -557,14 +557,13 @@ enum LayerPaintPhase {
|
| };
|
|
|
| static void write(TextStream& ts, DeprecatedPaintLayer& layer,
|
| - const LayoutRect& layerBounds, const LayoutRect& backgroundClipRect, const LayoutRect& clipRect, const LayoutRect& outlineClipRect,
|
| + const LayoutRect& layerBounds, const LayoutRect& backgroundClipRect, const LayoutRect& clipRect,
|
| LayerPaintPhase paintPhase = LayerPaintPhaseAll, int indent = 0, LayoutAsTextBehavior behavior = LayoutAsTextBehaviorNormal)
|
| {
|
| IntRect adjustedLayoutBounds = pixelSnappedIntRect(layerBounds);
|
| IntRect adjustedLayoutBoundsWithScrollbars = adjustedLayoutBounds;
|
| IntRect adjustedBackgroundClipRect = pixelSnappedIntRect(backgroundClipRect);
|
| IntRect adjustedClipRect = pixelSnappedIntRect(clipRect);
|
| - IntRect adjustedOutlineClipRect = pixelSnappedIntRect(outlineClipRect);
|
|
|
| Settings* settings = layer.layoutObject()->document().settings();
|
| bool reportFrameScrollInfo = layer.layoutObject()->isLayoutView() && settings && !settings->rootLayerScrolls();
|
| @@ -593,8 +592,6 @@ static void write(TextStream& ts, DeprecatedPaintLayer& layer,
|
| ts << " backgroundClip " << adjustedBackgroundClipRect;
|
| if (!adjustedClipRect.contains(adjustedLayoutBoundsWithScrollbars))
|
| ts << " clip " << adjustedClipRect;
|
| - if (!adjustedOutlineClipRect.contains(adjustedLayoutBounds))
|
| - ts << " outlineClip " << adjustedOutlineClipRect;
|
| }
|
| if (layer.isTransparent())
|
| ts << " transparent";
|
| @@ -656,8 +653,8 @@ void LayoutTreeAsText::writeLayers(TextStream& ts, const DeprecatedPaintLayer* r
|
| {
|
| // Calculate the clip rects we should use.
|
| LayoutRect layerBounds;
|
| - ClipRect damageRect, clipRectToApply, outlineRect;
|
| - layer->clipper().calculateRects(ClipRectsContext(rootLayer, UncachedClipRects), paintRect, layerBounds, damageRect, clipRectToApply, outlineRect);
|
| + ClipRect damageRect, clipRectToApply;
|
| + layer->clipper().calculateRects(ClipRectsContext(rootLayer, UncachedClipRects), paintRect, layerBounds, damageRect, clipRectToApply);
|
|
|
| // Ensure our lists are up-to-date.
|
| layer->stackingNode()->updateLayerListsIfNeeded();
|
| @@ -669,7 +666,7 @@ void LayoutTreeAsText::writeLayers(TextStream& ts, const DeprecatedPaintLayer* r
|
| Vector<DeprecatedPaintLayerStackingNode*>* negList = layer->stackingNode()->negZOrderList();
|
| bool paintsBackgroundSeparately = negList && negList->size() > 0;
|
| if (shouldPaint && paintsBackgroundSeparately)
|
| - write(ts, *layer, layerBounds, damageRect.rect(), clipRectToApply.rect(), outlineRect.rect(), LayerPaintPhaseBackground, indent, behavior);
|
| + write(ts, *layer, layerBounds, damageRect.rect(), clipRectToApply.rect(), LayerPaintPhaseBackground, indent, behavior);
|
|
|
| if (negList) {
|
| int currIndent = indent;
|
| @@ -683,7 +680,7 @@ void LayoutTreeAsText::writeLayers(TextStream& ts, const DeprecatedPaintLayer* r
|
| }
|
|
|
| if (shouldPaint)
|
| - write(ts, *layer, layerBounds, damageRect.rect(), clipRectToApply.rect(), outlineRect.rect(), paintsBackgroundSeparately ? LayerPaintPhaseForeground : LayerPaintPhaseAll, indent, behavior);
|
| + write(ts, *layer, layerBounds, damageRect.rect(), clipRectToApply.rect(), paintsBackgroundSeparately ? LayerPaintPhaseForeground : LayerPaintPhaseAll, indent, behavior);
|
|
|
| Vector<DeprecatedPaintLayerStackingNode*> normalFlowList = normalFlowListFor(layer->stackingNode());
|
| if (!normalFlowList.isEmpty()) {
|
|
|