Diff
Modified: trunk/LayoutTests/ChangeLog (174556 => 174557)
--- trunk/LayoutTests/ChangeLog 2014-10-10 03:50:55 UTC (rev 174556)
+++ trunk/LayoutTests/ChangeLog 2014-10-10 03:57:14 UTC (rev 174557)
@@ -1,5 +1,18 @@
2014-10-09 Simon Fraser <[email protected]>
+ Rename some tests that oddly had -html.html suffixes.
+
+ * platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-background-composited-expected.html: Renamed from LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-background-composited-html-expected.html.
+ * platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-background-composited.html: Renamed from LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-background-composited-html.html.
+ * platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-opacity-expected.png: Renamed from LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-opacity-html-expected.png.
+ * platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-opacity-expected.txt: Renamed from LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-opacity-html-expected.txt.
+ * platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-opacity.html: Renamed from LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-opacity-html.html.
+ * platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-transformed-expected.png: Renamed from LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-transformed-html-expected.png.
+ * platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-transformed-expected.txt: Renamed from LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-transformed-html-expected.txt.
+ * platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-transformed.html: Renamed from LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-transformed-html.html.
+
+2014-10-09 Simon Fraser <[email protected]>
+
Tweak some Mac test expectations.
* platform/mac-wk2/TestExpectations:
Copied: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-background-composited-expected.html (from rev 174556, trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-background-composited-html-expected.html) (0 => 174557)
--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-background-composited-expected.html (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-background-composited-expected.html 2014-10-10 03:57:14 UTC (rev 174557)
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ html {
+ -webkit-transform: translateZ(0);
+ }
+ body {
+ height: 2000px;
+ background-image: url('../../../../compositing/resources/simple_image.png');
+ background-size: 200px 200px;
+ background-attachment: fixed;
+ overflow: hidden; /* hide scrollbar */
+ }
+ </style>
+</head>
+<body>
+</body>
+</html>
Deleted: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-background-composited-html-expected.html (174556 => 174557)
--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-background-composited-html-expected.html 2014-10-10 03:50:55 UTC (rev 174556)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-background-composited-html-expected.html 2014-10-10 03:57:14 UTC (rev 174557)
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
- <style>
- html {
- -webkit-transform: translateZ(0);
- }
- body {
- height: 2000px;
- background-image: url('../../../../compositing/resources/simple_image.png');
- background-size: 200px 200px;
- background-attachment: fixed;
- overflow: hidden; /* hide scrollbar */
- }
- </style>
-</head>
-<body>
-</body>
-</html>
Deleted: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-background-composited-html.html (174556 => 174557)
--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-background-composited-html.html 2014-10-10 03:50:55 UTC (rev 174556)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-background-composited-html.html 2014-10-10 03:57:14 UTC (rev 174557)
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
- <style>
- html {
- -webkit-transform: translateZ(0);
- }
- body {
- height: 2000px;
- background-image: url('../../../../compositing/resources/simple_image.png');
- background-size: 200px 200px;
- background-attachment: fixed;
- overflow: hidden; /* hide scrollbar */
- }
- </style>
- <script>
- if (window.testRunner)
- testRunner.waitUntilDone();
-
- function doTest()
- {
- window.setTimeout(function() {
- window.scrollTo(0, 223);
- if (window.testRunner)
- testRunner.notifyDone();
- }, 0);
- }
-
- window.addEventListener('load', doTest, false);
- </script>
-</head>
-<body>
-</body>
-</html>
Copied: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-background-composited.html (from rev 174556, trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-background-composited-html.html) (0 => 174557)
--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-background-composited.html (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-background-composited.html 2014-10-10 03:57:14 UTC (rev 174557)
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ html {
+ -webkit-transform: translateZ(0);
+ }
+ body {
+ height: 2000px;
+ background-image: url('../../../../compositing/resources/simple_image.png');
+ background-size: 200px 200px;
+ background-attachment: fixed;
+ overflow: hidden; /* hide scrollbar */
+ }
+ </style>
+ <script>
+ if (window.testRunner)
+ testRunner.waitUntilDone();
+
+ function doTest()
+ {
+ window.setTimeout(function() {
+ window.scrollTo(0, 223);
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }, 0);
+ }
+
+ window.addEventListener('load', doTest, false);
+ </script>
+</head>
+<body>
+</body>
+</html>
Copied: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-opacity-expected.png (from rev 174556, trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-opacity-html-expected.png)
(Binary files differ)
Property changes: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-opacity-expected.png
Added: svn:mime-type
Copied: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-opacity-expected.txt (from rev 174556, trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-opacity-html-expected.txt) (0 => 174557)
--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-opacity-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-opacity-expected.txt 2014-10-10 03:57:14 UTC (rev 174557)
@@ -0,0 +1,26 @@
+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 785.00 1700.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 785.00 1700.00)
+ (children 2
+ (GraphicsLayer
+ (position 0.00 200.00)
+ (anchor 0.00 0.00)
+ (bounds 785.00 600.00)
+ (contentsOpaque 1)
+ (drawsContent 1)
+ (backgroundColor #FFFFFF)
+ )
+ (GraphicsLayer
+ (bounds 785.00 1700.00)
+ (tile cache coverage 0, 0 785 x 1024)
+ (tile size 512 x 512)
+ (top left tile 0, 0 tiles grid 2 x 2)
+ )
+ )
+ )
+ )
+)
+
Deleted: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-opacity-html-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-opacity-html-expected.txt (174556 => 174557)
--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-opacity-html-expected.txt 2014-10-10 03:50:55 UTC (rev 174556)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-opacity-html-expected.txt 2014-10-10 03:57:14 UTC (rev 174557)
@@ -1,26 +0,0 @@
-(GraphicsLayer
- (anchor 0.00 0.00)
- (bounds 785.00 1700.00)
- (children 1
- (GraphicsLayer
- (bounds 785.00 1700.00)
- (children 2
- (GraphicsLayer
- (position 0.00 200.00)
- (anchor 0.00 0.00)
- (bounds 785.00 600.00)
- (contentsOpaque 1)
- (drawsContent 1)
- (backgroundColor #FFFFFF)
- )
- (GraphicsLayer
- (bounds 785.00 1700.00)
- (tile cache coverage 0, 0 785 x 1024)
- (tile size 512 x 512)
- (top left tile 0, 0 tiles grid 2 x 2)
- )
- )
- )
- )
-)
-
Deleted: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-opacity-html.html (174556 => 174557)
--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-opacity-html.html 2014-10-10 03:50:55 UTC (rev 174556)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-opacity-html.html 2014-10-10 03:57:14 UTC (rev 174557)
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
- <style>
- html {
- opacity: 0.5;
- }
- body {
- margin: 100px;
- height: 1500px;
- background-image: url('../../../../compositing/resources/simple_image.png');
- background-size: 200px 200px;
- background-attachment: fixed;
- }
-
- .test {
- height: 400px;
- width: 600px;
- background-color: rgba(0, 0, 0, 0.5);
- border: 20px solid orange;
- }
-
- #layers {
- opacity: 0;
- }
- </style>
- <script>
- if (window.testRunner)
- testRunner.dumpAsText(true);
-
- function doTest()
- {
- window.scrollTo(0, 200);
-
- if (window.internals)
- document.getElementById('layers').innerText = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_TILE_CACHES);
- }
-
- window.addEventListener('load', doTest, false);
- </script>
-</head>
-<body>
-
- <div class="test"></div>
-<pre id="layers"></pre>
-</body>
-</html>
Copied: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-opacity.html (from rev 174556, trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-opacity-html.html) (0 => 174557)
--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-opacity.html (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-opacity.html 2014-10-10 03:57:14 UTC (rev 174557)
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ html {
+ opacity: 0.5;
+ }
+ body {
+ margin: 100px;
+ height: 1500px;
+ background-image: url('../../../../compositing/resources/simple_image.png');
+ background-size: 200px 200px;
+ background-attachment: fixed;
+ }
+
+ .test {
+ height: 400px;
+ width: 600px;
+ background-color: rgba(0, 0, 0, 0.5);
+ border: 20px solid orange;
+ }
+
+ #layers {
+ opacity: 0;
+ }
+ </style>
+ <script>
+ if (window.testRunner)
+ testRunner.dumpAsText(true);
+
+ function doTest()
+ {
+ window.scrollTo(0, 200);
+
+ if (window.internals)
+ document.getElementById('layers').innerText = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_TILE_CACHES);
+ }
+
+ window.addEventListener('load', doTest, false);
+ </script>
+</head>
+<body>
+
+ <div class="test"></div>
+<pre id="layers"></pre>
+</body>
+</html>
Copied: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-transformed-expected.png (from rev 174556, trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-transformed-html-expected.png)
(Binary files differ)
Property changes: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-transformed-expected.png
Added: svn:mime-type
Copied: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-transformed-expected.txt (from rev 174556, trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-transformed-html-expected.txt) (0 => 174557)
--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-transformed-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-transformed-expected.txt 2014-10-10 03:57:14 UTC (rev 174557)
@@ -0,0 +1,26 @@
+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 795.00 1710.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 795.00 1710.00)
+ (children 2
+ (GraphicsLayer
+ (position 0.00 200.00)
+ (anchor 0.00 0.00)
+ (bounds 785.00 585.00)
+ (contentsOpaque 1)
+ (drawsContent 1)
+ (backgroundColor #FFFFFF)
+ )
+ (GraphicsLayer
+ (bounds 795.00 1710.00)
+ (tile cache coverage 0, 0 795 x 1024)
+ (tile size 512 x 512)
+ (top left tile 0, 0 tiles grid 2 x 2)
+ )
+ )
+ )
+ )
+)
+
Deleted: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-transformed-html-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-transformed-html-expected.txt (174556 => 174557)
--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-transformed-html-expected.txt 2014-10-10 03:50:55 UTC (rev 174556)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-transformed-html-expected.txt 2014-10-10 03:57:14 UTC (rev 174557)
@@ -1,26 +0,0 @@
-(GraphicsLayer
- (anchor 0.00 0.00)
- (bounds 795.00 1710.00)
- (children 1
- (GraphicsLayer
- (bounds 795.00 1710.00)
- (children 2
- (GraphicsLayer
- (position 0.00 200.00)
- (anchor 0.00 0.00)
- (bounds 785.00 585.00)
- (contentsOpaque 1)
- (drawsContent 1)
- (backgroundColor #FFFFFF)
- )
- (GraphicsLayer
- (bounds 795.00 1710.00)
- (tile cache coverage 0, 0 795 x 1024)
- (tile size 512 x 512)
- (top left tile 0, 0 tiles grid 2 x 2)
- )
- )
- )
- )
-)
-
Deleted: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-transformed-html.html (174556 => 174557)
--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-transformed-html.html 2014-10-10 03:50:55 UTC (rev 174556)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-transformed-html.html 2014-10-10 03:57:14 UTC (rev 174557)
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
- <style>
- html {
- -webkit-transform: translate(10px, 10px);
- }
- body {
- margin: 100px;
- height: 1500px;
- background-image: url('../../../../compositing/resources/simple_image.png');
- background-size: 200px 200px;
- background-attachment: fixed;
- }
-
- .test {
- height: 400px;
- width: 600px;
- background-color: rgba(0, 0, 0, 0.5);
- border: 20px solid orange;
- }
-
- #layers {
- opacity: 0;
- }
- </style>
- <script>
- if (window.testRunner)
- testRunner.dumpAsText(true);
-
- function doTest()
- {
- window.scrollTo(0, 200);
-
- if (window.internals)
- document.getElementById('layers').innerText = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_TILE_CACHES);
- }
-
- window.addEventListener('load', doTest, false);
- </script>
-</head>
-<body>
-
- <div class="test"></div>
-<pre id="layers"></pre>
-</body>
-</html>
Copied: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-transformed.html (from rev 174556, trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-transformed-html.html) (0 => 174557)
--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-transformed.html (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed-background/fixed-body-background-transformed.html 2014-10-10 03:57:14 UTC (rev 174557)
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ html {
+ -webkit-transform: translate(10px, 10px);
+ }
+ body {
+ margin: 100px;
+ height: 1500px;
+ background-image: url('../../../../compositing/resources/simple_image.png');
+ background-size: 200px 200px;
+ background-attachment: fixed;
+ }
+
+ .test {
+ height: 400px;
+ width: 600px;
+ background-color: rgba(0, 0, 0, 0.5);
+ border: 20px solid orange;
+ }
+
+ #layers {
+ opacity: 0;
+ }
+ </style>
+ <script>
+ if (window.testRunner)
+ testRunner.dumpAsText(true);
+
+ function doTest()
+ {
+ window.scrollTo(0, 200);
+
+ if (window.internals)
+ document.getElementById('layers').innerText = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_TILE_CACHES);
+ }
+
+ window.addEventListener('load', doTest, false);
+ </script>
+</head>
+<body>
+
+ <div class="test"></div>
+<pre id="layers"></pre>
+</body>
+</html>
