Diff
Modified: trunk/LayoutTests/ChangeLog (89510 => 89511)
--- trunk/LayoutTests/ChangeLog 2011-06-23 01:10:25 UTC (rev 89510)
+++ trunk/LayoutTests/ChangeLog 2011-06-23 01:15:41 UTC (rev 89511)
@@ -1,3 +1,18 @@
+2011-06-22 Matthew Delaney <[email protected]>
+
+ Reviewed by James Robinson.
+
+ Fixing test spanOverlapsCanvas.html to properly use layer tree text and rebaselining test off that for windows and mac.
+ https://bugs.webkit.org/show_bug.cgi?id=63190
+
+ * compositing/layer-creation/spanOverlapsCanvas-expected.txt: Copied from LayoutTests/platform/mac/compositing/layer-creation/spanOverlapsCanvas-expected.txt.
+ * compositing/layer-creation/spanOverlapsCanvas.html:
+ * platform/mac-snowleopard/compositing: Added.
+ * platform/mac-snowleopard/compositing/layer-creation: Added.
+ * platform/mac-snowleopard/compositing/layer-creation/spanOverlapsCanvas-expected.txt: Added.
+ * platform/mac/compositing/layer-creation/spanOverlapsCanvas-expected.txt: Removed.
+ * platform/win/compositing/layer-creation/spanOverlapsCanvas-expected.txt:
+
2011-06-22 Mark Pilgrim <[email protected]>
Reviewed by Adam Barth.
Copied: trunk/LayoutTests/compositing/layer-creation/spanOverlapsCanvas-expected.txt (from rev 89495, trunk/LayoutTests/platform/mac/compositing/layer-creation/spanOverlapsCanvas-expected.txt) (0 => 89511)
--- trunk/LayoutTests/compositing/layer-creation/spanOverlapsCanvas-expected.txt (rev 0)
+++ trunk/LayoutTests/compositing/layer-creation/spanOverlapsCanvas-expected.txt 2011-06-23 01:15:41 UTC (rev 89511)
@@ -0,0 +1,21 @@
+(GraphicsLayer
+ (bounds 800.00 600.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 800.00 600.00)
+ (children 2
+ (GraphicsLayer
+ (position 8.00 8.00)
+ (bounds 100.00 50.00)
+ (drawsContent 1)
+ )
+ (GraphicsLayer
+ (position 8.00 8.00)
+ (bounds 100.00 50.00)
+ (drawsContent 1)
+ )
+ )
+ )
+ )
+)
+
Modified: trunk/LayoutTests/compositing/layer-creation/spanOverlapsCanvas.html (89510 => 89511)
--- trunk/LayoutTests/compositing/layer-creation/spanOverlapsCanvas.html 2011-06-23 01:10:25 UTC (rev 89510)
+++ trunk/LayoutTests/compositing/layer-creation/spanOverlapsCanvas.html 2011-06-23 01:15:41 UTC (rev 89511)
@@ -5,26 +5,38 @@
<meta name="viewport" content="width=480"/>
<script>
- window.layoutTestController && window.layoutTestController.layerTreeAsText();
function init() {
var ctx = document.getElementById("world").getContext("2d");
ctx.fillStyle = "red";
ctx.fillRect(0,0,ctx.canvas.width,ctx.canvas.height);
+
+ if (window.layoutTestController) {
+ window.layoutTestController.dumpAsText(true);
+ var console = document.getElementById("layeroutput");
+ console.innerHTML = window.layoutTestController.layerTreeAsText();
+ }
}
</script>
<style>
- #headerbar {
+ #output
+ {
width: 100px;
height: 50px;
background-color: green;
position: absolute;
}
+ #layeroutput
+ {
+ position: absolute;
+ top: -100%;
+ }
</style>
</head>
<body _onLoad_="init()">
- <div id="headerbar"></div>
+ <pre id="layeroutput"></pre>
+ <div id="output"></div>
<canvas id="world" width="100" height="50"></canvas>
</body>
</html>
Deleted: trunk/LayoutTests/platform/mac/compositing/layer-creation/spanOverlapsCanvas-expected.txt (89510 => 89511)
--- trunk/LayoutTests/platform/mac/compositing/layer-creation/spanOverlapsCanvas-expected.txt 2011-06-23 01:10:25 UTC (rev 89510)
+++ trunk/LayoutTests/platform/mac/compositing/layer-creation/spanOverlapsCanvas-expected.txt 2011-06-23 01:15:41 UTC (rev 89511)
@@ -1,10 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x70
- RenderBlock {HTML} at (0,0) size 800x70
- RenderBody {BODY} at (8,8) size 784x54
- RenderText {#text} at (0,0) size 0x0
-layer at (8,8) size 100x50
- RenderHTMLCanvas {CANVAS} at (0,0) size 100x50
-layer at (8,8) size 100x50
- RenderBlock (positioned) {DIV} at (8,8) size 100x50 [bgcolor=#008000]
Added: trunk/LayoutTests/platform/mac-snowleopard/compositing/layer-creation/spanOverlapsCanvas-expected.txt (0 => 89511)
--- trunk/LayoutTests/platform/mac-snowleopard/compositing/layer-creation/spanOverlapsCanvas-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-snowleopard/compositing/layer-creation/spanOverlapsCanvas-expected.txt 2011-06-23 01:15:41 UTC (rev 89511)
@@ -0,0 +1 @@
+
Modified: trunk/LayoutTests/platform/win/compositing/layer-creation/spanOverlapsCanvas-expected.txt (89510 => 89511)
--- trunk/LayoutTests/platform/win/compositing/layer-creation/spanOverlapsCanvas-expected.txt 2011-06-23 01:10:25 UTC (rev 89510)
+++ trunk/LayoutTests/platform/win/compositing/layer-creation/spanOverlapsCanvas-expected.txt 2011-06-23 01:15:41 UTC (rev 89511)
@@ -1,9 +1 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x70
- RenderBlock {HTML} at (0,0) size 800x70
- RenderBody {BODY} at (8,8) size 784x54
- RenderHTMLCanvas {CANVAS} at (0,0) size 100x50
- RenderText {#text} at (0,0) size 0x0
-layer at (8,8) size 100x50
- RenderBlock (positioned) {DIV} at (8,8) size 100x50 [bgcolor=#008000]
+
