Diff
Modified: trunk/LayoutTests/ChangeLog (195515 => 195516)
--- trunk/LayoutTests/ChangeLog 2016-01-24 20:39:42 UTC (rev 195515)
+++ trunk/LayoutTests/ChangeLog 2016-01-24 20:39:49 UTC (rev 195516)
@@ -1,5 +1,19 @@
2016-01-24 Simon Fraser <[email protected]>
+ Make the dumped display list representation a bit more compact
+ https://bugs.webkit.org/show_bug.cgi?id=153409
+
+ Reviewed by Zalan Bujtas.
+
+ Updated results.
+
+ * displaylists/extent-includes-shadow-expected.txt:
+ * displaylists/extent-includes-transforms-expected.txt:
+ * displaylists/layer-dispay-list-expected.txt:
+ * displaylists/replay-skip-clipped-rect-expected.txt:
+
+2016-01-24 Simon Fraser <[email protected]>
+
Add testing for display list replay, and skip clipped-out items on replay
https://bugs.webkit.org/show_bug.cgi?id=153408
Modified: trunk/LayoutTests/displaylists/extent-includes-shadow-expected.txt (195515 => 195516)
--- trunk/LayoutTests/displaylists/extent-includes-shadow-expected.txt 2016-01-24 20:39:42 UTC (rev 195515)
+++ trunk/LayoutTests/displaylists/extent-includes-shadow-expected.txt 2016-01-24 20:39:49 UTC (rev 195516)
@@ -1,21 +1,16 @@
-(
- (translate
- (x 0.00)
- (y 0.00)))
-(
- (save
- (restore-index 4)))
-(
- (set-state
- (change-flags 1024)
- (shadow-blur 12.00)
- (shadow-offset width=10 height=20)
- (shadows-use-legacy-radius 0)))
-(
- (fill-rect-with-color
- (extent at (43,50) size 134x137)
- (rect at (50,50) size 100x100)
- (color #0000FF)))
-(
- (restore))
+(translate
+ (x 0.00)
+ (y 0.00))
+(save
+ (restore-index 4))
+(set-state
+ (change-flags 1024)
+ (shadow-blur 12.00)
+ (shadow-offset width=10 height=20)
+ (shadows-use-legacy-radius 0))
+(fill-rect-with-color
+ (extent at (43,50) size 134x137)
+ (rect at (50,50) size 100x100)
+ (color #0000FF))
+(restore)
Modified: trunk/LayoutTests/displaylists/extent-includes-transforms-expected.txt (195515 => 195516)
--- trunk/LayoutTests/displaylists/extent-includes-transforms-expected.txt 2016-01-24 20:39:42 UTC (rev 195515)
+++ trunk/LayoutTests/displaylists/extent-includes-transforms-expected.txt 2016-01-24 20:39:49 UTC (rev 195516)
@@ -1,24 +1,18 @@
-(
- (translate
- (x 0.00)
- (y 22.00)))
-(
- (concatentate-ctm
- (ctm {m=((0.87,0.50)(-0.50,0.87)) t=(81.70,-18.30)})))
-(
- (save
- (restore-index 5)))
-(
- (set-state
- (change-flags 1024)
- (shadow-blur 12.00)
- (shadow-offset width=10 height=20)
- (shadows-use-legacy-radius 0)))
-(
- (fill-rect-with-color
- (extent at (7.14,0.20) size 184.55x185.65)
- (rect at (0,0) size 100x100)
- (color #0000FF)))
-(
- (restore))
+(translate
+ (x 0.00)
+ (y 22.00))
+(concatentate-ctm
+ (ctm {m=((0.87,0.50)(-0.50,0.87)) t=(81.70,-18.30)}))
+(save
+ (restore-index 5))
+(set-state
+ (change-flags 1024)
+ (shadow-blur 12.00)
+ (shadow-offset width=10 height=20)
+ (shadows-use-legacy-radius 0))
+(fill-rect-with-color
+ (extent at (7.14,0.20) size 184.55x185.65)
+ (rect at (0,0) size 100x100)
+ (color #0000FF))
+(restore)
Modified: trunk/LayoutTests/displaylists/layer-dispay-list-expected.txt (195515 => 195516)
--- trunk/LayoutTests/displaylists/layer-dispay-list-expected.txt 2016-01-24 20:39:42 UTC (rev 195515)
+++ trunk/LayoutTests/displaylists/layer-dispay-list-expected.txt 2016-01-24 20:39:49 UTC (rev 195516)
@@ -1,36 +1,29 @@
-(
- (translate
- (x 0.00)
- (y 0.00)))
-(
- (fill-rect-with-color
- (extent at (0,0) size 104x104)
- (rect at (0,0) size 104x104)
- (color #008000)))
-(
- (set-state
- (change-flags 131456)
- (fill-color #0000FF)
- (stroke-style 0)
- (should-antialias 0)))
-(
- (draw-rect
- (extent at (0,0) size 104x2)
- (rect at (0,0) size 104x2)
- (border-thickness 1.00)))
-(
- (draw-rect
- (extent at (0,102) size 104x2)
- (rect at (0,102) size 104x2)
- (border-thickness 1.00)))
-(
- (draw-rect
- (extent at (0,0) size 2x104)
- (rect at (0,0) size 2x104)
- (border-thickness 1.00)))
-(
- (draw-rect
- (extent at (102,0) size 2x104)
- (rect at (102,0) size 2x104)
- (border-thickness 1.00)))
+(translate
+ (x 0.00)
+ (y 0.00))
+(fill-rect-with-color
+ (extent at (0,0) size 104x104)
+ (rect at (0,0) size 104x104)
+ (color #008000))
+(set-state
+ (change-flags 131456)
+ (fill-color #0000FF)
+ (stroke-style 0)
+ (should-antialias 0))
+(draw-rect
+ (extent at (0,0) size 104x2)
+ (rect at (0,0) size 104x2)
+ (border-thickness 1.00))
+(draw-rect
+ (extent at (0,102) size 104x2)
+ (rect at (0,102) size 104x2)
+ (border-thickness 1.00))
+(draw-rect
+ (extent at (0,0) size 2x104)
+ (rect at (0,0) size 2x104)
+ (border-thickness 1.00))
+(draw-rect
+ (extent at (102,0) size 2x104)
+ (rect at (102,0) size 2x104)
+ (border-thickness 1.00))
Modified: trunk/LayoutTests/displaylists/replay-skip-clipped-rect-expected.txt (195515 => 195516)
--- trunk/LayoutTests/displaylists/replay-skip-clipped-rect-expected.txt 2016-01-24 20:39:42 UTC (rev 195515)
+++ trunk/LayoutTests/displaylists/replay-skip-clipped-rect-expected.txt 2016-01-24 20:39:49 UTC (rev 195516)
@@ -1,16 +1,15 @@
recorded:
-(
- (translate
- (x 0.00)
- (y 0.00)))
-(
- (fill-rect-with-color
- (extent at (412,0) size 100x100)
- (rect at (412,0) size 100x100)
- (color #0000FF)))
+(translate
+ (x 0.00)
+ (y 0.00))
+(fill-rect-with-color
+ (extent at (412,0) size 100x100)
+ (rect at (412,0) size 100x100)
+ (color #0000FF))
replayed:
(
- (translate
- (x 0.00)
- (y 0.00)))
+ (clip at (512,0) size 512x200)
+(translate
+ (x 0.00)
+ (y 0.00))
Modified: trunk/Source/WebCore/ChangeLog (195515 => 195516)
--- trunk/Source/WebCore/ChangeLog 2016-01-24 20:39:42 UTC (rev 195515)
+++ trunk/Source/WebCore/ChangeLog 2016-01-24 20:39:49 UTC (rev 195516)
@@ -1,5 +1,17 @@
2016-01-24 Simon Fraser <[email protected]>
+ Make the dumped display list representation a bit more compact
+ https://bugs.webkit.org/show_bug.cgi?id=153409
+
+ Reviewed by Zalan Bujtas.
+
+ Don't make a group for every display list item.
+
+ * platform/graphics/displaylists/DisplayList.cpp:
+ (WebCore::DisplayList::DisplayList::asText):
+
+2016-01-24 Simon Fraser <[email protected]>
+
Add testing for display list replay, and skip clipped-out items on replay
https://bugs.webkit.org/show_bug.cgi?id=153408
Modified: trunk/Source/WebCore/platform/graphics/displaylists/DisplayList.cpp (195515 => 195516)
--- trunk/Source/WebCore/platform/graphics/displaylists/DisplayList.cpp 2016-01-24 20:39:42 UTC (rev 195515)
+++ trunk/Source/WebCore/platform/graphics/displaylists/DisplayList.cpp 2016-01-24 20:39:49 UTC (rev 195516)
@@ -91,13 +91,9 @@
String DisplayList::asText(AsTextFlags flags) const
{
TextStream stream;
- size_t numItems = m_list.size();
- for (size_t i = 0; i < numItems; ++i) {
- const auto& item = m_list[i].get();
+ for (auto& item : m_list) {
if (!shouldDumpForFlags(flags, item))
continue;
-
- TextStream::GroupScope scope(stream);
stream << item;
}
return stream.release();
