Modified: trunk/Source/WebCore/ChangeLog (206278 => 206279)
--- trunk/Source/WebCore/ChangeLog 2016-09-22 21:39:29 UTC (rev 206278)
+++ trunk/Source/WebCore/ChangeLog 2016-09-22 21:56:02 UTC (rev 206279)
@@ -1,3 +1,18 @@
+2016-09-22 Zalan Bujtas <za...@apple.com>
+
+ ShowRenderTree: Shuffle letters to have better readability.
+ https://bugs.webkit.org/show_bug.cgi?id=162460
+
+ Reviewed by Simon Fraser.
+ old: (B)lock/(I)nline/I(N)line-block, (R)elative/A(B)solute/Fi(X)ed/Stick(Y) positioned, (O)verflow clipping, (A)nonymous, (G)enerated, (F)loating, has(L)ayer, (C)omposited, (D)irty layout, Dirty (S)tyle.
+ new: (B)lock/(I)nline/I(N)line-block, (A)bsolute/Fi(X)ed/(R)elative/Stic(K)y, (F)loating, (O)verflow clip, Anon(Y)mous, (G)enerated, has(L)ayer, (C)omposited, (+)Dirty style, (+)Dirty layout.
+
+ Not testable.
+
+ * rendering/RenderObject.cpp:
+ (WebCore::showRenderTreeLegend):
+ (WebCore::RenderObject::showRenderObject):
+
2016-09-22 Daniel Bates <daba...@apple.com>
[CSP] Violation report may be sent to wrong domain on frame-ancestors violation
Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (206278 => 206279)
--- trunk/Source/WebCore/rendering/RenderObject.cpp 2016-09-22 21:39:29 UTC (rev 206278)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2016-09-22 21:56:02 UTC (rev 206279)
@@ -947,7 +947,7 @@
static void showRenderTreeLegend()
{
- fprintf(stderr, "\n(B)lock/(I)nline/I(N)line-block, (R)elative/A(B)solute/Fi(X)ed/Stick(Y) positioned, (O)verflow clipping, (A)nonymous, (G)enerated, (F)loating, has(L)ayer, (C)omposited, (D)irty layout, Dirty (S)tyle\n");
+ fprintf(stderr, "\n(B)lock/(I)nline/I(N)line-block, (A)bsolute/Fi(X)ed/(R)elative/Stic(K)y, (F)loating, (O)verflow clip, Anon(Y)mous, (G)enerated, has(L)ayer, (C)omposited, (+)Dirty style, (+)Dirty layout\n");
}
void RenderObject::showNodeTreeForThis() const
@@ -1026,10 +1026,10 @@
if (isRelPositioned())
fputc('R', stderr);
else if (isStickyPositioned())
- fputc('Y', stderr);
+ fputc('K', stderr);
else if (isOutOfFlowPositioned()) {
if (style().position() == AbsolutePosition)
- fputc('B', stderr);
+ fputc('A', stderr);
else
fputc('X', stderr);
}
@@ -1036,6 +1036,11 @@
} else
fputc('-', stderr);
+ if (isFloating())
+ fputc('F', stderr);
+ else
+ fputc('-', stderr);
+
if (hasOverflowClip())
fputc('O', stderr);
else
@@ -1042,7 +1047,7 @@
fputc('-', stderr);
if (isAnonymous())
- fputc('A', stderr);
+ fputc('Y', stderr);
else
fputc('-', stderr);
@@ -1051,11 +1056,6 @@
else
fputc('-', stderr);
- if (isFloating())
- fputc('F', stderr);
- else
- fputc('-', stderr);
-
if (hasLayer())
fputc('L', stderr);
else
@@ -1068,13 +1068,13 @@
fputc(' ', stderr);
- if (needsLayout())
- fputc('D', stderr);
+ if (node() && node()->needsStyleRecalc())
+ fputc('+', stderr);
else
fputc('-', stderr);
- if (node() && node()->needsStyleRecalc())
- fputc('S', stderr);
+ if (needsLayout())
+ fputc('+', stderr);
else
fputc('-', stderr);
