Fix tests broken by r215964.
authorsimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 30 Apr 2017 03:06:09 +0000 (03:06 +0000)
committersimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 30 Apr 2017 03:06:09 +0000 (03:06 +0000)
Fix copy-paste error that caused the wrong paint phase to get passed to the fire writeLayerRenderers()
call, causing extra renderer dumping.

Also remove unused default arguments.

* rendering/RenderTreeAsText.cpp:
(WebCore::writeLayerRenderers):
(WebCore::writeLayers):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@215978 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderTreeAsText.cpp

index 80e7957..1597324 100644 (file)
@@ -1,3 +1,16 @@
+2017-04-29  Simon Fraser  <simon.fraser@apple.com>
+
+        Fix tests broken by r215964.
+
+        Fix copy-paste error that caused the wrong paint phase to get passed to the fire writeLayerRenderers()
+        call, causing extra renderer dumping.
+
+        Also remove unused default arguments.
+
+        * rendering/RenderTreeAsText.cpp:
+        (WebCore::writeLayerRenderers):
+        (WebCore::writeLayers):
+
 2017-04-28  Zalan Bujtas  <zalan@apple.com>
 
         iBooks text can overlap, sometimes columns are shifted splitting words.
index cc2bab4..cc3fa23 100644 (file)
@@ -674,7 +674,7 @@ static void writeLayer(TextStream& ts, const RenderLayer& layer, const LayoutRec
     ts << "\n";
 }
 
-static void writeLayerRenderers(TextStream& ts, const RenderLayer& layer, LayerPaintPhase paintPhase = LayerPaintPhaseAll, int indent = 0, RenderAsTextBehavior behavior = RenderAsTextBehaviorNormal)
+static void writeLayerRenderers(TextStream& ts, const RenderLayer& layer, LayerPaintPhase paintPhase, int indent, RenderAsTextBehavior behavior)
 {
     if (paintPhase != LayerPaintPhaseBackground)
         write(ts, layer.renderer(), indent + 1, behavior);
@@ -784,7 +784,7 @@ static void writeLayers(TextStream& ts, const RenderLayer& rootLayer, RenderLaye
     bool paintsBackgroundSeparately = negativeZOrderList && negativeZOrderList->size() > 0;
     if (shouldPaint && paintsBackgroundSeparately) {
         writeLayer(ts, layer, layerBounds, damageRect.rect(), clipRectToApply.rect(), LayerPaintPhaseBackground, indent, behavior);
-        writeLayerRenderers(ts, layer, paintsBackgroundSeparately ? LayerPaintPhaseForeground : LayerPaintPhaseAll, indent, behavior);
+        writeLayerRenderers(ts, layer, LayerPaintPhaseBackground, indent, behavior);
     }
         
     if (negativeZOrderList) {