| Index: LayoutTests/css3/flexbox/display-flexbox-set-get.html
|
| diff --git a/LayoutTests/css3/flexbox/display-flexbox-set-get.html b/LayoutTests/css3/flexbox/display-flexbox-set-get.html
|
| index 61f7b64dec749d86fbe7db9380edb514246235c5..af8cf5c70908c225e39567ae6ec5d0b3f7222f46 100755
|
| --- a/LayoutTests/css3/flexbox/display-flexbox-set-get.html
|
| +++ b/LayoutTests/css3/flexbox/display-flexbox-set-get.html
|
| @@ -1,37 +1,38 @@
|
| <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
|
| <html>
|
| <head>
|
| -<style>
|
| -.flexbox { display: -webkit-flex; }
|
| -.flexboxInline { display: -webkit-inline-flex; }
|
| -</style>
|
| +<link href="resources/flexbox.css" rel="stylesheet">
|
| <script src="../../fast/js/resources/js-test-pre.js"></script>
|
| </head>
|
| <body>
|
| <div class="flexbox" id="flexbox"></div>
|
| -<div class="flexboxInline" id="flexboxInline"></div>
|
| +<div class="inline-flexbox" id="flexboxInline"></div>
|
| <script>
|
| -description('Test that setting and getting display: -webkit-flex and -webkit-inline-flex works as expected');
|
| +description('Test that setting and getting display: flex and inline-flex works as expected');
|
|
|
| debug("Test getting |display| set through CSS");
|
| var flexboxElement = document.getElementById("flexbox");
|
| -shouldBe("getComputedStyle(flexboxElement, '').getPropertyValue('display')", "'-webkit-flex'");
|
| +shouldBe("getComputedStyle(flexboxElement, '').getPropertyValue('display')", "'flex'");
|
| var inlineFlexboxElement = document.getElementById("flexboxInline");
|
| -shouldBe("getComputedStyle(inlineFlexboxElement, '').getPropertyValue('display')", "'-webkit-inline-flex'");
|
| +shouldBe("getComputedStyle(inlineFlexboxElement, '').getPropertyValue('display')", "'inline-flex'");
|
|
|
| debug("");
|
| debug("Test getting and setting display through JS");
|
| var element = document.createElement("div");
|
| document.body.appendChild(element);
|
| shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'block'");
|
| -element.style.display = "-webkit-flex";
|
| -shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'-webkit-flex'");
|
| +element.style.display = "flex";
|
| +shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'flex'");
|
|
|
| element = document.createElement("div");
|
| document.body.appendChild(element);
|
| shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'block'");
|
| +element.style.display = "inline-flex";
|
| +shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'inline-flex'");
|
| +element.style.display = "-webkit-flex";
|
| +shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'flex'");
|
| element.style.display = "-webkit-inline-flex";
|
| -shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'-webkit-inline-flex'");
|
| +shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'inline-flex'");
|
| </script>
|
| <script src="../../fast/js/resources/js-test-post.js"></script>
|
| </body>
|
|
|
Chromium Code Reviews
