LayoutTests/css3/flexbox/display-flexbox-set-get.html - Issue 17836006: Merge 153078 "Unprefix Flexbox"

Unified Diff: LayoutTests/css3/flexbox/display-flexbox-set-get.html

Issue 17836006: Merge 153078 "Unprefix Flexbox" (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/1547/

Patch Set: Created 7 years, 6 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 side-by-side diff with in-line comments

Download patch

Index: LayoutTests/css3/flexbox/display-flexbox-set-get.html

===================================================================

--- LayoutTests/css3/flexbox/display-flexbox-set-get.html (revision 153087)

+++ LayoutTests/css3/flexbox/display-flexbox-set-get.html (working copy)

@@ -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">

</head>

<body>

-<div class="flexboxInline" id="flexboxInline"></div>

+<div class="inline-flexbox" id="flexboxInline"></div>

-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>

</body>

« no previous file with comments | « no previous file | LayoutTests/css3/flexbox/display-flexbox-set-get-expected.txt » ('j') | no next file with comments »