Diff
Modified: trunk/LayoutTests/ChangeLog (132523 => 132524)
--- trunk/LayoutTests/ChangeLog 2012-10-25 20:15:26 UTC (rev 132523)
+++ trunk/LayoutTests/ChangeLog 2012-10-25 20:16:07 UTC (rev 132524)
@@ -1,3 +1,17 @@
+2012-10-25 Simon Fraser <simon.fra...@apple.com>
+
+ Log the tile cache tile size in test output
+ https://bugs.webkit.org/show_bug.cgi?id=100409
+
+ Reviewed by Beth Dakin.
+
+ New results with tile size in the output.
+
+ * platform/mac/tiled-drawing/tile-coverage-after-scroll-expected.txt:
+ * platform/mac/tiled-drawing/tile-coverage-scroll-to-bottom-expected.txt:
+ * platform/mac/tiled-drawing/tile-coverage-slow-scrolling-expected.txt:
+ * platform/mac/tiled-drawing/use-tiled-drawing-expected.txt:
+
2012-10-25 Zan Dobersek <zandober...@gmail.com>
Unreviewed GTK gardening.
Modified: trunk/LayoutTests/platform/mac/tiled-drawing/tile-coverage-after-scroll-expected.txt (132523 => 132524)
--- trunk/LayoutTests/platform/mac/tiled-drawing/tile-coverage-after-scroll-expected.txt 2012-10-25 20:15:26 UTC (rev 132523)
+++ trunk/LayoutTests/platform/mac/tiled-drawing/tile-coverage-after-scroll-expected.txt 2012-10-25 20:16:07 UTC (rev 132524)
@@ -8,6 +8,7 @@
(backgroundColor #FFFFFF)
(visible rect 0.00, 3000.00 785.00 x 600.00)
(tile cache coverage 0, 2048 785 x 2560)
+ (tile size 512 x 512)
(children 1
(GraphicsLayer
(visible rect 0.00, 0.00 0.00 x 0.00)
Modified: trunk/LayoutTests/platform/mac/tiled-drawing/tile-coverage-scroll-to-bottom-expected.txt (132523 => 132524)
--- trunk/LayoutTests/platform/mac/tiled-drawing/tile-coverage-scroll-to-bottom-expected.txt 2012-10-25 20:15:26 UTC (rev 132523)
+++ trunk/LayoutTests/platform/mac/tiled-drawing/tile-coverage-scroll-to-bottom-expected.txt 2012-10-25 20:16:07 UTC (rev 132524)
@@ -8,6 +8,7 @@
(backgroundColor #FFFFFF)
(visible rect 0.00, 5000.00 785.00 x 21.00)
(tile cache coverage 0, 4096 785 x 925)
+ (tile size 512 x 512)
(children 1
(GraphicsLayer
(visible rect 0.00, 0.00 0.00 x 0.00)
Modified: trunk/LayoutTests/platform/mac/tiled-drawing/tile-coverage-slow-scrolling-expected.txt (132523 => 132524)
--- trunk/LayoutTests/platform/mac/tiled-drawing/tile-coverage-slow-scrolling-expected.txt 2012-10-25 20:15:26 UTC (rev 132523)
+++ trunk/LayoutTests/platform/mac/tiled-drawing/tile-coverage-slow-scrolling-expected.txt 2012-10-25 20:16:07 UTC (rev 132524)
@@ -8,6 +8,7 @@
(backgroundColor #FFFFFF)
(visible rect 0.00, 0.00 800.00 x 600.00)
(tile cache coverage 0, 0 800 x 600)
+ (tile size 1600 x 1800)
(children 1
(GraphicsLayer
(visible rect 0.00, 0.00 0.00 x 0.00)
Modified: trunk/LayoutTests/platform/mac/tiled-drawing/use-tiled-drawing-expected.txt (132523 => 132524)
--- trunk/LayoutTests/platform/mac/tiled-drawing/use-tiled-drawing-expected.txt 2012-10-25 20:15:26 UTC (rev 132523)
+++ trunk/LayoutTests/platform/mac/tiled-drawing/use-tiled-drawing-expected.txt 2012-10-25 20:16:07 UTC (rev 132524)
@@ -8,6 +8,7 @@
(backgroundColor #FFFFFF)
(visible rect 0.00, 0.00 785.00 x 585.00)
(tile cache coverage 0, 0 1208 x 1536)
+ (tile size 512 x 512)
(children 1
(GraphicsLayer
(visible rect 0.00, 0.00 0.00 x 0.00)
Modified: trunk/Source/WebCore/ChangeLog (132523 => 132524)
--- trunk/Source/WebCore/ChangeLog 2012-10-25 20:15:26 UTC (rev 132523)
+++ trunk/Source/WebCore/ChangeLog 2012-10-25 20:16:07 UTC (rev 132524)
@@ -1,3 +1,17 @@
+2012-10-25 Simon Fraser <simon.fra...@apple.com>
+
+ Log the tile cache tile size in test output
+ https://bugs.webkit.org/show_bug.cgi?id=100409
+
+ Reviewed by Beth Dakin.
+
+ When dumping tile cache information in tests, also dump the tile size.
+
+ * platform/graphics/TiledBacking.h:
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::dumpAdditionalProperties):
+ * platform/graphics/ca/mac/TileCache.h:
+
2012-10-25 Arnaud Renevier <a.renev...@sisa.samsung.com>
do not multiply/demultiply colors when alpha is 255
Modified: trunk/Source/WebCore/platform/graphics/TiledBacking.h (132523 => 132524)
--- trunk/Source/WebCore/platform/graphics/TiledBacking.h 2012-10-25 20:15:26 UTC (rev 132523)
+++ trunk/Source/WebCore/platform/graphics/TiledBacking.h 2012-10-25 20:16:07 UTC (rev 132524)
@@ -51,6 +51,8 @@
virtual void setTileCoverage(TileCoverage) = 0;
virtual TileCoverage tileCoverage() const = 0;
+ virtual IntSize tileSize() const = 0;
+
virtual void forceRepaint() = 0;
virtual void setScrollingPerformanceLoggingEnabled(bool) = 0;
Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (132523 => 132524)
--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2012-10-25 20:15:26 UTC (rev 132523)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2012-10-25 20:16:07 UTC (rev 132524)
@@ -2517,9 +2517,13 @@
}
if (tiledBacking() && (behavior & LayerTreeAsTextIncludeTileCaches)) {
+ IntRect tileCoverageRect = tiledBacking()->tileCoverageRect();
writeIndent(textStream, indent + 1);
- IntRect tileCoverageRect = tiledBacking()->tileCoverageRect();
textStream << "(tile cache coverage " << tileCoverageRect.x() << ", " << tileCoverageRect.y() << " " << tileCoverageRect.width() << " x " << tileCoverageRect.height() << ")\n";
+
+ IntSize tileSize = tiledBacking()->tileSize();
+ writeIndent(textStream, indent + 1);
+ textStream << "(tile size " << tileSize.width() << " x " << tileSize.height() << ")\n";
}
}
Modified: trunk/Source/WebCore/platform/graphics/ca/mac/TileCache.h (132523 => 132524)
--- trunk/Source/WebCore/platform/graphics/ca/mac/TileCache.h 2012-10-25 20:15:26 UTC (rev 132523)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/TileCache.h 2012-10-25 20:16:07 UTC (rev 132524)
@@ -87,6 +87,7 @@
virtual void setTileCoverage(TileCoverage) OVERRIDE;
virtual TileCoverage tileCoverage() const OVERRIDE { return m_tileCoverage; }
virtual void forceRepaint() OVERRIDE;
+ virtual IntSize tileSize() const OVERRIDE { return m_tileSize; }
virtual void setScrollingPerformanceLoggingEnabled(bool flag) OVERRIDE { m_scrollingPerformanceLoggingEnabled = flag; }
virtual bool scrollingPerformanceLoggingEnabled() const OVERRIDE { return m_scrollingPerformanceLoggingEnabled; }
