+2014-10-31 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ Remove webkit prefix from CSS columns.
+ https://bugs.webkit.org/show_bug.cgi?id=137132.
+
+ Reviewed by Dean Jackson.
+
+ Ensure the CSS un-prefixed column properties are behaving the same way as the
+ prefixed ones. The CSS prefixed column properties are still supported by making
+ them aliases of the un-prefixed ones. Also port some of the W3C and Mozilla
+ tests for css column properties tests.
+
+ Change to the un-prefixed column names to be compared with the return of CSSStyleDeclaration.item().
+ And change the expected names to be the un-prefixed ones also.
+ * fast/css/getComputedStyle/computed-style-expected.txt:
+ * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
+ * fast/css/getComputedStyle/resources/property-names.js:
+
+ Change to the un-prefixed column names and compare them with the return of object.style.cssText().
+ * fast/css/remove-shorthand-expected.txt:
+
+ Test for the effect of the rtl settings on column flow; it is ported from Mozilla.
+ * fast/multicol/column-box-alignment-rtl-expected.html: Added.
+ * fast/multicol/column-box-alignment-rtl.html: Added.
+
+ Ensure the prefixed and the un-prefixed column properties are behaving exactly the same.
+ * fast/multicol/multicol-aliases-expected.html: Added.
+ * fast/multicol/multicol-aliases.html: Added.
+
+ Change to the un-prefixed column names to be compared with the return of CSSStyleDeclaration.item().
+ * svg/css/getComputedStyle-basic-expected.txt:
+
+ Remove the use of the un-prefixed columns property since it seems unrelated to the test.
+ * svg/custom/svg-fonts-in-html.html:
+
2014-10-31 Eric Carlson <eric.carlson@apple.com>
Clean-up use of boolean attributes in media tests
-webkit-column-break-before: auto;
-webkit-column-break-inside: auto;
-webkit-column-axis: auto;
--webkit-column-count: auto;
--webkit-column-gap: normal;
--webkit-column-rule-color: rgb(0, 0, 0);
--webkit-column-rule-style: none;
--webkit-column-rule-width: 0px;
--webkit-column-span: none;
--webkit-column-width: auto;
+column-count: auto;
+column-gap: normal;
+column-rule-color: rgb(0, 0, 0);
+column-rule-style: none;
+column-rule-width: 0px;
+column-span: none;
+column-width: auto;
align-content: stretch;
align-items: stretch;
align-self: stretch;
-webkit-column-break-before: auto
-webkit-column-break-inside: auto
-webkit-column-axis: auto
--webkit-column-count: auto
--webkit-column-gap: normal
--webkit-column-rule-color: rgb(0, 0, 0)
--webkit-column-rule-style: none
--webkit-column-rule-width: 0px
--webkit-column-span: none
--webkit-column-width: auto
+column-count: auto
+column-gap: normal
+column-rule-color: rgb(0, 0, 0)
+column-rule-style: none
+column-rule-width: 0px
+column-span: none
+column-width: auto
align-content: stretch
align-items: stretch
align-self: stretch
"-webkit-column-break-after": true,
"-webkit-column-break-before": true,
"-webkit-column-break-inside": true,
- "-webkit-column-count": true,
- "-webkit-column-gap": true,
- "-webkit-column-rule-color": true,
- "-webkit-column-rule-style": true,
- "-webkit-column-rule-width": true,
- "-webkit-column-span": true,
- "-webkit-column-width": true,
+ "column-count": true,
+ "column-gap": true,
+ "column-rule-color": true,
+ "column-rule-style": true,
+ "column-rule-width": true,
+ "column-span": true,
+ "column-width": true,
"flex-direction": true,
"flex-wrap": true,
"-webkit-font-kerning": true,
removes "border-spacing"
and adds "".
Removing -webkit-columns
-removes "-webkit-column-width, -webkit-column-count"
+removes "column-width, column-count"
and adds "".
Removing -webkit-column-rule
-removes "-webkit-column-rule-width, -webkit-column-rule-style, -webkit-column-rule-color"
+removes "column-rule-width, column-rule-style, column-rule-color"
and adds "".
Removing list-style
removes "list-style-type, list-style-position, list-style-image"
--- /dev/null
+<!doctype html>
+</html>
+<head>
+ <style>
+ * {
+ margin: 0;
+ padding: 0;
+ }
+ div {
+ column-gap: 0;
+ column-width: 20em;
+ column-progression: reverse;
+ width: 40em;
+ }
+ /* cosmetics */
+ div {
+ border: 1px solid;
+ }
+ p {
+ direction: rtl;
+ text-align: right;
+ }
+ </style>
+</head>
+<body>
+ <div>
+ <p>1st column</p>
+ <p>2nd column</p>
+ </div>
+</body>
+</html>
\ No newline at end of file
--- /dev/null
+<!doctype html>
+</html>
+<head>
+ <style>
+ * {
+ margin: 0;
+ padding: 0;
+ }
+ div {
+ column-gap: 0;
+ column-width: 20em;
+ direction: rtl;
+ text-align: right;
+ width: 40em;
+ }
+ /* cosmetics */
+ div {
+ border: 1px solid;
+ }
+ </style>
+</head>
+<body>
+ <div>
+ <p>1st column</p>
+ <p>2nd column</p>
+ </div>
+</body>
+</html>
\ No newline at end of file
--- /dev/null
+<!DOCTYPE html>
+<html>
+<head>
+ <style>
+ .multicol-wrapper>* {
+ font: 20px/1 Ahem, sans-serif;
+ }
+ div.multicol-wrapper {
+ border: thin solid black;
+ display: inline-block;
+ margin: 1em auto;
+ width: 360px;
+ }
+ .multicol-basic-ref {
+ background: yellow;
+ width: 360px;
+ }
+ .multicol-count-ref {
+ -webkit-column-count: 3;
+ -webkit-column-gap: 0;
+ -webkit-column-rule: none;
+ }
+ .multicol-columns-ref {
+ -webkit-columns: 3;
+ -webkit-column-gap: 0;
+ -webkit-column-rule: thin solid green;
+ }
+ .multicol-rule-ref {
+ -webkit-column-count: 3;
+ -webkit-column-gap: 0;
+ -webkit-column-rule-width: thin;
+ -webkit-column-rule-style: solid;
+ -webkit-column-rule-color: green;
+ }
+ .multicol-fill-balance-ref {
+ -webkit-columns: 3;
+ -webkit-column-gap: 0;
+ -webkit-column-rule: none;
+ -webkit-column-fill: balance;
+ height: 6em;
+ }
+ .multicol-fill-auto-ref {
+ -webkit-column-count: 3;
+ -webkit-column-gap: 0;
+ -webkit-column-fill: auto;
+ height: 6em;
+ }
+ .multicol-progression-reverse-ref {
+ -webkit-column-count: 3;
+ -webkit-column-gap: 0;
+ -webkit-column-rule: none;
+ -webkit-column-progression: reverse;
+ }
+ .multicol-basic-ref-item {
+ background: #000;
+ }
+ .item-1 {
+ background: purple;
+ color: purple;
+ }
+ .item-2 {
+ background: orange;
+ color: orange;
+ }
+ .item-3 {
+ background: blue;
+ color: blue;
+ }
+ </style>
+ <script>
+ function appendText() {
+ var arrayWrapper = [
+ "multicol-basic-ref multicol-count-ref",
+ "multicol-basic-ref multicol-columns-ref",
+ "multicol-basic-ref multicol-rule-ref",
+ "multicol-basic-ref multicol-fill-balance-ref",
+ "multicol-basic-ref multicol-fill-auto-ref",
+ "multicol-basic-ref multicol-progression-reverse-ref"
+ ];
+
+ var arrayMulticol = [
+ "multicol-basic-ref-item item-1",
+ "multicol-basic-ref-item item-2",
+ "multicol-basic-ref-item item-3",
+ ];
+
+ var text = "XXXX XXXX XXXX XXXX XXXX XXXX XXXX";
+
+ for (i = 0; i < arrayWrapper.length; ++i) {
+ var divWrapper = document.createElement("DIV");
+ divWrapper.className = "multicol-wrapper";
+ document.body.appendChild(divWrapper);
+
+ var divMulticol = document.createElement("DIV");
+ divMulticol.className = arrayWrapper[i];
+ divWrapper.appendChild(divMulticol);
+
+ for (j = 0; j < arrayMulticol.length; ++j) {
+ var spanNode = document.createElement("SPAN");
+ spanNode.className = arrayMulticol[j];
+ divMulticol.appendChild(spanNode);
+
+ var textNode = document.createTextNode(text);
+ spanNode.appendChild(textNode);
+ }
+
+ var brNode = document.createElement("BR");
+ document.body.appendChild(brNode);
+ }
+ }
+ </script>
+</head>
+<body onload="appendText()">
+</body>
+</html>
\ No newline at end of file
--- /dev/null
+<!DOCTYPE html>
+<html>
+<head>
+ <style>
+ .multicol-wrapper>* {
+ font: 20px/1 Ahem, sans-serif;
+ }
+ div.multicol-wrapper {
+ border: thin solid black;
+ display: inline-block;
+ margin: 1em auto;
+ width: 360px;
+ }
+ .multicol-basic-ref {
+ background: yellow;
+ width: 360px;
+ }
+ .multicol-count-ref {
+ column-count: 3;
+ column-gap: 0;
+ column-rule: none;
+ }
+ .multicol-columns-ref {
+ columns: 3;
+ column-gap: 0;
+ column-rule: thin solid green;
+ }
+ .multicol-rule-ref {
+ column-count: 3;
+ column-gap: 0;
+ column-rule-width: thin;
+ column-rule-style: solid;
+ column-rule-color: green;
+ }
+ .multicol-fill-balance-ref {
+ columns: 3;
+ column-gap: 0;
+ column-rule: none;
+ column-fill: balance;
+ height: 6em;
+ }
+ .multicol-fill-auto-ref {
+ column-count: 3;
+ column-gap: 0;
+ column-fill: auto;
+ height: 6em;
+ }
+ .multicol-progression-reverse-ref {
+ column-count: 3;
+ column-gap: 0;
+ column-rule: none;
+ column-progression: reverse;
+ }
+ .multicol-basic-ref-item {
+ background: #000;
+ }
+ .item-1 {
+ background: purple;
+ color: purple;
+ }
+ .item-2 {
+ background: orange;
+ color: orange;
+ }
+ .item-3 {
+ background: blue;
+ color: blue;
+ }
+ </style>
+ <script>
+ function appendText() {
+ var arrayWrapper = [
+ "multicol-basic-ref multicol-count-ref",
+ "multicol-basic-ref multicol-columns-ref",
+ "multicol-basic-ref multicol-rule-ref",
+ "multicol-basic-ref multicol-fill-balance-ref",
+ "multicol-basic-ref multicol-fill-auto-ref",
+ "multicol-basic-ref multicol-progression-reverse-ref"
+ ];
+
+ var arrayMulticol = [
+ "multicol-basic-ref-item item-1",
+ "multicol-basic-ref-item item-2",
+ "multicol-basic-ref-item item-3",
+ ];
+
+ var text = "XXXX XXXX XXXX XXXX XXXX XXXX XXXX";
+
+ for (i = 0; i < arrayWrapper.length; ++i) {
+ var divWrapper = document.createElement("DIV");
+ divWrapper.className = "multicol-wrapper";
+ document.body.appendChild(divWrapper);
+
+ var divMulticol = document.createElement("DIV");
+ divMulticol.className = arrayWrapper[i];
+ divWrapper.appendChild(divMulticol);
+
+ for (j = 0; j < arrayMulticol.length; ++j) {
+ var spanNode = document.createElement("SPAN");
+ spanNode.className = arrayMulticol[j];
+ divMulticol.appendChild(spanNode);
+
+ var textNode = document.createTextNode(text);
+ spanNode.appendChild(textNode);
+ }
+
+ var brNode = document.createElement("BR");
+ document.body.appendChild(brNode);
+ }
+ }
+ </script>
+</head>
+<body onload="appendText()">
+</body>
+</html>
+2014-10-31 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ Remove webkit prefix from CSS columns.
+ https://bugs.webkit.org/show_bug.cgi?id=137132.
+
+ Reviewed by Dean Jackson.
+
+ Import tests for basic multi-column properties settings. They are approved by W3C and
+ pass the WebKit testing. More tests need to be imported when they are approved.
+
+ * css: Added.
+ * css/multicol: Added.
+ * css/multicol/multicol-basic-001-expected.html: Added.
+ * css/multicol/multicol-basic-001.html: Added.
+ * css/multicol/multicol-basic-002-expected.html: Added.
+ * css/multicol/multicol-basic-002.html: Added.
+ * css/multicol/multicol-basic-003-expected.html: Added.
+ * css/multicol/multicol-basic-003.html: Added.
+ * css/multicol/multicol-basic-004-expected.html: Added.
+ * css/multicol/multicol-basic-004.html: Added.
+
2013-12-03 Ryosuke Niwa <rniwa@webkit.org>
Import the XHTML parsing and serialization tests for template elements
--- /dev/null
+<!DOCTYPE html>
+<html>
+<head>
+ <title>CSS Test reference</title>
+ <link rel="author" title="Anselm Hannemann" href="mailto:info@anselm-hannemann.com"/>
+ <link rel="reviewer" title="Elika J Etemad" href="http://fantasai.inkedblade.net/contact">
+ <meta name="flags" content="ahem"/>
+ <style type="text/css">
+ .multicol-wrapper>* {
+ font: 20px/1 Ahem, sans-serif;
+ }
+ div.multicol-wrapper {
+ border: thin solid black;
+ display: inline-block;
+ margin: 1em auto;
+ width: 360px;
+ }
+ .multicol-basic-ref {
+ background: yellow;
+ width: 360px;
+ border-spacing: 0;
+ border-collapse: collapse;
+ padding: 0;
+ }
+ .multicol-basic-ref td {
+ padding: 0;
+ }
+ .multicol-basic-ref-item {
+ padding: 0;
+ width: 120px;
+ background: #000;
+ border-spacing: 0;
+ border-collapse: collapse;
+ display: inline;
+ border: none;
+ }
+ .item-1 {
+ background: purple;
+ color: purple;
+ }
+ .item-2 {
+ background: orange;
+ color: orange;
+ }
+ .item-3 {
+ background: blue;
+ color: blue;
+ }
+ </style>
+</head>
+<body>
+<p>Test passes if there are three vertical stripes in the yellow box below: 1st purple, 2nd orange, 3rd blue.</p>
+<div class="multicol-wrapper">
+ <table class="multicol-basic-ref">
+ <tr>
+ <td><div class="multicol-basic-ref-item item-1">XXXX XXXX XXXX XXXX XXXX XXXX XXXX</div></td>
+ <td><div class="multicol-basic-ref-item item-2">XXXX XXXX XXXX XXXX XXXX XXXX XXXX</div></td>
+ <td><div class="multicol-basic-ref-item item-3">XXXX XXXX XXXX XXXX XXXX XXXX XXXX</div></td>
+ </tr>
+ </table>
+</div>
+</body>
+</html>
\ No newline at end of file
--- /dev/null
+<!DOCTYPE html>
+<html>
+<head>
+ <title>CSS Test: Multi-column element via columns: [integer]</title>
+ <link rel="author" title="Anselm Hannemann" href="mailto:info@anselm-hannemann.com"/>
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#columns"/>
+ <link rel="match" href="reference/multicol-basic-ref.html"/>
+ <meta name="flags" content="ahem"/>
+ <link rel="reviewer" title="Elika J Etemad" href="http://fantasai.inkedblade.net/contact">
+ <style type="text/css">
+ .multicol-wrapper>* {
+ font: 20px/1 Ahem, sans-serif;
+ }
+ div.multicol-wrapper {
+ border: thin solid black;
+ display: inline-block;
+ margin: 1em auto;
+ width: 360px;
+ }
+ .multicol-basic-ref {
+ background: yellow;
+ width: 360px;
+ columns: 3;
+ column-gap: 0;
+ column-rule: none;
+ }
+ .multicol-basic-ref-item {
+ background: #000;
+ }
+ .item-1 {
+ background: purple;
+ color: purple;
+ }
+ .item-2 {
+ background: orange;
+ color: orange;
+ }
+ .item-3 {
+ background: blue;
+ color: blue;
+ }
+ </style>
+</head>
+<body>
+ <p>Test passes if there are three vertical stripes in the yellow box below: 1st purple, 2nd orange, 3rd blue.</p>
+ <div class="multicol-wrapper">
+ <div class="multicol-basic-ref">
+ <span class="multicol-basic-ref-item item-1">XXXX XXXX XXXX XXXX XXXX XXXX XXXX</span>
+ <br>
+ <span class="multicol-basic-ref-item item-2">XXXX XXXX XXXX XXXX XXXX XXXX XXXX</span>
+ <br>
+ <span class="multicol-basic-ref-item item-3">XXXX XXXX XXXX XXXX XXXX XXXX XXXX</span>
+ </div>
+ </div>
+</body>
+</html>
--- /dev/null
+<!DOCTYPE html>
+<html>
+<head>
+ <title>CSS Test reference</title>
+ <link rel="author" title="Anselm Hannemann" href="mailto:info@anselm-hannemann.com"/>
+ <link rel="reviewer" title="Elika J Etemad" href="http://fantasai.inkedblade.net/contact">
+ <meta name="flags" content="ahem"/>
+ <style type="text/css">
+ .multicol-wrapper>* {
+ font: 20px/1 Ahem, sans-serif;
+ }
+ div.multicol-wrapper {
+ border: thin solid black;
+ display: inline-block;
+ margin: 1em auto;
+ width: 360px;
+ }
+ .multicol-basic-ref {
+ background: yellow;
+ width: 360px;
+ border-spacing: 0;
+ border-collapse: collapse;
+ padding: 0;
+ }
+ .multicol-basic-ref td {
+ padding: 0;
+ }
+ .multicol-basic-ref-item {
+ padding: 0;
+ width: 120px;
+ background: #000;
+ border-spacing: 0;
+ border-collapse: collapse;
+ display: inline;
+ border: none;
+ }
+ .item-1 {
+ background: purple;
+ color: purple;
+ }
+ .item-2 {
+ background: orange;
+ color: orange;
+ }
+ .item-3 {
+ background: blue;
+ color: blue;
+ }
+ </style>
+</head>
+<body>
+<p>Test passes if there are three vertical stripes in the yellow box below: 1st purple, 2nd orange, 3rd blue.</p>
+<div class="multicol-wrapper">
+ <table class="multicol-basic-ref">
+ <tr>
+ <td><div class="multicol-basic-ref-item item-1">XXXX XXXX XXXX XXXX XXXX XXXX XXXX</div></td>
+ <td><div class="multicol-basic-ref-item item-2">XXXX XXXX XXXX XXXX XXXX XXXX XXXX</div></td>
+ <td><div class="multicol-basic-ref-item item-3">XXXX XXXX XXXX XXXX XXXX XXXX XXXX</div></td>
+ </tr>
+ </table>
+</div>
+</body>
+</html>
\ No newline at end of file
--- /dev/null
+<!DOCTYPE html>
+<html>
+<head>
+ <title>CSS Test: Multi-column element via column-count: [integer]</title>
+ <link rel="author" title="Anselm Hannemann" href="mailto:info@anselm-hannemann.com"/>
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#columns"/>
+ <link rel="match" href="reference/multicol-basic-ref.html"/>
+ <meta name="flags" content="ahem"/>
+ <link rel="reviewer" title="Elika J Etemad" href="http://fantasai.inkedblade.net/contact">
+ <style type="text/css">
+ .multicol-wrapper>* {
+ font: 20px/1 Ahem, sans-serif;
+ }
+ div.multicol-wrapper {
+ border: thin solid black;
+ display: inline-block;
+ margin: 1em auto;
+ width: 360px;
+ }
+ .multicol-basic-ref {
+ background: yellow;
+ width: 360px;
+ column-count: 3;
+ column-gap: 0;
+ column-rule: none;
+ }
+ .multicol-basic-ref-item {
+ background: #000;
+ }
+ .item-1 {
+ background: purple;
+ color: purple;
+ }
+ .item-2 {
+ background: orange;
+ color: orange;
+ }
+ .item-3 {
+ background: blue;
+ color: blue;
+ }
+ </style>
+</head>
+<body>
+ <p>Test passes if there are three vertical stripes in the yellow box below: 1st purple, 2nd orange, 3rd blue.</p>
+ <div class="multicol-wrapper">
+ <div class="multicol-basic-ref">
+ <span class="multicol-basic-ref-item item-1">XXXX XXXX XXXX XXXX XXXX XXXX XXXX</span>
+ <br>
+ <span class="multicol-basic-ref-item item-2">XXXX XXXX XXXX XXXX XXXX XXXX XXXX</span>
+ <br>
+ <span class="multicol-basic-ref-item item-3">XXXX XXXX XXXX XXXX XXXX XXXX XXXX</span>
+ </div>
+ </div>
+</body>
+</html>
--- /dev/null
+<!DOCTYPE html>
+<html>
+<!-- Submitted from TestTWF Paris -->
+<head>
+ <title>CSS Test reference</title>
+ <link rel="author" title="Anselm Hannemann" href="mailto:info@anselm-hannemann.com"/>
+ <link rel="reviewer" title="Elika J Etemad" href="http://fantasai.inkedblade.net/contact">
+ <meta name="flags" content="ahem"/>
+ <style type="text/css">
+ .multicol-wrapper>* {
+ font: 20px/1 Ahem, sans-serif;
+ }
+ div.multicol-wrapper {
+ border: thin solid black;
+ display: inline-block;
+ margin: 1em auto;
+ width: 360px;
+ }
+ .multicol-basic-ref {
+ background: yellow;
+ width: 360px;
+ border-spacing: 0;
+ border-collapse: collapse;
+ padding: 0;
+ }
+ .multicol-basic-ref td {
+ padding: 0;
+ }
+ .multicol-basic-ref-item {
+ padding: 0;
+ width: 120px;
+ background: #000;
+ border-spacing: 0;
+ border-collapse: collapse;
+ display: inline;
+ border: none;
+ }
+ .item-1 {
+ background: purple;
+ color: purple;
+ }
+ .item-2 {
+ background: orange;
+ color: orange;
+ }
+ .item-3 {
+ background: blue;
+ color: blue;
+ }
+ </style>
+</head>
+<body>
+<p>Test passes if there are three vertical stripes in the yellow box below: 1st purple, 2nd orange, 3rd blue.</p>
+<div class="multicol-wrapper">
+ <table class="multicol-basic-ref">
+ <tr>
+ <td><div class="multicol-basic-ref-item item-1">XXXX XXXX XXXX XXXX XXXX XXXX XXXX</div></td>
+ <td><div class="multicol-basic-ref-item item-2">XXXX XXXX XXXX XXXX XXXX XXXX XXXX</div></td>
+ <td><div class="multicol-basic-ref-item item-3">XXXX XXXX XXXX XXXX XXXX XXXX XXXX</div></td>
+ </tr>
+ </table>
+</div>
+</body>
+</html>
\ No newline at end of file
--- /dev/null
+<!DOCTYPE html>
+<html>
+<head>
+ <title>CSS Test: Multi-column element via columns: [width]</title>
+ <link rel="author" title="Anselm Hannemann" href="mailto:info@anselm-hannemann.com"/>
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#columns"/>
+ <meta name="flags" content="ahem"/>
+ <link rel="reviewer" title="Elika J Etemad" href="http://fantasai.inkedblade.net/contact">
+ <style type="text/css">
+ .multicol-wrapper>* {
+ font: 20px/1 Ahem, sans-serif;
+ }
+ div.multicol-wrapper {
+ border: thin solid black;
+ display: inline-block;
+ margin: 1em auto;
+ width: 360px;
+ }
+ .multicol-basic-ref {
+ background: yellow;
+ width: 360px;
+ columns: 120px;
+ column-gap: 0;
+ column-rule: none;
+ }
+ .multicol-basic-ref-item {
+ background: #000;
+ }
+ .item-1 {
+ background: purple;
+ color: purple;
+ }
+ .item-2 {
+ background: orange;
+ color: orange;
+ }
+ .item-3 {
+ background: blue;
+ color: blue;
+ }
+ </style>
+</head>
+<body>
+ <p>Test passes if there are three vertical stripes in the yellow box below: 1st purple, 2nd orange, 3rd blue.</p>
+ <div class="multicol-wrapper">
+ <div class="multicol-basic-ref">
+ <span class="multicol-basic-ref-item item-1">XXXX XXXX XXXX XXXX XXXX XXXX XXXX</span>
+ <br>
+ <span class="multicol-basic-ref-item item-2">XXXX XXXX XXXX XXXX XXXX XXXX XXXX</span>
+ <br>
+ <span class="multicol-basic-ref-item item-3">XXXX XXXX XXXX XXXX XXXX XXXX XXXX</span>
+ </div>
+ </div>
+</body>
+</html>
\ No newline at end of file
--- /dev/null
+<!DOCTYPE html>
+<html>
+<head>
+ <title>CSS Test reference</title>
+ <link rel="author" title="Anselm Hannemann" href="mailto:info@anselm-hannemann.com"/>
+ <link rel="reviewer" title="Elika J Etemad" href="http://fantasai.inkedblade.net/contact">
+ <meta name="flags" content="ahem"/>
+ <style type="text/css">
+ .multicol-wrapper>* {
+ font: 20px/1 Ahem, sans-serif;
+ }
+ div.multicol-wrapper {
+ border: thin solid black;
+ display: inline-block;
+ margin: 1em auto;
+ width: 360px;
+ }
+ .multicol-basic-ref {
+ background: yellow;
+ width: 360px;
+ border-spacing: 0;
+ border-collapse: collapse;
+ padding: 0;
+ }
+ .multicol-basic-ref td {
+ padding: 0;
+ }
+ .multicol-basic-ref-item {
+ padding: 0;
+ width: 120px;
+ background: #000;
+ border-spacing: 0;
+ border-collapse: collapse;
+ display: inline;
+ border: none;
+ }
+ .item-1 {
+ background: purple;
+ color: purple;
+ }
+ .item-2 {
+ background: orange;
+ color: orange;
+ }
+ .item-3 {
+ background: blue;
+ color: blue;
+ }
+ </style>
+</head>
+<body>
+<p>Test passes if there are three vertical stripes in the yellow box below: 1st purple, 2nd orange, 3rd blue.</p>
+<div class="multicol-wrapper">
+ <table class="multicol-basic-ref">
+ <tr>
+ <td><div class="multicol-basic-ref-item item-1">XXXX XXXX XXXX XXXX XXXX XXXX XXXX</div></td>
+ <td><div class="multicol-basic-ref-item item-2">XXXX XXXX XXXX XXXX XXXX XXXX XXXX</div></td>
+ <td><div class="multicol-basic-ref-item item-3">XXXX XXXX XXXX XXXX XXXX XXXX XXXX</div></td>
+ </tr>
+ </table>
+</div>
+</body>
+</html>
\ No newline at end of file
--- /dev/null
+<!DOCTYPE html>
+<html>
+<head>
+ <title>CSS Test: Multi-column element via column-width: [width]</title>
+ <link rel="author" title="Anselm Hannemann" href="mailto:info@anselm-hannemann.com"/>
+ <link rel="help" href="http://www.w3.org/TR/css3-multicol/#columns"/>
+ <link rel="match" href="reference/multicol-basic-ref.html"/>
+ <meta name="flags" content="ahem"/>
+ <link rel="reviewer" title="Elika J Etemad" href="http://fantasai.inkedblade.net/contact">
+ <style type="text/css">
+ .multicol-wrapper>* {
+ font: 20px/1 Ahem, sans-serif;
+ }
+ div.multicol-wrapper {
+ border: thin solid black;
+ display: inline-block;
+ margin: 1em auto;
+ width: 360px;
+ }
+ .multicol-basic-ref {
+ background: yellow;
+ width: 360px;
+ column-width: 120px;
+ column-gap: 0;
+ column-rule: none;
+ }
+ .multicol-basic-ref-item {
+ background: #000;
+ }
+ .item-1 {
+ background: purple;
+ color: purple;
+ }
+ .item-2 {
+ background: orange;
+ color: orange;
+ }
+ .item-3 {
+ background: blue;
+ color: blue;
+ }
+ </style>
+</head>
+<body>
+ <p>Test passes if there are three vertical stripes in the yellow box below: 1st purple, 2nd orange, 3rd blue.</p>
+ <div class="multicol-wrapper">
+ <div class="multicol-basic-ref">
+ <span class="multicol-basic-ref-item item-1">XXXX XXXX XXXX XXXX XXXX XXXX XXXX</span>
+ <br>
+ <span class="multicol-basic-ref-item item-2">XXXX XXXX XXXX XXXX XXXX XXXX XXXX</span>
+ <br>
+ <span class="multicol-basic-ref-item item-3">XXXX XXXX XXXX XXXX XXXX XXXX XXXX</span>
+ </div>
+ </div>
+</body>
+</html>
rect: style.getPropertyCSSValue(-webkit-column-break-inside) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-column-axis) : auto
rect: style.getPropertyCSSValue(-webkit-column-axis) : [object CSSPrimitiveValue]
-rect: style.getPropertyValue(-webkit-column-count) : auto
-rect: style.getPropertyCSSValue(-webkit-column-count) : [object CSSPrimitiveValue]
-rect: style.getPropertyValue(-webkit-column-gap) : normal
-rect: style.getPropertyCSSValue(-webkit-column-gap) : [object CSSPrimitiveValue]
-rect: style.getPropertyValue(-webkit-column-rule-color) : rgb(0, 0, 0)
-rect: style.getPropertyCSSValue(-webkit-column-rule-color) : [object CSSPrimitiveValue]
-rect: style.getPropertyValue(-webkit-column-rule-style) : none
-rect: style.getPropertyCSSValue(-webkit-column-rule-style) : [object CSSPrimitiveValue]
-rect: style.getPropertyValue(-webkit-column-rule-width) : 0px
-rect: style.getPropertyCSSValue(-webkit-column-rule-width) : [object CSSPrimitiveValue]
-rect: style.getPropertyValue(-webkit-column-span) : none
-rect: style.getPropertyCSSValue(-webkit-column-span) : [object CSSPrimitiveValue]
-rect: style.getPropertyValue(-webkit-column-width) : auto
-rect: style.getPropertyCSSValue(-webkit-column-width) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(column-count) : auto
+rect: style.getPropertyCSSValue(column-count) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(column-gap) : normal
+rect: style.getPropertyCSSValue(column-gap) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(column-rule-color) : rgb(0, 0, 0)
+rect: style.getPropertyCSSValue(column-rule-color) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(column-rule-style) : none
+rect: style.getPropertyCSSValue(column-rule-style) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(column-rule-width) : 0px
+rect: style.getPropertyCSSValue(column-rule-width) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(column-span) : none
+rect: style.getPropertyCSSValue(column-span) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(column-width) : auto
+rect: style.getPropertyCSSValue(column-width) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(align-content) : stretch
rect: style.getPropertyCSSValue(align-content) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(align-items) : stretch
g: style.getPropertyCSSValue(-webkit-column-break-inside) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-column-axis) : auto
g: style.getPropertyCSSValue(-webkit-column-axis) : [object CSSPrimitiveValue]
-g: style.getPropertyValue(-webkit-column-count) : auto
-g: style.getPropertyCSSValue(-webkit-column-count) : [object CSSPrimitiveValue]
-g: style.getPropertyValue(-webkit-column-gap) : normal
-g: style.getPropertyCSSValue(-webkit-column-gap) : [object CSSPrimitiveValue]
-g: style.getPropertyValue(-webkit-column-rule-color) : rgb(0, 0, 0)
-g: style.getPropertyCSSValue(-webkit-column-rule-color) : [object CSSPrimitiveValue]
-g: style.getPropertyValue(-webkit-column-rule-style) : none
-g: style.getPropertyCSSValue(-webkit-column-rule-style) : [object CSSPrimitiveValue]
-g: style.getPropertyValue(-webkit-column-rule-width) : 0px
-g: style.getPropertyCSSValue(-webkit-column-rule-width) : [object CSSPrimitiveValue]
-g: style.getPropertyValue(-webkit-column-span) : none
-g: style.getPropertyCSSValue(-webkit-column-span) : [object CSSPrimitiveValue]
-g: style.getPropertyValue(-webkit-column-width) : auto
-g: style.getPropertyCSSValue(-webkit-column-width) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(column-count) : auto
+g: style.getPropertyCSSValue(column-count) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(column-gap) : normal
+g: style.getPropertyCSSValue(column-gap) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(column-rule-color) : rgb(0, 0, 0)
+g: style.getPropertyCSSValue(column-rule-color) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(column-rule-style) : none
+g: style.getPropertyCSSValue(column-rule-style) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(column-rule-width) : 0px
+g: style.getPropertyCSSValue(column-rule-width) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(column-span) : none
+g: style.getPropertyCSSValue(column-span) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(column-width) : auto
+g: style.getPropertyCSSValue(column-width) : [object CSSPrimitiveValue]
g: style.getPropertyValue(align-content) : stretch
g: style.getPropertyCSSValue(align-content) : [object CSSPrimitiveValue]
g: style.getPropertyValue(align-items) : stretch
a, acronym { text-decoration: none; text-transform: none; border: none }\r
\r
#quickSummary, #supportingText, #linkList { display: none }\r
- \r
- #preamble { columns: 2 }\r
</style>\r
\r
</head>\r
+2014-10-31 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ Remove webkit prefix from CSS columns.
+ https://bugs.webkit.org/show_bug.cgi?id=137132.
+
+ Reviewed by Dean Jackson.
+
+ CSS columns properties are ready for un-prefixing. There are still a couple
+ that we haven't implemented, such as the ones starting with "break-", so we're
+ just going to do the ones starting with "column-". The list of column un-
+ prefixed properties in this change set is:
+ - column-count
+ - column-fill
+ - column-gap
+ - column-progression
+ - column-rule
+ - column-rule-color
+ - column-rule-style
+ - column-rule-width
+ - column-span
+ - column-width
+ - columns
+
+ Tests: fast/multicol/column-box-alignment-rtl.html
+ fast/multicol/multicol-aliases.html
+ imported/w3c/css/multicol/multicol-basic-001.html
+ imported/w3c/css/multicol/multicol-basic-002.html
+ imported/w3c/css/multicol/multicol-basic-003.html
+ imported/w3c/css/multicol/multicol-basic-004.html
+
+ Add new un-prefixed column properties and make the -webkit* ones be aliases
+ to the new ones.
+ * css/CSSPropertyNames.in:
+
+ Use the new enums CSSPropertyColumn* instead of the prefixed ones.
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::ComputedStyleExtractor::propertyValue):
+ * css/CSSParser.cpp:
+ (WebCore::isColorPropertyID):
+ (WebCore::isValidKeywordPropertyAndValue):
+ (WebCore::isKeywordPropertyID):
+ (WebCore::CSSParser::parseValue):
+ * css/DeprecatedStyleBuilder.cpp:
+ (WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
+ * css/StyleProperties.cpp:
+ (WebCore::StyleProperties::getPropertyValue):
+ * css/StylePropertyShorthand.cpp:
+ (WebCore::webkitColumnsShorthand):
+ (WebCore::webkitColumnRuleShorthand):
+ (WebCore::shorthandForProperty):
+ (WebCore::matchingShorthandsForLonghand):
+ * css/StyleResolver.cpp:
+ (WebCore::isValidVisitedLinkProperty):
+ (WebCore::StyleResolver::applyProperty):
+ * page/animation/CSSPropertyAnimation.cpp:
+ (WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
+ * rendering/RenderMultiColumnSet.cpp:
+ (WebCore::RenderMultiColumnSet::paintColumnRules):
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::colorIncludingFallback):
+
2014-10-31 Tim Horton <timothy_horton@apple.com>
Remove "Add to iPhoto" from the action menu's sharing menu
CSSPropertyWebkitColumnBreakBefore,
CSSPropertyWebkitColumnBreakInside,
CSSPropertyWebkitColumnAxis,
- CSSPropertyWebkitColumnCount,
- CSSPropertyWebkitColumnGap,
- CSSPropertyWebkitColumnProgression,
- CSSPropertyWebkitColumnRuleColor,
- CSSPropertyWebkitColumnRuleStyle,
- CSSPropertyWebkitColumnRuleWidth,
- CSSPropertyWebkitColumnSpan,
- CSSPropertyWebkitColumnWidth,
+ CSSPropertyColumnCount,
+ CSSPropertyColumnGap,
+ CSSPropertyColumnProgression,
+ CSSPropertyColumnRuleColor,
+ CSSPropertyColumnRuleStyle,
+ CSSPropertyColumnRuleWidth,
+ CSSPropertyColumnSpan,
+ CSSPropertyColumnWidth,
#if ENABLE(CURSOR_VISIBILITY)
CSSPropertyWebkitCursorVisibility,
#endif
return cssValuePool().createValue(style->printColorAdjust());
case CSSPropertyWebkitColumnAxis:
return cssValuePool().createValue(style->columnAxis());
- case CSSPropertyWebkitColumnCount:
+ case CSSPropertyColumnCount:
if (style->hasAutoColumnCount())
return cssValuePool().createIdentifierValue(CSSValueAuto);
return cssValuePool().createValue(style->columnCount(), CSSPrimitiveValue::CSS_NUMBER);
- case CSSPropertyWebkitColumnFill:
+ case CSSPropertyColumnFill:
return cssValuePool().createValue(style->columnFill());
- case CSSPropertyWebkitColumnGap:
+ case CSSPropertyColumnGap:
if (style->hasNormalColumnGap())
return cssValuePool().createIdentifierValue(CSSValueNormal);
return zoomAdjustedPixelValue(style->columnGap(), style.get());
- case CSSPropertyWebkitColumnProgression:
+ case CSSPropertyColumnProgression:
return cssValuePool().createValue(style->columnProgression());
- case CSSPropertyWebkitColumnRuleColor:
+ case CSSPropertyColumnRuleColor:
return m_allowVisitedStyle ? cssValuePool().createColorValue(style->visitedDependentColor(CSSPropertyOutlineColor).rgb()) : currentColorOrValidColor(style.get(), style->columnRuleColor());
- case CSSPropertyWebkitColumnRuleStyle:
+ case CSSPropertyColumnRuleStyle:
return cssValuePool().createValue(style->columnRuleStyle());
- case CSSPropertyWebkitColumnRuleWidth:
+ case CSSPropertyColumnRuleWidth:
return zoomAdjustedPixelValue(style->columnRuleWidth(), style.get());
- case CSSPropertyWebkitColumnSpan:
+ case CSSPropertyColumnSpan:
return cssValuePool().createIdentifierValue(style->columnSpan() ? CSSValueAll : CSSValueNone);
case CSSPropertyWebkitColumnBreakAfter:
return cssValuePool().createValue(style->columnBreakAfter());
return cssValuePool().createValue(style->columnBreakBefore());
case CSSPropertyWebkitColumnBreakInside:
return cssValuePool().createValue(style->columnBreakInside());
- case CSSPropertyWebkitColumnWidth:
+ case CSSPropertyColumnWidth:
if (style->hasAutoColumnWidth())
return cssValuePool().createIdentifierValue(CSSValueAuto);
return zoomAdjustedPixelValue(style->columnWidth(), style.get());
return getCSSPropertyValuesForShorthandProperties(borderTopShorthand());
case CSSPropertyBorderWidth:
return getCSSPropertyValuesForSidesShorthand(borderWidthShorthand());
- case CSSPropertyWebkitColumnRule:
+ case CSSPropertyColumnRule:
return getCSSPropertyValuesForShorthandProperties(webkitColumnRuleShorthand());
- case CSSPropertyWebkitColumns:
+ case CSSPropertyColumns:
return getCSSPropertyValuesForShorthandProperties(webkitColumnsShorthand());
case CSSPropertyListStyle:
return getCSSPropertyValuesForShorthandProperties(listStyleShorthand());
case CSSPropertyWebkitBorderBeforeColor:
case CSSPropertyWebkitBorderEndColor:
case CSSPropertyWebkitBorderStartColor:
- case CSSPropertyWebkitColumnRuleColor:
+ case CSSPropertyColumnRuleColor:
case CSSPropertyWebkitTextDecorationColor:
case CSSPropertyWebkitTextEmphasisColor:
case CSSPropertyWebkitTextFillColor:
case CSSPropertyWebkitBorderBeforeStyle:
case CSSPropertyWebkitBorderEndStyle:
case CSSPropertyWebkitBorderStartStyle:
- case CSSPropertyWebkitColumnRuleStyle:
+ case CSSPropertyColumnRuleStyle:
if (valueID >= CSSValueNone && valueID <= CSSValueDouble)
return true;
break;
if (valueID == CSSValueSrgb || valueID == CSSValueDefault)
return true;
break;
- case CSSPropertyWebkitColumnFill:
+ case CSSPropertyColumnFill:
if (valueID == CSSValueAuto || valueID == CSSValueBalance)
return true;
break;
case CSSPropertyWebkitColumnBreakAfter:
case CSSPropertyWebkitColumnBreakBefore:
case CSSPropertyWebkitColumnBreakInside:
- case CSSPropertyWebkitColumnFill:
- case CSSPropertyWebkitColumnRuleStyle:
+ case CSSPropertyColumnFill:
+ case CSSPropertyColumnRuleStyle:
case CSSPropertyAlignContent:
case CSSPropertyAlignItems:
case CSSPropertyAlignSelf:
case CSSPropertyTextLineThroughColor: // CSS3 text decoration colors
case CSSPropertyTextUnderlineColor:
case CSSPropertyTextOverlineColor:
- case CSSPropertyWebkitColumnRuleColor:
+ case CSSPropertyColumnRuleColor:
case CSSPropertyWebkitTextDecorationColor:
case CSSPropertyWebkitTextEmphasisColor:
case CSSPropertyWebkitTextFillColor:
case CSSPropertyWebkitBorderEndWidth:
case CSSPropertyWebkitBorderBeforeWidth:
case CSSPropertyWebkitBorderAfterWidth:
- case CSSPropertyWebkitColumnRuleWidth:
+ case CSSPropertyColumnRuleWidth:
if (id == CSSValueThin || id == CSSValueMedium || id == CSSValueThick)
validPrimitive = true;
else
else
validPrimitive = !id && validUnit(value, FNumber | FLength | FPercent);
break;
- case CSSPropertyWebkitColumnCount:
+ case CSSPropertyColumnCount:
if (id == CSSValueAuto)
validPrimitive = true;
else
validPrimitive = !id && validUnit(value, FPositiveInteger, CSSQuirksMode);
break;
- case CSSPropertyWebkitColumnGap: // normal | <length>
+ case CSSPropertyColumnGap: // normal | <length>
if (id == CSSValueNormal)
validPrimitive = true;
else
if (id == CSSValueHorizontal || id == CSSValueVertical || id == CSSValueAuto)
validPrimitive = true;
break;
- case CSSPropertyWebkitColumnProgression:
+ case CSSPropertyColumnProgression:
if (id == CSSValueNormal || id == CSSValueReverse)
validPrimitive = true;
break;
- case CSSPropertyWebkitColumnSpan: // none | all | 1 (will be dropped in the unprefixed property)
+ case CSSPropertyColumnSpan: // none | all | 1 (will be dropped in the unprefixed property)
if (id == CSSValueAll || id == CSSValueNone)
validPrimitive = true;
else
validPrimitive = validUnit(value, FNumber | FNonNeg) && value->fValue == 1;
break;
- case CSSPropertyWebkitColumnWidth: // auto | <length>
+ case CSSPropertyColumnWidth: // auto | <length>
if (id == CSSValueAuto)
validPrimitive = true;
else // Always parse this property in strict mode, since it would be ambiguous otherwise when used in the 'columns' shorthand property.
break;
case CSSPropertyListStyle:
return parseShorthand(propId, listStyleShorthand(), important);
- case CSSPropertyWebkitColumns:
+ case CSSPropertyColumns:
return parseShorthand(propId, webkitColumnsShorthand(), important);
- case CSSPropertyWebkitColumnRule:
+ case CSSPropertyColumnRule:
return parseShorthand(propId, webkitColumnRuleShorthand(), important);
case CSSPropertyWebkitTextStroke:
return parseShorthand(propId, webkitTextStrokeShorthand(), important);
case CSSPropertyWebkitColumnBreakAfter:
case CSSPropertyWebkitColumnBreakBefore:
case CSSPropertyWebkitColumnBreakInside:
- case CSSPropertyWebkitColumnFill:
- case CSSPropertyWebkitColumnRuleStyle:
+ case CSSPropertyColumnFill:
+ case CSSPropertyColumnRuleStyle:
case CSSPropertyAlignContent:
case CSSPropertyAlignItems:
case CSSPropertyAlignSelf:
-webkit-column-break-after [NewStyleBuilder, TypeName=EPageBreak, Initial=initialPageBreak]
-webkit-column-break-before [NewStyleBuilder, TypeName=EPageBreak, Initial=initialPageBreak]
-webkit-column-break-inside [NewStyleBuilder, TypeName=EPageBreak, Initial=initialPageBreak]
--webkit-column-count
--webkit-column-fill [NewStyleBuilder, TypeName=ColumnFill]
--webkit-column-gap
--webkit-column-progression [NewStyleBuilder, TypeName=ColumnProgression]
--webkit-column-rule
--webkit-column-rule-color
--webkit-column-rule-style [NewStyleBuilder, TypeName=EBorderStyle, Initial=initialBorderStyle]
--webkit-column-rule-width [NewStyleBuilder, Converter=LineWidth<unsigned short>]
--webkit-column-span [NewStyleBuilder, TypeName=ColumnSpan]
--webkit-column-width
--webkit-columns
+column-count
+-webkit-column-count = column-count
+column-fill [NewStyleBuilder, TypeName=ColumnFill]
+-webkit-column-fill = column-fill
+column-gap
+-webkit-column-gap = column-gap
+column-progression [NewStyleBuilder, TypeName=ColumnProgression]
+-webkit-column-progression = column-progression
+column-rule
+-webkit-column-rule = column-rule
+column-rule-color
+-webkit-column-rule-color = column-rule-color
+column-rule-style [NewStyleBuilder, TypeName=EBorderStyle, Initial=initialBorderStyle]
+-webkit-column-rule-style = column-rule-style
+column-rule-width [NewStyleBuilder, Converter=LineWidth<unsigned short>]
+-webkit-column-rule-width = column-rule-width
+column-span [NewStyleBuilder, TypeName=ColumnSpan]
+-webkit-column-span = column-span
+column-width
+-webkit-column-width = column-width
+columns
+-webkit-columns = columns
#if defined(ENABLE_CSS_BOX_DECORATION_BREAK) && ENABLE_CSS_BOX_DECORATION_BREAK
-webkit-box-decoration-break [NewStyleBuilder]
#endif
setPropertyHandler(CSSPropertyWebkitBackgroundComposite, ApplyPropertyFillLayer<CompositeOperator, CSSPropertyWebkitBackgroundComposite, BackgroundFillLayer, &RenderStyle::accessBackgroundLayers, &RenderStyle::backgroundLayers, &FillLayer::isCompositeSet, &FillLayer::composite, &FillLayer::setComposite, &FillLayer::clearComposite, &FillLayer::initialFillComposite, &CSSToStyleMap::mapFillComposite>::createHandler());
setPropertyHandler(CSSPropertyWebkitBackgroundOrigin, CSSPropertyBackgroundOrigin);
setPropertyHandler(CSSPropertyWebkitBackgroundSize, CSSPropertyBackgroundSize);
- setPropertyHandler(CSSPropertyWebkitColumnCount, ApplyPropertyAuto<unsigned short, &RenderStyle::columnCount, &RenderStyle::setColumnCount, &RenderStyle::hasAutoColumnCount, &RenderStyle::setHasAutoColumnCount>::createHandler());
- setPropertyHandler(CSSPropertyWebkitColumnGap, ApplyPropertyAuto<float, &RenderStyle::columnGap, &RenderStyle::setColumnGap, &RenderStyle::hasNormalColumnGap, &RenderStyle::setHasNormalColumnGap, ComputeLength, CSSValueNormal>::createHandler());
- setPropertyHandler(CSSPropertyWebkitColumnRuleColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::columnRuleColor, &RenderStyle::setColumnRuleColor, &RenderStyle::setVisitedLinkColumnRuleColor, &RenderStyle::color>::createHandler());
- setPropertyHandler(CSSPropertyWebkitColumnWidth, ApplyPropertyAuto<float, &RenderStyle::columnWidth, &RenderStyle::setColumnWidth, &RenderStyle::hasAutoColumnWidth, &RenderStyle::setHasAutoColumnWidth, ComputeLength>::createHandler());
+ setPropertyHandler(CSSPropertyColumnCount, ApplyPropertyAuto<unsigned short, &RenderStyle::columnCount, &RenderStyle::setColumnCount, &RenderStyle::hasAutoColumnCount, &RenderStyle::setHasAutoColumnCount>::createHandler());
+ setPropertyHandler(CSSPropertyColumnGap, ApplyPropertyAuto<float, &RenderStyle::columnGap, &RenderStyle::setColumnGap, &RenderStyle::hasNormalColumnGap, &RenderStyle::setHasNormalColumnGap, ComputeLength, CSSValueNormal>::createHandler());
+ setPropertyHandler(CSSPropertyColumnRuleColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::columnRuleColor, &RenderStyle::setColumnRuleColor, &RenderStyle::setVisitedLinkColumnRuleColor, &RenderStyle::color>::createHandler());
+ setPropertyHandler(CSSPropertyColumnWidth, ApplyPropertyAuto<float, &RenderStyle::columnWidth, &RenderStyle::setColumnWidth, &RenderStyle::hasAutoColumnWidth, &RenderStyle::setHasAutoColumnWidth, ComputeLength>::createHandler());
#if ENABLE(CSS_REGIONS)
setPropertyHandler(CSSPropertyWebkitFlowFrom, ApplyPropertyString<MapNoneToNull, &RenderStyle::regionThread, &RenderStyle::setRegionThread, &RenderStyle::initialRegionThread>::createHandler());
setPropertyHandler(CSSPropertyWebkitFlowInto, ApplyPropertyString<MapNoneToNull, &RenderStyle::flowThread, &RenderStyle::setFlowThread, &RenderStyle::initialFlowThread>::createHandler());
return get4Values(borderWidthShorthand());
case CSSPropertyBorderStyle:
return get4Values(borderStyleShorthand());
- case CSSPropertyWebkitColumnRule:
+ case CSSPropertyColumnRule:
return getShorthandValue(webkitColumnRuleShorthand());
- case CSSPropertyWebkitColumns:
+ case CSSPropertyColumns:
return getShorthandValue(webkitColumnsShorthand());
case CSSPropertyFlex:
return getShorthandValue(flexShorthand());
CSSPropertyOrphans,
CSSPropertyOverflow, // This can be also be applied to replaced elements
CSSPropertyWebkitAspectRatio,
- CSSPropertyWebkitColumnCount,
- CSSPropertyWebkitColumnGap,
- CSSPropertyWebkitColumnRuleColor,
- CSSPropertyWebkitColumnRuleStyle,
- CSSPropertyWebkitColumnRuleWidth,
+ CSSPropertyColumnCount,
+ CSSPropertyColumnGap,
+ CSSPropertyColumnRuleColor,
+ CSSPropertyColumnRuleStyle,
+ CSSPropertyColumnRuleWidth,
CSSPropertyWebkitColumnBreakBefore,
CSSPropertyWebkitColumnBreakAfter,
CSSPropertyWebkitColumnBreakInside,
- CSSPropertyWebkitColumnWidth,
+ CSSPropertyColumnWidth,
CSSPropertyPageBreakAfter,
CSSPropertyPageBreakBefore,
CSSPropertyPageBreakInside,
StylePropertyShorthand webkitColumnsShorthand()
{
- static const CSSPropertyID columnsProperties[] = { CSSPropertyWebkitColumnWidth, CSSPropertyWebkitColumnCount };
- return StylePropertyShorthand(CSSPropertyWebkitColumns, columnsProperties, WTF_ARRAY_LENGTH(columnsProperties));
+ static const CSSPropertyID columnsProperties[] = { CSSPropertyColumnWidth, CSSPropertyColumnCount };
+ return StylePropertyShorthand(CSSPropertyColumns, columnsProperties, WTF_ARRAY_LENGTH(columnsProperties));
}
StylePropertyShorthand webkitColumnRuleShorthand()
{
static const CSSPropertyID columnRuleProperties[] = {
- CSSPropertyWebkitColumnRuleWidth,
- CSSPropertyWebkitColumnRuleStyle,
- CSSPropertyWebkitColumnRuleColor,
+ CSSPropertyColumnRuleWidth,
+ CSSPropertyColumnRuleStyle,
+ CSSPropertyColumnRuleColor,
};
- return StylePropertyShorthand(CSSPropertyWebkitColumnRule, columnRuleProperties, WTF_ARRAY_LENGTH(columnRuleProperties));
+ return StylePropertyShorthand(CSSPropertyColumnRule, columnRuleProperties, WTF_ARRAY_LENGTH(columnRuleProperties));
}
StylePropertyShorthand flexFlowShorthand()
return webkitBorderStartShorthand();
case CSSPropertyWebkitBorderRadius:
return borderRadiusShorthand();
- case CSSPropertyWebkitColumns:
+ case CSSPropertyColumns:
return webkitColumnsShorthand();
- case CSSPropertyWebkitColumnRule:
+ case CSSPropertyColumnRule:
return webkitColumnRuleShorthand();
case CSSPropertyFlex:
return flexShorthand();
case CSSPropertyWebkitBorderStartStyle:
case CSSPropertyWebkitBorderStartColor:
return makeVector(webkitBorderStartShorthand());
- case CSSPropertyWebkitColumnWidth:
- case CSSPropertyWebkitColumnCount:
+ case CSSPropertyColumnWidth:
+ case CSSPropertyColumnCount:
return makeVector(webkitColumnsShorthand());
- case CSSPropertyWebkitColumnRuleWidth:
- case CSSPropertyWebkitColumnRuleStyle:
- case CSSPropertyWebkitColumnRuleColor:
+ case CSSPropertyColumnRuleWidth:
+ case CSSPropertyColumnRuleStyle:
+ case CSSPropertyColumnRuleColor:
return makeVector(webkitColumnRuleShorthand());
case CSSPropertyFlexGrow:
case CSSPropertyFlexShrink:
case CSSPropertyBorderBottomColor:
case CSSPropertyColor:
case CSSPropertyOutlineColor:
- case CSSPropertyWebkitColumnRuleColor:
+ case CSSPropertyColumnRuleColor:
case CSSPropertyWebkitTextDecorationColor:
case CSSPropertyWebkitTextEmphasisColor:
case CSSPropertyWebkitTextFillColor:
case CSSPropertyWebkitBorderEnd:
case CSSPropertyWebkitBorderStart:
case CSSPropertyWebkitBorderRadius:
- case CSSPropertyWebkitColumns:
- case CSSPropertyWebkitColumnRule:
+ case CSSPropertyColumns:
+ case CSSPropertyColumnRule:
case CSSPropertyFlex:
case CSSPropertyFlexFlow:
#if ENABLE(CSS_GRID_LAYOUT)
case CSSPropertyWebkitColumnBreakAfter:
case CSSPropertyWebkitColumnBreakBefore:
case CSSPropertyWebkitColumnBreakInside:
- case CSSPropertyWebkitColumnCount:
- case CSSPropertyWebkitColumnGap:
- case CSSPropertyWebkitColumnProgression:
- case CSSPropertyWebkitColumnRuleColor:
- case CSSPropertyWebkitColumnRuleStyle:
- case CSSPropertyWebkitColumnRuleWidth:
- case CSSPropertyWebkitColumnSpan:
- case CSSPropertyWebkitColumnWidth:
+ case CSSPropertyColumnCount:
+ case CSSPropertyColumnGap:
+ case CSSPropertyColumnProgression:
+ case CSSPropertyColumnRuleColor:
+ case CSSPropertyColumnRuleStyle:
+ case CSSPropertyColumnRuleWidth:
+ case CSSPropertyColumnSpan:
+ case CSSPropertyColumnWidth:
#if ENABLE(CURSOR_VISIBILITY)
case CSSPropertyWebkitCursorVisibility:
#endif
&RenderStyle::computedFontSize,
#endif
&RenderStyle::setFontSize),
- new PropertyWrapper<unsigned short>(CSSPropertyWebkitColumnRuleWidth, &RenderStyle::columnRuleWidth, &RenderStyle::setColumnRuleWidth),
- new PropertyWrapper<float>(CSSPropertyWebkitColumnGap, &RenderStyle::columnGap, &RenderStyle::setColumnGap),
- new PropertyWrapper<unsigned short>(CSSPropertyWebkitColumnCount, &RenderStyle::columnCount, &RenderStyle::setColumnCount),
- new PropertyWrapper<float>(CSSPropertyWebkitColumnWidth, &RenderStyle::columnWidth, &RenderStyle::setColumnWidth),
+ new PropertyWrapper<unsigned short>(CSSPropertyColumnRuleWidth, &RenderStyle::columnRuleWidth, &RenderStyle::setColumnRuleWidth),
+ new PropertyWrapper<float>(CSSPropertyColumnGap, &RenderStyle::columnGap, &RenderStyle::setColumnGap),
+ new PropertyWrapper<unsigned short>(CSSPropertyColumnCount, &RenderStyle::columnCount, &RenderStyle::setColumnCount),
+ new PropertyWrapper<float>(CSSPropertyColumnWidth, &RenderStyle::columnWidth, &RenderStyle::setColumnWidth),
new PropertyWrapper<short>(CSSPropertyWebkitBorderHorizontalSpacing, &RenderStyle::horizontalBorderSpacing, &RenderStyle::setHorizontalBorderSpacing),
new PropertyWrapper<short>(CSSPropertyWebkitBorderVerticalSpacing, &RenderStyle::verticalBorderSpacing, &RenderStyle::setVerticalBorderSpacing),
new PropertyWrapper<int>(CSSPropertyZIndex, &RenderStyle::zIndex, &RenderStyle::setZIndex),
new PropertyWrapper<float>(CSSPropertyWebkitShapeImageThreshold, &RenderStyle::shapeImageThreshold, &RenderStyle::setShapeImageThreshold),
#endif
- new PropertyWrapperVisitedAffectedColor(CSSPropertyWebkitColumnRuleColor, MaybeInvalidColor, &RenderStyle::columnRuleColor, &RenderStyle::setColumnRuleColor, &RenderStyle::visitedLinkColumnRuleColor, &RenderStyle::setVisitedLinkColumnRuleColor),
+ new PropertyWrapperVisitedAffectedColor(CSSPropertyColumnRuleColor, MaybeInvalidColor, &RenderStyle::columnRuleColor, &RenderStyle::setColumnRuleColor, &RenderStyle::visitedLinkColumnRuleColor, &RenderStyle::setVisitedLinkColumnRuleColor),
new PropertyWrapperVisitedAffectedColor(CSSPropertyWebkitTextStrokeColor, MaybeInvalidColor, &RenderStyle::textStrokeColor, &RenderStyle::setTextStrokeColor, &RenderStyle::visitedLinkTextStrokeColor, &RenderStyle::setVisitedLinkTextStrokeColor),
new PropertyWrapperVisitedAffectedColor(CSSPropertyWebkitTextFillColor, MaybeInvalidColor, &RenderStyle::textFillColor, &RenderStyle::setTextFillColor, &RenderStyle::visitedLinkTextFillColor, &RenderStyle::setVisitedLinkTextFillColor),
new PropertyWrapperVisitedAffectedColor(CSSPropertyBorderLeftColor, MaybeInvalidColor, &RenderStyle::borderLeftColor, &RenderStyle::setBorderLeftColor, &RenderStyle::visitedLinkBorderLeftColor, &RenderStyle::setVisitedLinkBorderLeftColor),
CSSPropertyOutline,
CSSPropertyPadding,
CSSPropertyWebkitTextStroke,
- CSSPropertyWebkitColumnRule,
+ CSSPropertyColumnRule,
CSSPropertyWebkitBorderRadius,
CSSPropertyWebkitTransformOrigin
};
//
// Compound properties that have components that should be animatable:
//
- // CSSPropertyWebkitColumns
+ // CSSPropertyColumns
// CSSPropertyWebkitBoxReflect
// Make sure unused slots have a value
RenderMultiColumnFlowThread* flowThread = multiColumnFlowThread();
const RenderStyle& blockStyle = parent()->style();
- const Color& ruleColor = blockStyle.visitedDependentColor(CSSPropertyWebkitColumnRuleColor);
+ const Color& ruleColor = blockStyle.visitedDependentColor(CSSPropertyColumnRuleColor);
bool ruleTransparent = blockStyle.columnRuleIsTransparent();
EBorderStyle ruleStyle = blockStyle.columnRuleStyle();
LayoutUnit ruleThickness = blockStyle.columnRuleWidth();
case CSSPropertyOutlineColor:
result = visitedLink ? visitedLinkOutlineColor() : outlineColor();
break;
- case CSSPropertyWebkitColumnRuleColor:
+ case CSSPropertyColumnRuleColor:
result = visitedLink ? visitedLinkColumnRuleColor() : columnRuleColor();
break;
case CSSPropertyWebkitTextDecorationColor:
git://git.webkit.org / WebKit-https.git / commitdiff