Remove DeprecatedPaintLayerFragment::outlineRect

Source/core/layout/LayoutTreeAsText.cpp

 /*
  * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 539 matching lines @@
     }
 }
 
 enum LayerPaintPhase {
     LayerPaintPhaseAll = 0,
     LayerPaintPhaseBackground = -1,
     LayerPaintPhaseForeground = 1
 };
 
 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();
 
     if (reportFrameScrollInfo) {
         LayoutView* layoutView = toLayoutView(layer.layoutObject());
 
         adjustedLayoutBoundsWithScrollbars.setWidth(layoutView->viewWidth(IncludeScrollbars));
         adjustedLayoutBoundsWithScrollbars.setHeight(layoutView->viewHeight(IncludeScrollbars));
     }
 
     writeIndent(ts, indent);
 
     if (layer.layoutObject()->style()->visibility() == HIDDEN)
         ts << "hidden ";
 
     ts << "layer ";
 
     if (behavior & LayoutAsTextShowAddresses)
         ts << static_cast<const void*>(&layer) << " ";
 
     ts << adjustedLayoutBoundsWithScrollbars;
 
     if (!adjustedLayoutBounds.isEmpty()) {
         if (!adjustedBackgroundClipRect.contains(adjustedLayoutBounds))
             ts << " backgroundClip " << adjustedBackgroundClipRect;
         if (!adjustedClipRect.contains(adjustedLayoutBoundsWithScrollbars))
             ts << " clip " << adjustedClipRect;
-        if (!adjustedOutlineClipRect.contains(adjustedLayoutBounds))
-            ts << " outlineClip " << adjustedOutlineClipRect;
     }
     if (layer.isTransparent())
         ts << " transparent";
 
     if (layer.layoutObject()->hasOverflowClip() || reportFrameScrollInfo) {
         ScrollableArea* scrollableArea;
         if (reportFrameScrollInfo)
             scrollableArea = toLayoutView(layer.layoutObject())->frameView();
         else
             scrollableArea = layer.scrollableArea();
@@ skipping 41 matching lines @@
     while (DeprecatedPaintLayerStackingNode* normalFlowChild = it.next())
         vector.append(normalFlowChild);
     return vector;
 }
 
 void LayoutTreeAsText::writeLayers(TextStream& ts, const DeprecatedPaintLayer* rootLayer, DeprecatedPaintLayer* layer,
     const LayoutRect& paintRect, int indent, LayoutAsTextBehavior behavior)
 {
     // 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();
 
     LayoutPoint offsetFromRoot;
     layer->convertToLayerCoords(rootLayer, offsetFromRoot);
     bool shouldPaint = (behavior & LayoutAsTextShowAllLayers) ? true : layer->intersectsDamageRect(layerBounds, damageRect.rect(), offsetFromRoot);
 
     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;
         if (behavior & LayoutAsTextShowLayerNesting) {
             writeIndent(ts, indent);
             ts << " negative z-order list(" << negList->size() << ")\n";
             ++currIndent;
         }
         for (unsigned i = 0; i != negList->size(); ++i)
             writeLayers(ts, rootLayer, negList->at(i)->layer(), paintRect, currIndent, behavior);
     }
 
     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()) {
         int currIndent = indent;
         if (behavior & LayoutAsTextShowLayerNesting) {
             writeIndent(ts, indent);
             ts << " normal flow list(" << normalFlowList.size() << ")\n";
             ++currIndent;
         }
         for (unsigned i = 0; i != normalFlowList.size(); ++i)
@@ skipping 147 matching lines @@
     element->document().updateLayout();
 
     LayoutObject* layoutObject = element->layoutObject();
     if (!layoutObject || !layoutObject->isListItem())
         return String();
 
     return toLayoutListItem(layoutObject)->markerText();
 }
 
 } // namespace blink