LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set.html - Issue 14493016: Fix handling of 'inherit' and 'initial' for grid lines

Side by Side Diff: LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set.html

Issue 14493016: Fix handling of 'inherit' and 'initial' for grid lines (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Take 2: Forgot the code Created 7 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set-expected.txt ('k') | LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set-expected.txt » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <!DOCTYPE html>	1 <!DOCTYPE html>

2 <html>	2 <html>

3 <head>	3 <head>

4 <script>	4 <script>

5 if (window.testRunner)	5 if (window.testRunner)

6 testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);	6 testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);

7 </script>	7 </script>

8 <style>	8 <style>

9 .gridItemWithPositiveInteger {	9 .gridItemWithPositiveInteger {

10 -webkit-grid-end: 10;	10 -webkit-grid-end: 10;

(...skipping 54 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
65 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') ", "'auto / auto'");	65 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') ", "'auto / auto'");

66	66

67 debug("");	67 debug("");

68 debug("Test getting and setting grid-end and grid-after through JS");	68 debug("Test getting and setting grid-end and grid-after through JS");

69 testEndAfterJSParsing("18", "66");	69 testEndAfterJSParsing("18", "66");

70 testEndAfterJSParsing("-55", "-40");	70 testEndAfterJSParsing("-55", "-40");

71 testEndAfterJSParsing("span 7", "span 2");	71 testEndAfterJSParsing("span 7", "span 2");

72 testEndAfterJSParsing("auto", "auto");	72 testEndAfterJSParsing("auto", "auto");

73	73

74 debug("");	74 debug("");

	75 debug("Test setting grid-start and grid-before to 'inherit' through JS");

	76 testEndAfterInheritJSParsing("inherit", "18");

	77 testEndAfterInheritJSParsing("2", "inherit");

	78 testEndAfterInheritJSParsing("inherit", "inherit");

	79

	80 debug("");

	81 debug("Test setting grid-start and grid-before to 'initial' through JS");

	82 testEndAfterInitialJSParsing();

	83

	84 debug("");

75 debug("Test setting grid-end and grid-after back to 'auto' through JS");	85 debug("Test setting grid-end and grid-after back to 'auto' through JS");

76 element.style.webkitGridEnd = "18";	86 element.style.webkitGridEnd = "18";

77 element.style.webkitGridAfter = "66";	87 element.style.webkitGridAfter = "66";

78 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end') ", "'18'");	88 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end') ", "'18'");

79 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-colum n')", "'auto / 18'");	89 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-colum n')", "'auto / 18'");

80 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after ')", "'66'");	90 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after ')", "'66'");

81 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') ", "'auto / 66'");	91 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') ", "'auto / 66'");

82 element.style.webkitGridEnd = "auto";	92 element.style.webkitGridEnd = "auto";

83 element.style.webkitGridAfter = "auto";	93 element.style.webkitGridAfter = "auto";

84 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end') ", "'auto'");	94 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end') ", "'auto'");

85 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-colum n')", "'auto / auto'");	95 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-colum n')", "'auto / auto'");

86 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after ')", "'auto'");	96 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after ')", "'auto'");

87 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') ", "'auto / auto'");	97 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') ", "'auto / auto'");

88 </script>	98 </script>

89 <script src="../js/resources/js-test-post.js"></script>	99 <script src="../js/resources/js-test-post.js"></script>

90 </body>	100 </body>

91 </html>	101 </html>

OLD	NEW