Title: [211152] trunk/LayoutTests
- Revision
- 211152
- Author
- [email protected]
- Date
- 2017-01-25 10:00:49 -0800 (Wed, 25 Jan 2017)
Log Message
Revert r210882, removing support for background-repeat-x/y
https://bugs.webkit.org/show_bug.cgi?id=167223
Reviewed by Myles Maxfield.
Fix the layout tests.
fast/backgrounds/background-repeat-x-y.html was mistakenly removed in r211060 so
remove its expected. Fix the parsing test.
* fast/backgrounds/background-repeat-x-y-expected.html: Removed.
* fast/backgrounds/background-repeat-x-y-parse-expected.txt:
* fast/backgrounds/background-repeat-x-y-parse.html:
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (211151 => 211152)
--- trunk/LayoutTests/ChangeLog 2017-01-25 17:51:13 UTC (rev 211151)
+++ trunk/LayoutTests/ChangeLog 2017-01-25 18:00:49 UTC (rev 211152)
@@ -5,6 +5,22 @@
Reviewed by Myles Maxfield.
+ Fix the layout tests.
+
+ fast/backgrounds/background-repeat-x-y.html was mistakenly removed in r211060 so
+ remove its expected. Fix the parsing test.
+
+ * fast/backgrounds/background-repeat-x-y-expected.html: Removed.
+ * fast/backgrounds/background-repeat-x-y-parse-expected.txt:
+ * fast/backgrounds/background-repeat-x-y-parse.html:
+
+2017-01-25 Simon Fraser <[email protected]>
+
+ Revert r210882, removing support for background-repeat-x/y
+ https://bugs.webkit.org/show_bug.cgi?id=167223
+
+ Reviewed by Myles Maxfield.
+
Modify the test to check that background-repeat-x and background-repeat-y are not parsed.
* fast/backgrounds/background-repeat-x-y-parse-expected.txt:
Deleted: trunk/LayoutTests/fast/backgrounds/background-repeat-x-y-expected.html (211151 => 211152)
--- trunk/LayoutTests/fast/backgrounds/background-repeat-x-y-expected.html 2017-01-25 17:51:13 UTC (rev 211151)
+++ trunk/LayoutTests/fast/backgrounds/background-repeat-x-y-expected.html 2017-01-25 18:00:49 UTC (rev 211152)
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-div {
- display: inline-block;
- width: 150px;
- height: 150px;
- background-image: url('resources/map.jpg');
- background-position: top left;
-}
-</style>
-</head>
-<body>
-<p>This makes sure that background-repeat-x and background-repeat-y are rendered as expected.</p>
-<div style="background-repeat: repeat; border: 1px solid black;"></div>
-<div style="background-repeat: repeat-y; border: 1px solid black;"></div>
-<div style="background-repeat: repeat; border: 1px solid black;"></div>
-<div style="background-repeat: repeat-x; border: 1px solid black;"></div>
-<div style="background-repeat: no-repeat; border: 1px solid black;"></div>
-<div style="background-repeat: no-repeat; border: 1px solid black;"></div>
-<div style="background-repeat: no-repeat;border: 1px solid black;"></div>
-<div style="background-repeat: repeat-x; border: 1px solid black;"></div>
-<div style="background-repeat: repeat-y; border: 1px solid black;"></div>
-<div style="background-repeat: repeat; border: 1px solid black;"></div>
-</body>
-</html>
\ No newline at end of file
Modified: trunk/LayoutTests/fast/backgrounds/background-repeat-x-y-parse-expected.txt (211151 => 211152)
--- trunk/LayoutTests/fast/backgrounds/background-repeat-x-y-parse-expected.txt 2017-01-25 17:51:13 UTC (rev 211151)
+++ trunk/LayoutTests/fast/backgrounds/background-repeat-x-y-parse-expected.txt 2017-01-25 18:00:49 UTC (rev 211152)
@@ -1,14 +1,13 @@
+This test checks that background-repeat-x/y are not parsed
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
PASS window.getComputedStyle(document.getElementById('test1')).getPropertyValue('background-repeat') is "repeat"
-PASS window.getComputedStyle(document.getElementById('test2')).getPropertyValue('background-repeat') is "repeat-y"
-PASS window.getComputedStyle(document.getElementById('test3')).getPropertyValue('background-repeat') is "repeat"
+PASS window.getComputedStyle(document.getElementById('test2')).getPropertyValue('background-repeat') is "repeat"
+PASS window.getComputedStyle(document.getElementById('test3')).getPropertyValue('background-repeat') is "repeat-y"
PASS window.getComputedStyle(document.getElementById('test4')).getPropertyValue('background-repeat') is "repeat-x"
-PASS window.getComputedStyle(document.getElementById('test5')).getPropertyValue('background-repeat') is "no-repeat"
-PASS window.getComputedStyle(document.getElementById('test6')).getPropertyValue('background-repeat') is "no-repeat"
-PASS window.getComputedStyle(document.getElementById('test7')).getPropertyValue('background-repeat') is "no-repeat"
-PASS window.getComputedStyle(document.getElementById('test8')).getPropertyValue('background-repeat') is "repeat-x"
-PASS window.getComputedStyle(document.getElementById('test9')).getPropertyValue('background-repeat') is "repeat-y"
-PASS window.getComputedStyle(document.getElementById('test10')).getPropertyValue('background-repeat') is "repeat"
PASS successfullyParsed is true
TEST COMPLETE
-
+
Modified: trunk/LayoutTests/fast/backgrounds/background-repeat-x-y-parse.html (211151 => 211152)
--- trunk/LayoutTests/fast/backgrounds/background-repeat-x-y-parse.html 2017-01-25 17:51:13 UTC (rev 211151)
+++ trunk/LayoutTests/fast/backgrounds/background-repeat-x-y-parse.html 2017-01-25 18:00:49 UTC (rev 211152)
@@ -3,37 +3,28 @@
<head>
<style>
.test {
- display: inline-block;
- width: 150px;
- height: 150px;
- background-image: url('resources/map.jpg');
- background-position: top left;
+ display: inline-block;
+ width: 150px;
+ height: 150px;
+ background-image: url('resources/map.jpg');
+ background-position: top left;
+ border: 1px solid black;
}
</style>
<script src=""
</head>
<body>
-<div id="test1" class="test" style="background-repeat-x: repeat; border: 1px solid black;"></div>
-<div id="test2" class="test" style="background-repeat-x: no-repeat; border: 1px solid black;"></div>
-<div id="test3" class="test" style="background-repeat-y: repeat; border: 1px solid black;"></div>
-<div id="test4" class="test" style="background-repeat-y: no-repeat; border: 1px solid black;"></div>
-<div id="test5" class="test" style="background-repeat-x: no-repeat; background-repeat-y: no-repeat; border: 1px solid black;"></div>
-<div id="test6" class="test" style="background-repeat: repeat-y; background-repeat-y: no-repeat; border: 1px solid black;"></div>
-<div id="test7" class="test" style="background-repeat: repeat-x; background-repeat-x: no-repeat; border: 1px solid black;"></div>
-<div id="test8" class="test" style="background-repeat-x: no-repeat; background-repeat: repeat-x; border: 1px solid black;"></div>
-<div id="test9" class="test" style="background-repeat-y: no-repeat; background-repeat: repeat-y; border: 1px solid black;"></div>
-<div id="test10" class="test" style="background-repeat-x: garbage; border: 1px solid black;"></div>
+<div id="test1" class="test" style="background-repeat-y: no-repeat;"></div>
+<div id="test2" class="test" style="background-repeat-x: no-repeat; background-repeat-y: no-repeat;"></div>
+<div id="test3" class="test" style="background-repeat: repeat-y; background-repeat-y: no-repeat;"></div>
+<div id="test4" class="test" style="background-repeat: repeat-x; background-repeat-x: no-repeat;"></div>
<script>
+description("This test checks that background-repeat-x/y are not parsed");
+
shouldBeEqualToString("window.getComputedStyle(document.getElementById('test1')).getPropertyValue('background-repeat')", "repeat");
-shouldBeEqualToString("window.getComputedStyle(document.getElementById('test2')).getPropertyValue('background-repeat')", "repeat-y");
-shouldBeEqualToString("window.getComputedStyle(document.getElementById('test3')).getPropertyValue('background-repeat')", "repeat");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test2')).getPropertyValue('background-repeat')", "repeat");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test3')).getPropertyValue('background-repeat')", "repeat-y");
shouldBeEqualToString("window.getComputedStyle(document.getElementById('test4')).getPropertyValue('background-repeat')", "repeat-x");
-shouldBeEqualToString("window.getComputedStyle(document.getElementById('test5')).getPropertyValue('background-repeat')", "no-repeat");
-shouldBeEqualToString("window.getComputedStyle(document.getElementById('test6')).getPropertyValue('background-repeat')", "no-repeat");
-shouldBeEqualToString("window.getComputedStyle(document.getElementById('test7')).getPropertyValue('background-repeat')", "no-repeat");
-shouldBeEqualToString("window.getComputedStyle(document.getElementById('test8')).getPropertyValue('background-repeat')", "repeat-x");
-shouldBeEqualToString("window.getComputedStyle(document.getElementById('test9')).getPropertyValue('background-repeat')", "repeat-y");
-shouldBeEqualToString("window.getComputedStyle(document.getElementById('test10')).getPropertyValue('background-repeat')", "repeat");
</script>
<script src=""
</body>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
