Remove webkit prefix from CSS columns.
authordino@apple.com <dino@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 31 Oct 2014 20:42:45 +0000 (20:42 +0000)
committerdino@apple.com <dino@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 31 Oct 2014 20:42:45 +0000 (20:42 +0000)
https://bugs.webkit.org/show_bug.cgi?id=137132.

Patch by Said Abou-Hallawa <sabouhallawa@apple.com> on 2014-10-31
Reviewed by Dean Jackson.

LayoutTests/imported/w3c:

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.

Source/WebCore:

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

LayoutTests:

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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@175421 268f45cc-cd09-0410-ab3c-d52691b4dbfc

31 files changed:
LayoutTests/ChangeLog
LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt
LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
LayoutTests/fast/css/getComputedStyle/resources/property-names.js
LayoutTests/fast/css/remove-shorthand-expected.txt
LayoutTests/fast/multicol/column-box-alignment-rtl-expected.html [new file with mode: 0644]
LayoutTests/fast/multicol/column-box-alignment-rtl.html [new file with mode: 0644]
LayoutTests/fast/multicol/multicol-aliases-expected.html [new file with mode: 0644]
LayoutTests/fast/multicol/multicol-aliases.html [new file with mode: 0644]
LayoutTests/imported/w3c/ChangeLog
LayoutTests/imported/w3c/css/multicol/multicol-basic-001-expected.html [new file with mode: 0644]
LayoutTests/imported/w3c/css/multicol/multicol-basic-001.html [new file with mode: 0644]
LayoutTests/imported/w3c/css/multicol/multicol-basic-002-expected.html [new file with mode: 0644]
LayoutTests/imported/w3c/css/multicol/multicol-basic-002.html [new file with mode: 0644]
LayoutTests/imported/w3c/css/multicol/multicol-basic-003-expected.html [new file with mode: 0644]
LayoutTests/imported/w3c/css/multicol/multicol-basic-003.html [new file with mode: 0644]
LayoutTests/imported/w3c/css/multicol/multicol-basic-004-expected.html [new file with mode: 0644]
LayoutTests/imported/w3c/css/multicol/multicol-basic-004.html [new file with mode: 0644]
LayoutTests/svg/css/getComputedStyle-basic-expected.txt
LayoutTests/svg/custom/svg-fonts-in-html.html
Source/WebCore/ChangeLog
Source/WebCore/css/CSSComputedStyleDeclaration.cpp
Source/WebCore/css/CSSParser.cpp
Source/WebCore/css/CSSPropertyNames.in
Source/WebCore/css/DeprecatedStyleBuilder.cpp
Source/WebCore/css/StyleProperties.cpp
Source/WebCore/css/StylePropertyShorthand.cpp
Source/WebCore/css/StyleResolver.cpp
Source/WebCore/page/animation/CSSPropertyAnimation.cpp
Source/WebCore/rendering/RenderMultiColumnSet.cpp
Source/WebCore/rendering/style/RenderStyle.cpp

index 09cc7dd05036286a3d27513a61dd787e6b489e55..065f5129326c7b4f48df79b990ba54d8614df6d6 100644 (file)
@@ -1,3 +1,38 @@
+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
index 8e957c09e91a54239263387ea294d800a2a2ebfc..9fad3beceda9a98cc5ab76a0945873fa210bf4ea 100644 (file)
@@ -136,13 +136,13 @@ zoom: 1;
 -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;
index b4d0dba56ec6a92ab7499f04e1ee227ced14e431..56354f867ef7109964e0a3dc9d685afa578e82e7 100644 (file)
@@ -135,13 +135,13 @@ zoom: 1
 -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
