Modified: trunk/Source/WebCore/ChangeLog (215977 => 215978)
--- trunk/Source/WebCore/ChangeLog 2017-04-29 21:25:50 UTC (rev 215977)
+++ trunk/Source/WebCore/ChangeLog 2017-04-30 03:06:09 UTC (rev 215978)
@@ -1,3 +1,16 @@
+2017-04-29 Simon Fraser <simon.fra...@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 <za...@apple.com>
iBooks text can overlap, sometimes columns are shifted splitting words.
Modified: trunk/Source/WebCore/rendering/RenderTreeAsText.cpp (215977 => 215978)
--- trunk/Source/WebCore/rendering/RenderTreeAsText.cpp 2017-04-29 21:25:50 UTC (rev 215977)
+++ trunk/Source/WebCore/rendering/RenderTreeAsText.cpp 2017-04-30 03:06:09 UTC (rev 215978)
@@ -674,7 +674,7 @@
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 @@
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) {