index cbc27eac4f87ac103d47b5fe86093ef96b2af3e1..4ac0a80db664ce1e01f71c4bbc738ffcb6c0907c 100644 (file)
@@ -37,13 +37,13 @@ var propertiesToTest = {
     "-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,
index 6ec42a77adf74d63c9332ee2cf6c980c767e5048..a5a6478fe210b9dadd7b295f3d76828cf0ee1e12 100644 (file)
@@ -42,10 +42,10 @@ Removing border-spacing
 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"
diff --git a/LayoutTests/fast/multicol/column-box-alignment-rtl-expected.html b/LayoutTests/fast/multicol/column-box-alignment-rtl-expected.html
new file mode 100644 (file)
index 0000000..b8c8359
--- /dev/null
@@ -0,0 +1,31 @@
+<!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
diff --git a/LayoutTests/fast/multicol/column-box-alignment-rtl.html b/LayoutTests/fast/multicol/column-box-alignment-rtl.html
new file mode 100644 (file)
index 0000000..336242e
--- /dev/null
@@ -0,0 +1,28 @@
+<!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
diff --git a/LayoutTests/fast/multicol/multicol-aliases-expected.html b/LayoutTests/fast/multicol/multicol-aliases-expected.html
new file mode 100644 (file)
index 0000000..c776823
--- /dev/null
@@ -0,0 +1,115 @@
+<!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
diff --git a/LayoutTests/fast/multicol/multicol-aliases.html b/LayoutTests/fast/multicol/multicol-aliases.html
new file mode 100644 (file)
index 0000000..d759b88
--- /dev/null
@@ -0,0 +1,115 @@
+<!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>
index 41cff4c1d0d29b579d31d91ef137ac9831bcd1c6..986ea5f4cc698acbefa8d317b8d6cc073b4573fe 100644 (file)
@@ -1,3 +1,24 @@
+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
diff --git a/LayoutTests/imported/w3c/css/multicol/multicol-basic-001-expected.html b/LayoutTests/imported/w3c/css/multicol/multicol-basic-001-expected.html
new file mode 100644 (file)
index 0000000..6d88746
--- /dev/null
@@ -0,0 +1,63 @@
+<!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
diff --git a/LayoutTests/imported/w3c/css/multicol/multicol-basic-001.html b/LayoutTests/imported/w3c/css/multicol/multicol-basic-001.html
new file mode 100644 (file)
index 0000000..d9a9e03
--- /dev/null
@@ -0,0 +1,56 @@
+<!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>
diff --git a/LayoutTests/imported/w3c/css/multicol/multicol-basic-002-expected.html b/LayoutTests/imported/w3c/css/multicol/multicol-basic-002-expected.html
new file mode 100644 (file)
index 0000000..202cdea
--- /dev/null
@@ -0,0 +1,63 @@
+<!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
diff --git a/LayoutTests/imported/w3c/css/multicol/multicol-basic-002.html b/LayoutTests/imported/w3c/css/multicol/multicol-basic-002.html
new file mode 100644 (file)
index 0000000..a86695b
--- /dev/null
@@ -0,0 +1,56 @@
+<!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>
diff --git a/LayoutTests/imported/w3c/css/multicol/multicol-basic-003-expected.html b/LayoutTests/imported/w3c/css/multicol/multicol-basic-003-expected.html
new file mode 100644 (file)
index 0000000..9533dfe
--- /dev/null
@@ -0,0 +1,64 @@
+<!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
diff --git a/LayoutTests/imported/w3c/css/multicol/multicol-basic-003.html b/LayoutTests/imported/w3c/css/multicol/multicol-basic-003.html
new file mode 100644 (file)
index 0000000..f6c1a01
--- /dev/null
@@ -0,0 +1,55 @@
+<!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
diff --git a/LayoutTests/imported/w3c/css/multicol/multicol-basic-004-expected.html b/LayoutTests/imported/w3c/css/multicol/multicol-basic-004-expected.html
new file mode 100644 (file)
index 0000000..6d88746
--- /dev/null
@@ -0,0 +1,63 @@
+<!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
diff --git a/LayoutTests/imported/w3c/css/multicol/multicol-basic-004.html b/LayoutTests/imported/w3c/css/multicol/multicol-basic-004.html
new file mode 100644 (file)
index 0000000..2b99a1b
--- /dev/null
@@ -0,0 +1,56 @@
+<!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>
index bd983f7709361f74bbc75a22a72c2513ac114e0c..89d6474d903ca8f5e676328b4c551e74acfde125 100644 (file)
@@ -270,20 +270,20 @@ rect: style.getPropertyValue(-webkit-column-break-inside) : auto
 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
@@ -782,20 +782,20 @@ g: style.getPropertyValue(-webkit-column-break-inside) : auto
 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
index 13c01fac8f41eb53313c54becf6d4cd88e1a4f64..9a80d325a5a49376a1749102bfd31a214034efa3 100644 (file)
@@ -78,8 +78,6 @@
         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
index df1e0e051a8e98b2bc6bfda67658a782f87c4c72..3b44cdd94e2c0525189ac1a9211fb2492db1ab1b 100644 (file)
@@ -1,3 +1,64 @@
+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
index c5cc6976792cc732de24e2ed19723b972926edda..2ba84fd39ff386652b23798c718fc03905c4eb2b 100644 (file)
@@ -266,14 +266,14 @@ static const CSSPropertyID computedProperties[] = {
     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
@@ -1974,25 +1974,25 @@ PassRefPtr<CSSValue> ComputedStyleExtractor::propertyValue(CSSPropertyID propert
             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());
@@ -2000,7 +2000,7 @@ PassRefPtr<CSSValue> ComputedStyleExtractor::propertyValue(CSSPropertyID propert
             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());
@@ -2937,9 +2937,9 @@ PassRefPtr<CSSValue> ComputedStyleExtractor::propertyValue(CSSPropertyID propert
             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());
index 1963da4acf3398c7d627fca7d2d28434b3098919..97a29fd76c142037e3083dbc286c5ee40ea6278c 100644 (file)
@@ -490,7 +490,7 @@ static inline bool isColorPropertyID(CSSPropertyID propertyId)
     case CSSPropertyWebkitBorderBeforeColor:
     case CSSPropertyWebkitBorderEndColor:
     case CSSPropertyWebkitBorderStartColor:
-    case CSSPropertyWebkitColumnRuleColor:
+    case CSSPropertyColumnRuleColor:
     case CSSPropertyWebkitTextDecorationColor:
     case CSSPropertyWebkitTextEmphasisColor:
     case CSSPropertyWebkitTextFillColor:
@@ -652,7 +652,7 @@ static inline bool isValidKeywordPropertyAndValue(CSSPropertyID propertyId, int
     case CSSPropertyWebkitBorderBeforeStyle:
     case CSSPropertyWebkitBorderEndStyle:
     case CSSPropertyWebkitBorderStartStyle:
-    case CSSPropertyWebkitColumnRuleStyle:
+    case CSSPropertyColumnRuleStyle:
         if (valueID >= CSSValueNone && valueID <= CSSValueDouble)
             return true;
         break;
@@ -856,7 +856,7 @@ static inline bool isValidKeywordPropertyAndValue(CSSPropertyID propertyId, int
         if (valueID == CSSValueSrgb || valueID == CSSValueDefault)
             return true;
         break;
-    case CSSPropertyWebkitColumnFill:
+    case CSSPropertyColumnFill:
         if (valueID == CSSValueAuto || valueID == CSSValueBalance)
             return true;
         break;
@@ -1103,8 +1103,8 @@ static inline bool isKeywordPropertyID(CSSPropertyID propertyId)
     case CSSPropertyWebkitColumnBreakAfter:
     case CSSPropertyWebkitColumnBreakBefore:
     case CSSPropertyWebkitColumnBreakInside:
-    case CSSPropertyWebkitColumnFill:
-    case CSSPropertyWebkitColumnRuleStyle:
+    case CSSPropertyColumnFill:
+    case CSSPropertyColumnRuleStyle:
     case CSSPropertyAlignContent:
     case CSSPropertyAlignItems:
     case CSSPropertyAlignSelf:
@@ -1954,7 +1954,7 @@ bool CSSParser::parseValue(CSSPropertyID propId, bool important)
     case CSSPropertyTextLineThroughColor: // CSS3 text decoration colors
     case CSSPropertyTextUnderlineColor:
     case CSSPropertyTextOverlineColor:
-    case CSSPropertyWebkitColumnRuleColor:
+    case CSSPropertyColumnRuleColor:
     case CSSPropertyWebkitTextDecorationColor:
     case CSSPropertyWebkitTextEmphasisColor:
     case CSSPropertyWebkitTextFillColor:
@@ -2141,7 +2141,7 @@ bool CSSParser::parseValue(CSSPropertyID propId, bool important)
     case CSSPropertyWebkitBorderEndWidth:
     case CSSPropertyWebkitBorderBeforeWidth:
     case CSSPropertyWebkitBorderAfterWidth:
-    case CSSPropertyWebkitColumnRuleWidth:
+    case CSSPropertyColumnRuleWidth:
         if (id == CSSValueThin || id == CSSValueMedium || id == CSSValueThick)
             validPrimitive = true;
         else
@@ -2683,13 +2683,13 @@ bool CSSParser::parseValue(CSSPropertyID propId, bool important)
         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
@@ -2699,17 +2699,17 @@ bool CSSParser::parseValue(CSSPropertyID propId, bool important)
         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.
@@ -2873,9 +2873,9 @@ bool CSSParser::parseValue(CSSPropertyID propId, bool important)
         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);
@@ -3010,8 +3010,8 @@ bool CSSParser::parseValue(CSSPropertyID propId, bool important)
     case CSSPropertyWebkitColumnBreakAfter:
     case CSSPropertyWebkitColumnBreakBefore:
     case CSSPropertyWebkitColumnBreakInside:
-    case CSSPropertyWebkitColumnFill:
-    case CSSPropertyWebkitColumnRuleStyle:
+    case CSSPropertyColumnFill:
+    case CSSPropertyColumnRuleStyle:
     case CSSPropertyAlignContent:
     case CSSPropertyAlignItems:
     case CSSPropertyAlignSelf:
index cb896b60db961a0d2ffb4fe030212977cb9deb56..f5c6d50990f28eb9a3ae68ba3072963e7354021d 100644 (file)
@@ -316,17 +316,28 @@ z-index
 -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
index 51f7d79aa7822602f2fb9b36465a5a69cae55fbb..a4a44cfb536fed08810894318fcb97471a335b13 100644 (file)
@@ -2232,10 +2232,10 @@ DeprecatedStyleBuilder::DeprecatedStyleBuilder()
     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());
index 46f998ec62c9034bf510f315075e33965694ac25..ee7d94094c6ae2117dcbe6aac57180c9af0fe562 100644 (file)
@@ -151,9 +151,9 @@ String StyleProperties::getPropertyValue(CSSPropertyID propertyID) const
         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());
@@ -1063,15 +1063,15 @@ static const CSSPropertyID blockProperties[] = {
     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,
index 3cefed27824f98ae2319f1d8e211819322a3cebc..c9aeffd1d98f660d3c111f7e6e2098b0a94d3312 100644 (file)
@@ -319,18 +319,18 @@ StylePropertyShorthand webkitBorderStartShorthand()
 
 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()
@@ -569,9 +569,9 @@ StylePropertyShorthand shorthandForProperty(CSSPropertyID propertyID)
         return webkitBorderStartShorthand();
     case CSSPropertyWebkitBorderRadius:
         return borderRadiusShorthand();
-    case CSSPropertyWebkitColumns:
+    case CSSPropertyColumns:
         return webkitColumnsShorthand();
-    case CSSPropertyWebkitColumnRule:
+    case CSSPropertyColumnRule:
         return webkitColumnRuleShorthand();
     case CSSPropertyFlex:
         return flexShorthand();
@@ -763,12 +763,12 @@ Vector<StylePropertyShorthand> matchingShorthandsForLonghand(CSSPropertyID prope
     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:
index 6daeab6dbdb8542935b62e04121b57a92606ffb4..d8bd178d3b6f8ff30c0579ef27fb42c3a36b8f77 100644 (file)
@@ -1792,7 +1792,7 @@ inline bool isValidVisitedLinkProperty(CSSPropertyID id)
     case CSSPropertyBorderBottomColor:
     case CSSPropertyColor:
     case CSSPropertyOutlineColor:
-    case CSSPropertyWebkitColumnRuleColor:
+    case CSSPropertyColumnRuleColor:
     case CSSPropertyWebkitTextDecorationColor:
     case CSSPropertyWebkitTextEmphasisColor:
     case CSSPropertyWebkitTextFillColor:
@@ -2368,8 +2368,8 @@ void StyleResolver::applyProperty(CSSPropertyID id, CSSValue* value)
     case CSSPropertyWebkitBorderEnd:
     case CSSPropertyWebkitBorderStart:
     case CSSPropertyWebkitBorderRadius:
-    case CSSPropertyWebkitColumns:
-    case CSSPropertyWebkitColumnRule:
+    case CSSPropertyColumns:
+    case CSSPropertyColumnRule:
     case CSSPropertyFlex:
     case CSSPropertyFlexFlow:
 #if ENABLE(CSS_GRID_LAYOUT)
@@ -3093,14 +3093,14 @@ void StyleResolver::applyProperty(CSSPropertyID id, CSSValue* value)
     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
index b1a9c2accdfd936b72daf4531d60000115d39813..a977adbfab1beaa9a86ca1c85975ac3782d02876 100644 (file)
@@ -1181,10 +1181,10 @@ CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap()
             &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),
@@ -1223,7 +1223,7 @@ CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap()
         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),
@@ -1285,7 +1285,7 @@ CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap()
         CSSPropertyOutline,
         CSSPropertyPadding,
         CSSPropertyWebkitTextStroke,
-        CSSPropertyWebkitColumnRule,
+        CSSPropertyColumnRule,
         CSSPropertyWebkitBorderRadius,
         CSSPropertyWebkitTransformOrigin
     };
@@ -1297,7 +1297,7 @@ CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap()
     //
     // Compound properties that have components that should be animatable:
     //
-    //  CSSPropertyWebkitColumns
+    //  CSSPropertyColumns
     //  CSSPropertyWebkitBoxReflect
 
     // Make sure unused slots have a value
index 248b9489e86456713558be615ab09c361dd5aeb1..29fb6fa0421ef7773f7c43d0d2534667ba0528ab 100644 (file)
@@ -573,7 +573,7 @@ void RenderMultiColumnSet::paintColumnRules(PaintInfo& paintInfo, const LayoutPo
 
     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();
index 99a364feb6f10f117eab926afe8788f878a3b67b..9fdd22a9bdc4d6a8af1bc9d8b01daa090dedd4f0 100644 (file)
@@ -1522,7 +1522,7 @@ Color RenderStyle::colorIncludingFallback(int colorProperty, bool visitedLink) c
     case CSSPropertyOutlineColor:
         result = visitedLink ? visitedLinkOutlineColor() : outlineColor();
         break;
-    case CSSPropertyWebkitColumnRuleColor:
+    case CSSPropertyColumnRuleColor:
         result = visitedLink ? visitedLinkColumnRuleColor() : columnRuleColor();
         break;
     case CSSPropertyWebkitTextDecorationColor: