<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[175421] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/175421">175421</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2014-10-31 13:42:45 -0700 (Fri, 31 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove webkit prefix from CSS columns.
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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcssgetComputedStylecomputedstyleexpectedtxt">trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgetComputedStylecomputedstylewithoutrendererexpectedtxt">trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgetComputedStyleresourcespropertynamesjs">trunk/LayoutTests/fast/css/getComputedStyle/resources/property-names.js</a></li>
<li><a href="#trunkLayoutTestsfastcssremoveshorthandexpectedtxt">trunk/LayoutTests/fast/css/remove-shorthand-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestssvgcssgetComputedStylebasicexpectedtxt">trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt</a></li>
<li><a href="#trunkLayoutTestssvgcustomsvgfontsinhtmlhtml">trunk/LayoutTests/svg/custom/svg-fonts-in-html.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPropertyNamesin">trunk/Source/WebCore/css/CSSPropertyNames.in</a></li>
<li><a href="#trunkSourceWebCorecssDeprecatedStyleBuildercpp">trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStylePropertiescpp">trunk/Source/WebCore/css/StyleProperties.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStylePropertyShorthandcpp">trunk/Source/WebCore/css/StylePropertyShorthand.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorepageanimationCSSPropertyAnimationcpp">trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMultiColumnSetcpp">trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStylecpp">trunk/Source/WebCore/rendering/style/RenderStyle.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastmulticolcolumnboxalignmentrtlexpectedhtml">trunk/LayoutTests/fast/multicol/column-box-alignment-rtl-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastmulticolcolumnboxalignmentrtlhtml">trunk/LayoutTests/fast/multicol/column-box-alignment-rtl.html</a></li>
<li><a href="#trunkLayoutTestsfastmulticolmulticolaliasesexpectedhtml">trunk/LayoutTests/fast/multicol/multicol-aliases-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastmulticolmulticolaliaseshtml">trunk/LayoutTests/fast/multicol/multicol-aliases.html</a></li>
<li>trunk/LayoutTests/imported/w3c/css/</li>
<li>trunk/LayoutTests/imported/w3c/css/multicol/</li>
<li><a href="#trunkLayoutTestsimportedw3ccssmulticolmulticolbasic001expectedhtml">trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-001-expected.html</a></li>
<li><a href="#trunkLayoutTestsimportedw3ccssmulticolmulticolbasic001html">trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-001.html</a></li>
<li><a href="#trunkLayoutTestsimportedw3ccssmulticolmulticolbasic002expectedhtml">trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-002-expected.html</a></li>
<li><a href="#trunkLayoutTestsimportedw3ccssmulticolmulticolbasic002html">trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-002.html</a></li>
<li><a href="#trunkLayoutTestsimportedw3ccssmulticolmulticolbasic003expectedhtml">trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-003-expected.html</a></li>
<li><a href="#trunkLayoutTestsimportedw3ccssmulticolmulticolbasic003html">trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-003.html</a></li>
<li><a href="#trunkLayoutTestsimportedw3ccssmulticolmulticolbasic004expectedhtml">trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-004-expected.html</a></li>
<li><a href="#trunkLayoutTestsimportedw3ccssmulticolmulticolbasic004html">trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-004.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (175420 => 175421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-10-31 20:41:57 UTC (rev 175420)
+++ trunk/LayoutTests/ChangeLog 2014-10-31 20:42:45 UTC (rev 175421)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+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:
+
</ins><span class="cx"> 2014-10-31 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> Clean-up use of boolean attributes in media tests
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgetComputedStylecomputedstyleexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt (175420 => 175421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt 2014-10-31 20:41:57 UTC (rev 175420)
+++ trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt 2014-10-31 20:42:45 UTC (rev 175421)
</span><span class="lines">@@ -136,13 +136,13 @@
</span><span class="cx"> -webkit-column-break-before: auto;
</span><span class="cx"> -webkit-column-break-inside: auto;
</span><span class="cx"> -webkit-column-axis: auto;
</span><del>--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;
</del><ins>+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;
</ins><span class="cx"> align-content: stretch;
</span><span class="cx"> align-items: stretch;
</span><span class="cx"> align-self: stretch;
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgetComputedStylecomputedstylewithoutrendererexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (175420 => 175421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2014-10-31 20:41:57 UTC (rev 175420)
+++ trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2014-10-31 20:42:45 UTC (rev 175421)
</span><span class="lines">@@ -135,13 +135,13 @@
</span><span class="cx"> -webkit-column-break-before: auto
</span><span class="cx"> -webkit-column-break-inside: auto
</span><span class="cx"> -webkit-column-axis: auto
</span><del>--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
</del><ins>+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
</ins><span class="cx"> align-content: stretch
</span><span class="cx"> align-items: stretch
</span><span class="cx"> align-self: stretch
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgetComputedStyleresourcespropertynamesjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/getComputedStyle/resources/property-names.js (175420 => 175421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/getComputedStyle/resources/property-names.js 2014-10-31 20:41:57 UTC (rev 175420)
+++ trunk/LayoutTests/fast/css/getComputedStyle/resources/property-names.js 2014-10-31 20:42:45 UTC (rev 175421)
</span><span class="lines">@@ -37,13 +37,13 @@
</span><span class="cx"> "-webkit-column-break-after": true,
</span><span class="cx"> "-webkit-column-break-before": true,
</span><span class="cx"> "-webkit-column-break-inside": true,
</span><del>- "-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,
</del><ins>+ "column-count": true,
+ "column-gap": true,
+ "column-rule-color": true,
+ "column-rule-style": true,
+ "column-rule-width": true,
+ "column-span": true,
+ "column-width": true,
</ins><span class="cx"> "flex-direction": true,
</span><span class="cx"> "flex-wrap": true,
</span><span class="cx"> "-webkit-font-kerning": true,
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssremoveshorthandexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/remove-shorthand-expected.txt (175420 => 175421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/remove-shorthand-expected.txt 2014-10-31 20:41:57 UTC (rev 175420)
+++ trunk/LayoutTests/fast/css/remove-shorthand-expected.txt 2014-10-31 20:42:45 UTC (rev 175421)
</span><span class="lines">@@ -42,10 +42,10 @@
</span><span class="cx"> removes "border-spacing"
</span><span class="cx"> and adds "".
</span><span class="cx"> Removing -webkit-columns
</span><del>-removes "-webkit-column-width, -webkit-column-count"
</del><ins>+removes "column-width, column-count"
</ins><span class="cx"> and adds "".
</span><span class="cx"> Removing -webkit-column-rule
</span><del>-removes "-webkit-column-rule-width, -webkit-column-rule-style, -webkit-column-rule-color"
</del><ins>+removes "column-rule-width, column-rule-style, column-rule-color"
</ins><span class="cx"> and adds "".
</span><span class="cx"> Removing list-style
</span><span class="cx"> removes "list-style-type, list-style-position, list-style-image"
</span></span></pre></div>
<a id="trunkLayoutTestsfastmulticolcolumnboxalignmentrtlexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/column-box-alignment-rtl-expected.html (0 => 175421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/column-box-alignment-rtl-expected.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/column-box-alignment-rtl-expected.html 2014-10-31 20:42:45 UTC (rev 175421)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+<!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>
</ins><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/LayoutTests/fast/multicol/column-box-alignment-rtl-expected.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsfastmulticolcolumnboxalignmentrtlhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/column-box-alignment-rtl.html (0 => 175421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/column-box-alignment-rtl.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/column-box-alignment-rtl.html 2014-10-31 20:42:45 UTC (rev 175421)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+<!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>
</ins><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/LayoutTests/fast/multicol/column-box-alignment-rtl.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsfastmulticolmulticolaliasesexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/multicol-aliases-expected.html (0 => 175421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/multicol-aliases-expected.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/multicol-aliases-expected.html 2014-10-31 20:42:45 UTC (rev 175421)
</span><span class="lines">@@ -0,0 +1,115 @@
</span><ins>+<!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>
</ins><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/LayoutTests/fast/multicol/multicol-aliases-expected.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsfastmulticolmulticolaliaseshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/multicol-aliases.html (0 => 175421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/multicol-aliases.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/multicol-aliases.html 2014-10-31 20:42:45 UTC (rev 175421)
</span><span class="lines">@@ -0,0 +1,115 @@
</span><ins>+<!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>
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/multicol/multicol-aliases.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (175420 => 175421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2014-10-31 20:41:57 UTC (rev 175420)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2014-10-31 20:42:45 UTC (rev 175421)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+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.
+
</ins><span class="cx"> 2013-12-03 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Import the XHTML parsing and serialization tests for template elements
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3ccssmulticolmulticolbasic001expectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-001-expected.html (0 => 175421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-001-expected.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-001-expected.html 2014-10-31 20:42:45 UTC (rev 175421)
</span><span class="lines">@@ -0,0 +1,63 @@
</span><ins>+<!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>
</ins><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-001-expected.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsimportedw3ccssmulticolmulticolbasic001html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-001.html (0 => 175421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-001.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-001.html 2014-10-31 20:42:45 UTC (rev 175421)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+<!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>
</ins><span class="cx">Property changes on: trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-001.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsimportedw3ccssmulticolmulticolbasic002expectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-002-expected.html (0 => 175421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-002-expected.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-002-expected.html 2014-10-31 20:42:45 UTC (rev 175421)
</span><span class="lines">@@ -0,0 +1,63 @@
</span><ins>+<!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>
</ins><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-002-expected.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsimportedw3ccssmulticolmulticolbasic002html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-002.html (0 => 175421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-002.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-002.html 2014-10-31 20:42:45 UTC (rev 175421)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+<!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>
</ins><span class="cx">Property changes on: trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-002.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsimportedw3ccssmulticolmulticolbasic003expectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-003-expected.html (0 => 175421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-003-expected.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-003-expected.html 2014-10-31 20:42:45 UTC (rev 175421)
</span><span class="lines">@@ -0,0 +1,64 @@
</span><ins>+<!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>
</ins><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-003-expected.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsimportedw3ccssmulticolmulticolbasic003html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-003.html (0 => 175421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-003.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-003.html 2014-10-31 20:42:45 UTC (rev 175421)
</span><span class="lines">@@ -0,0 +1,55 @@
</span><ins>+<!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>
</ins><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-003.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsimportedw3ccssmulticolmulticolbasic004expectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-004-expected.html (0 => 175421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-004-expected.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-004-expected.html 2014-10-31 20:42:45 UTC (rev 175421)
</span><span class="lines">@@ -0,0 +1,63 @@
</span><ins>+<!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>
</ins><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-004-expected.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsimportedw3ccssmulticolmulticolbasic004html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-004.html (0 => 175421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-004.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-004.html 2014-10-31 20:42:45 UTC (rev 175421)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+<!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>
</ins><span class="cx">Property changes on: trunk/LayoutTests/imported/w3c/css/multicol/multicol-basic-004.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestssvgcssgetComputedStylebasicexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt (175420 => 175421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt 2014-10-31 20:41:57 UTC (rev 175420)
+++ trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt 2014-10-31 20:42:45 UTC (rev 175421)
</span><span class="lines">@@ -270,20 +270,20 @@
</span><span class="cx"> rect: style.getPropertyCSSValue(-webkit-column-break-inside) : [object CSSPrimitiveValue]
</span><span class="cx"> rect: style.getPropertyValue(-webkit-column-axis) : auto
</span><span class="cx"> rect: style.getPropertyCSSValue(-webkit-column-axis) : [object CSSPrimitiveValue]
</span><del>-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]
</del><ins>+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]
</ins><span class="cx"> rect: style.getPropertyValue(align-content) : stretch
</span><span class="cx"> rect: style.getPropertyCSSValue(align-content) : [object CSSPrimitiveValue]
</span><span class="cx"> rect: style.getPropertyValue(align-items) : stretch
</span><span class="lines">@@ -782,20 +782,20 @@
</span><span class="cx"> g: style.getPropertyCSSValue(-webkit-column-break-inside) : [object CSSPrimitiveValue]
</span><span class="cx"> g: style.getPropertyValue(-webkit-column-axis) : auto
</span><span class="cx"> g: style.getPropertyCSSValue(-webkit-column-axis) : [object CSSPrimitiveValue]
</span><del>-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]
</del><ins>+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]
</ins><span class="cx"> g: style.getPropertyValue(align-content) : stretch
</span><span class="cx"> g: style.getPropertyCSSValue(align-content) : [object CSSPrimitiveValue]
</span><span class="cx"> g: style.getPropertyValue(align-items) : stretch
</span></span></pre></div>
<a id="trunkLayoutTestssvgcustomsvgfontsinhtmlhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/custom/svg-fonts-in-html.html (175420 => 175421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/custom/svg-fonts-in-html.html 2014-10-31 20:41:57 UTC (rev 175420)
+++ trunk/LayoutTests/svg/custom/svg-fonts-in-html.html 2014-10-31 20:42:45 UTC (rev 175421)
</span><span class="lines">@@ -78,8 +78,6 @@
</span><span class="cx"> a, acronym { text-decoration: none; text-transform: none; border: none }
</span><span class="cx">
</span><span class="cx"> #quickSummary, #supportingText, #linkList { display: none }
</span><del>-
- #preamble { columns: 2 }
</del><span class="cx"> </style>
</span><span class="cx">
</span><span class="cx"> </head>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175420 => 175421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-31 20:41:57 UTC (rev 175420)
+++ trunk/Source/WebCore/ChangeLog 2014-10-31 20:42:45 UTC (rev 175421)
</span><span class="lines">@@ -1,3 +1,64 @@
</span><ins>+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):
+
</ins><span class="cx"> 2014-10-31 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove "Add to iPhoto" from the action menu's sharing menu
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (175420 => 175421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-10-31 20:41:57 UTC (rev 175420)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-10-31 20:42:45 UTC (rev 175421)
</span><span class="lines">@@ -266,14 +266,14 @@
</span><span class="cx"> CSSPropertyWebkitColumnBreakBefore,
</span><span class="cx"> CSSPropertyWebkitColumnBreakInside,
</span><span class="cx"> CSSPropertyWebkitColumnAxis,
</span><del>- CSSPropertyWebkitColumnCount,
- CSSPropertyWebkitColumnGap,
- CSSPropertyWebkitColumnProgression,
- CSSPropertyWebkitColumnRuleColor,
- CSSPropertyWebkitColumnRuleStyle,
- CSSPropertyWebkitColumnRuleWidth,
- CSSPropertyWebkitColumnSpan,
- CSSPropertyWebkitColumnWidth,
</del><ins>+ CSSPropertyColumnCount,
+ CSSPropertyColumnGap,
+ CSSPropertyColumnProgression,
+ CSSPropertyColumnRuleColor,
+ CSSPropertyColumnRuleStyle,
+ CSSPropertyColumnRuleWidth,
+ CSSPropertyColumnSpan,
+ CSSPropertyColumnWidth,
</ins><span class="cx"> #if ENABLE(CURSOR_VISIBILITY)
</span><span class="cx"> CSSPropertyWebkitCursorVisibility,
</span><span class="cx"> #endif
</span><span class="lines">@@ -1974,25 +1974,25 @@
</span><span class="cx"> return cssValuePool().createValue(style->printColorAdjust());
</span><span class="cx"> case CSSPropertyWebkitColumnAxis:
</span><span class="cx"> return cssValuePool().createValue(style->columnAxis());
</span><del>- case CSSPropertyWebkitColumnCount:
</del><ins>+ case CSSPropertyColumnCount:
</ins><span class="cx"> if (style->hasAutoColumnCount())
</span><span class="cx"> return cssValuePool().createIdentifierValue(CSSValueAuto);
</span><span class="cx"> return cssValuePool().createValue(style->columnCount(), CSSPrimitiveValue::CSS_NUMBER);
</span><del>- case CSSPropertyWebkitColumnFill:
</del><ins>+ case CSSPropertyColumnFill:
</ins><span class="cx"> return cssValuePool().createValue(style->columnFill());
</span><del>- case CSSPropertyWebkitColumnGap:
</del><ins>+ case CSSPropertyColumnGap:
</ins><span class="cx"> if (style->hasNormalColumnGap())
</span><span class="cx"> return cssValuePool().createIdentifierValue(CSSValueNormal);
</span><span class="cx"> return zoomAdjustedPixelValue(style->columnGap(), style.get());
</span><del>- case CSSPropertyWebkitColumnProgression:
</del><ins>+ case CSSPropertyColumnProgression:
</ins><span class="cx"> return cssValuePool().createValue(style->columnProgression());
</span><del>- case CSSPropertyWebkitColumnRuleColor:
</del><ins>+ case CSSPropertyColumnRuleColor:
</ins><span class="cx"> return m_allowVisitedStyle ? cssValuePool().createColorValue(style->visitedDependentColor(CSSPropertyOutlineColor).rgb()) : currentColorOrValidColor(style.get(), style->columnRuleColor());
</span><del>- case CSSPropertyWebkitColumnRuleStyle:
</del><ins>+ case CSSPropertyColumnRuleStyle:
</ins><span class="cx"> return cssValuePool().createValue(style->columnRuleStyle());
</span><del>- case CSSPropertyWebkitColumnRuleWidth:
</del><ins>+ case CSSPropertyColumnRuleWidth:
</ins><span class="cx"> return zoomAdjustedPixelValue(style->columnRuleWidth(), style.get());
</span><del>- case CSSPropertyWebkitColumnSpan:
</del><ins>+ case CSSPropertyColumnSpan:
</ins><span class="cx"> return cssValuePool().createIdentifierValue(style->columnSpan() ? CSSValueAll : CSSValueNone);
</span><span class="cx"> case CSSPropertyWebkitColumnBreakAfter:
</span><span class="cx"> return cssValuePool().createValue(style->columnBreakAfter());
</span><span class="lines">@@ -2000,7 +2000,7 @@
</span><span class="cx"> return cssValuePool().createValue(style->columnBreakBefore());
</span><span class="cx"> case CSSPropertyWebkitColumnBreakInside:
</span><span class="cx"> return cssValuePool().createValue(style->columnBreakInside());
</span><del>- case CSSPropertyWebkitColumnWidth:
</del><ins>+ case CSSPropertyColumnWidth:
</ins><span class="cx"> if (style->hasAutoColumnWidth())
</span><span class="cx"> return cssValuePool().createIdentifierValue(CSSValueAuto);
</span><span class="cx"> return zoomAdjustedPixelValue(style->columnWidth(), style.get());
</span><span class="lines">@@ -2937,9 +2937,9 @@
</span><span class="cx"> return getCSSPropertyValuesForShorthandProperties(borderTopShorthand());
</span><span class="cx"> case CSSPropertyBorderWidth:
</span><span class="cx"> return getCSSPropertyValuesForSidesShorthand(borderWidthShorthand());
</span><del>- case CSSPropertyWebkitColumnRule:
</del><ins>+ case CSSPropertyColumnRule:
</ins><span class="cx"> return getCSSPropertyValuesForShorthandProperties(webkitColumnRuleShorthand());
</span><del>- case CSSPropertyWebkitColumns:
</del><ins>+ case CSSPropertyColumns:
</ins><span class="cx"> return getCSSPropertyValuesForShorthandProperties(webkitColumnsShorthand());
</span><span class="cx"> case CSSPropertyListStyle:
</span><span class="cx"> return getCSSPropertyValuesForShorthandProperties(listStyleShorthand());
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (175420 => 175421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2014-10-31 20:41:57 UTC (rev 175420)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-10-31 20:42:45 UTC (rev 175421)
</span><span class="lines">@@ -490,7 +490,7 @@
</span><span class="cx"> case CSSPropertyWebkitBorderBeforeColor:
</span><span class="cx"> case CSSPropertyWebkitBorderEndColor:
</span><span class="cx"> case CSSPropertyWebkitBorderStartColor:
</span><del>- case CSSPropertyWebkitColumnRuleColor:
</del><ins>+ case CSSPropertyColumnRuleColor:
</ins><span class="cx"> case CSSPropertyWebkitTextDecorationColor:
</span><span class="cx"> case CSSPropertyWebkitTextEmphasisColor:
</span><span class="cx"> case CSSPropertyWebkitTextFillColor:
</span><span class="lines">@@ -652,7 +652,7 @@
</span><span class="cx"> case CSSPropertyWebkitBorderBeforeStyle:
</span><span class="cx"> case CSSPropertyWebkitBorderEndStyle:
</span><span class="cx"> case CSSPropertyWebkitBorderStartStyle:
</span><del>- case CSSPropertyWebkitColumnRuleStyle:
</del><ins>+ case CSSPropertyColumnRuleStyle:
</ins><span class="cx"> if (valueID >= CSSValueNone && valueID <= CSSValueDouble)
</span><span class="cx"> return true;
</span><span class="cx"> break;
</span><span class="lines">@@ -856,7 +856,7 @@
</span><span class="cx"> if (valueID == CSSValueSrgb || valueID == CSSValueDefault)
</span><span class="cx"> return true;
</span><span class="cx"> break;
</span><del>- case CSSPropertyWebkitColumnFill:
</del><ins>+ case CSSPropertyColumnFill:
</ins><span class="cx"> if (valueID == CSSValueAuto || valueID == CSSValueBalance)
</span><span class="cx"> return true;
</span><span class="cx"> break;
</span><span class="lines">@@ -1103,8 +1103,8 @@
</span><span class="cx"> case CSSPropertyWebkitColumnBreakAfter:
</span><span class="cx"> case CSSPropertyWebkitColumnBreakBefore:
</span><span class="cx"> case CSSPropertyWebkitColumnBreakInside:
</span><del>- case CSSPropertyWebkitColumnFill:
- case CSSPropertyWebkitColumnRuleStyle:
</del><ins>+ case CSSPropertyColumnFill:
+ case CSSPropertyColumnRuleStyle:
</ins><span class="cx"> case CSSPropertyAlignContent:
</span><span class="cx"> case CSSPropertyAlignItems:
</span><span class="cx"> case CSSPropertyAlignSelf:
</span><span class="lines">@@ -1954,7 +1954,7 @@
</span><span class="cx"> case CSSPropertyTextLineThroughColor: // CSS3 text decoration colors
</span><span class="cx"> case CSSPropertyTextUnderlineColor:
</span><span class="cx"> case CSSPropertyTextOverlineColor:
</span><del>- case CSSPropertyWebkitColumnRuleColor:
</del><ins>+ case CSSPropertyColumnRuleColor:
</ins><span class="cx"> case CSSPropertyWebkitTextDecorationColor:
</span><span class="cx"> case CSSPropertyWebkitTextEmphasisColor:
</span><span class="cx"> case CSSPropertyWebkitTextFillColor:
</span><span class="lines">@@ -2141,7 +2141,7 @@
</span><span class="cx"> case CSSPropertyWebkitBorderEndWidth:
</span><span class="cx"> case CSSPropertyWebkitBorderBeforeWidth:
</span><span class="cx"> case CSSPropertyWebkitBorderAfterWidth:
</span><del>- case CSSPropertyWebkitColumnRuleWidth:
</del><ins>+ case CSSPropertyColumnRuleWidth:
</ins><span class="cx"> if (id == CSSValueThin || id == CSSValueMedium || id == CSSValueThick)
</span><span class="cx"> validPrimitive = true;
</span><span class="cx"> else
</span><span class="lines">@@ -2683,13 +2683,13 @@
</span><span class="cx"> else
</span><span class="cx"> validPrimitive = !id && validUnit(value, FNumber | FLength | FPercent);
</span><span class="cx"> break;
</span><del>- case CSSPropertyWebkitColumnCount:
</del><ins>+ case CSSPropertyColumnCount:
</ins><span class="cx"> if (id == CSSValueAuto)
</span><span class="cx"> validPrimitive = true;
</span><span class="cx"> else
</span><span class="cx"> validPrimitive = !id && validUnit(value, FPositiveInteger, CSSQuirksMode);
</span><span class="cx"> break;
</span><del>- case CSSPropertyWebkitColumnGap: // normal | <length>
</del><ins>+ case CSSPropertyColumnGap: // normal | <length>
</ins><span class="cx"> if (id == CSSValueNormal)
</span><span class="cx"> validPrimitive = true;
</span><span class="cx"> else
</span><span class="lines">@@ -2699,17 +2699,17 @@
</span><span class="cx"> if (id == CSSValueHorizontal || id == CSSValueVertical || id == CSSValueAuto)
</span><span class="cx"> validPrimitive = true;
</span><span class="cx"> break;
</span><del>- case CSSPropertyWebkitColumnProgression:
</del><ins>+ case CSSPropertyColumnProgression:
</ins><span class="cx"> if (id == CSSValueNormal || id == CSSValueReverse)
</span><span class="cx"> validPrimitive = true;
</span><span class="cx"> break;
</span><del>- case CSSPropertyWebkitColumnSpan: // none | all | 1 (will be dropped in the unprefixed property)
</del><ins>+ case CSSPropertyColumnSpan: // none | all | 1 (will be dropped in the unprefixed property)
</ins><span class="cx"> if (id == CSSValueAll || id == CSSValueNone)
</span><span class="cx"> validPrimitive = true;
</span><span class="cx"> else
</span><span class="cx"> validPrimitive = validUnit(value, FNumber | FNonNeg) && value->fValue == 1;
</span><span class="cx"> break;
</span><del>- case CSSPropertyWebkitColumnWidth: // auto | <length>
</del><ins>+ case CSSPropertyColumnWidth: // auto | <length>
</ins><span class="cx"> if (id == CSSValueAuto)
</span><span class="cx"> validPrimitive = true;
</span><span class="cx"> else // Always parse this property in strict mode, since it would be ambiguous otherwise when used in the 'columns' shorthand property.
</span><span class="lines">@@ -2873,9 +2873,9 @@
</span><span class="cx"> break;
</span><span class="cx"> case CSSPropertyListStyle:
</span><span class="cx"> return parseShorthand(propId, listStyleShorthand(), important);
</span><del>- case CSSPropertyWebkitColumns:
</del><ins>+ case CSSPropertyColumns:
</ins><span class="cx"> return parseShorthand(propId, webkitColumnsShorthand(), important);
</span><del>- case CSSPropertyWebkitColumnRule:
</del><ins>+ case CSSPropertyColumnRule:
</ins><span class="cx"> return parseShorthand(propId, webkitColumnRuleShorthand(), important);
</span><span class="cx"> case CSSPropertyWebkitTextStroke:
</span><span class="cx"> return parseShorthand(propId, webkitTextStrokeShorthand(), important);
</span><span class="lines">@@ -3010,8 +3010,8 @@
</span><span class="cx"> case CSSPropertyWebkitColumnBreakAfter:
</span><span class="cx"> case CSSPropertyWebkitColumnBreakBefore:
</span><span class="cx"> case CSSPropertyWebkitColumnBreakInside:
</span><del>- case CSSPropertyWebkitColumnFill:
- case CSSPropertyWebkitColumnRuleStyle:
</del><ins>+ case CSSPropertyColumnFill:
+ case CSSPropertyColumnRuleStyle:
</ins><span class="cx"> case CSSPropertyAlignContent:
</span><span class="cx"> case CSSPropertyAlignItems:
</span><span class="cx"> case CSSPropertyAlignSelf:
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (175420 => 175421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2014-10-31 20:41:57 UTC (rev 175420)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2014-10-31 20:42:45 UTC (rev 175421)
</span><span class="lines">@@ -316,17 +316,28 @@
</span><span class="cx"> -webkit-column-break-after [NewStyleBuilder, TypeName=EPageBreak, Initial=initialPageBreak]
</span><span class="cx"> -webkit-column-break-before [NewStyleBuilder, TypeName=EPageBreak, Initial=initialPageBreak]
</span><span class="cx"> -webkit-column-break-inside [NewStyleBuilder, TypeName=EPageBreak, Initial=initialPageBreak]
</span><del>--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
</del><ins>+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
</ins><span class="cx"> #if defined(ENABLE_CSS_BOX_DECORATION_BREAK) && ENABLE_CSS_BOX_DECORATION_BREAK
</span><span class="cx"> -webkit-box-decoration-break [NewStyleBuilder]
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedStyleBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (175420 => 175421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-10-31 20:41:57 UTC (rev 175420)
+++ trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-10-31 20:42:45 UTC (rev 175421)
</span><span class="lines">@@ -2232,10 +2232,10 @@
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitBackgroundComposite, ApplyPropertyFillLayer<CompositeOperator, CSSPropertyWebkitBackgroundComposite, BackgroundFillLayer, &RenderStyle::accessBackgroundLayers, &RenderStyle::backgroundLayers, &FillLayer::isCompositeSet, &FillLayer::composite, &FillLayer::setComposite, &FillLayer::clearComposite, &FillLayer::initialFillComposite, &CSSToStyleMap::mapFillComposite>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitBackgroundOrigin, CSSPropertyBackgroundOrigin);
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitBackgroundSize, CSSPropertyBackgroundSize);
</span><del>- 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());
</del><ins>+ 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());
</ins><span class="cx"> #if ENABLE(CSS_REGIONS)
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitFlowFrom, ApplyPropertyString<MapNoneToNull, &RenderStyle::regionThread, &RenderStyle::setRegionThread, &RenderStyle::initialRegionThread>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitFlowInto, ApplyPropertyString<MapNoneToNull, &RenderStyle::flowThread, &RenderStyle::setFlowThread, &RenderStyle::initialFlowThread>::createHandler());
</span></span></pre></div>
<a id="trunkSourceWebCorecssStylePropertiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleProperties.cpp (175420 => 175421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleProperties.cpp 2014-10-31 20:41:57 UTC (rev 175420)
+++ trunk/Source/WebCore/css/StyleProperties.cpp 2014-10-31 20:42:45 UTC (rev 175421)
</span><span class="lines">@@ -151,9 +151,9 @@
</span><span class="cx"> return get4Values(borderWidthShorthand());
</span><span class="cx"> case CSSPropertyBorderStyle:
</span><span class="cx"> return get4Values(borderStyleShorthand());
</span><del>- case CSSPropertyWebkitColumnRule:
</del><ins>+ case CSSPropertyColumnRule:
</ins><span class="cx"> return getShorthandValue(webkitColumnRuleShorthand());
</span><del>- case CSSPropertyWebkitColumns:
</del><ins>+ case CSSPropertyColumns:
</ins><span class="cx"> return getShorthandValue(webkitColumnsShorthand());
</span><span class="cx"> case CSSPropertyFlex:
</span><span class="cx"> return getShorthandValue(flexShorthand());
</span><span class="lines">@@ -1063,15 +1063,15 @@
</span><span class="cx"> CSSPropertyOrphans,
</span><span class="cx"> CSSPropertyOverflow, // This can be also be applied to replaced elements
</span><span class="cx"> CSSPropertyWebkitAspectRatio,
</span><del>- CSSPropertyWebkitColumnCount,
- CSSPropertyWebkitColumnGap,
- CSSPropertyWebkitColumnRuleColor,
- CSSPropertyWebkitColumnRuleStyle,
- CSSPropertyWebkitColumnRuleWidth,
</del><ins>+ CSSPropertyColumnCount,
+ CSSPropertyColumnGap,
+ CSSPropertyColumnRuleColor,
+ CSSPropertyColumnRuleStyle,
+ CSSPropertyColumnRuleWidth,
</ins><span class="cx"> CSSPropertyWebkitColumnBreakBefore,
</span><span class="cx"> CSSPropertyWebkitColumnBreakAfter,
</span><span class="cx"> CSSPropertyWebkitColumnBreakInside,
</span><del>- CSSPropertyWebkitColumnWidth,
</del><ins>+ CSSPropertyColumnWidth,
</ins><span class="cx"> CSSPropertyPageBreakAfter,
</span><span class="cx"> CSSPropertyPageBreakBefore,
</span><span class="cx"> CSSPropertyPageBreakInside,
</span></span></pre></div>
<a id="trunkSourceWebCorecssStylePropertyShorthandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StylePropertyShorthand.cpp (175420 => 175421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StylePropertyShorthand.cpp 2014-10-31 20:41:57 UTC (rev 175420)
+++ trunk/Source/WebCore/css/StylePropertyShorthand.cpp 2014-10-31 20:42:45 UTC (rev 175421)
</span><span class="lines">@@ -319,18 +319,18 @@
</span><span class="cx">
</span><span class="cx"> StylePropertyShorthand webkitColumnsShorthand()
</span><span class="cx"> {
</span><del>- static const CSSPropertyID columnsProperties[] = { CSSPropertyWebkitColumnWidth, CSSPropertyWebkitColumnCount };
- return StylePropertyShorthand(CSSPropertyWebkitColumns, columnsProperties, WTF_ARRAY_LENGTH(columnsProperties));
</del><ins>+ static const CSSPropertyID columnsProperties[] = { CSSPropertyColumnWidth, CSSPropertyColumnCount };
+ return StylePropertyShorthand(CSSPropertyColumns, columnsProperties, WTF_ARRAY_LENGTH(columnsProperties));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> StylePropertyShorthand webkitColumnRuleShorthand()
</span><span class="cx"> {
</span><span class="cx"> static const CSSPropertyID columnRuleProperties[] = {
</span><del>- CSSPropertyWebkitColumnRuleWidth,
- CSSPropertyWebkitColumnRuleStyle,
- CSSPropertyWebkitColumnRuleColor,
</del><ins>+ CSSPropertyColumnRuleWidth,
+ CSSPropertyColumnRuleStyle,
+ CSSPropertyColumnRuleColor,
</ins><span class="cx"> };
</span><del>- return StylePropertyShorthand(CSSPropertyWebkitColumnRule, columnRuleProperties, WTF_ARRAY_LENGTH(columnRuleProperties));
</del><ins>+ return StylePropertyShorthand(CSSPropertyColumnRule, columnRuleProperties, WTF_ARRAY_LENGTH(columnRuleProperties));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> StylePropertyShorthand flexFlowShorthand()
</span><span class="lines">@@ -569,9 +569,9 @@
</span><span class="cx"> return webkitBorderStartShorthand();
</span><span class="cx"> case CSSPropertyWebkitBorderRadius:
</span><span class="cx"> return borderRadiusShorthand();
</span><del>- case CSSPropertyWebkitColumns:
</del><ins>+ case CSSPropertyColumns:
</ins><span class="cx"> return webkitColumnsShorthand();
</span><del>- case CSSPropertyWebkitColumnRule:
</del><ins>+ case CSSPropertyColumnRule:
</ins><span class="cx"> return webkitColumnRuleShorthand();
</span><span class="cx"> case CSSPropertyFlex:
</span><span class="cx"> return flexShorthand();
</span><span class="lines">@@ -763,12 +763,12 @@
</span><span class="cx"> case CSSPropertyWebkitBorderStartStyle:
</span><span class="cx"> case CSSPropertyWebkitBorderStartColor:
</span><span class="cx"> return makeVector(webkitBorderStartShorthand());
</span><del>- case CSSPropertyWebkitColumnWidth:
- case CSSPropertyWebkitColumnCount:
</del><ins>+ case CSSPropertyColumnWidth:
+ case CSSPropertyColumnCount:
</ins><span class="cx"> return makeVector(webkitColumnsShorthand());
</span><del>- case CSSPropertyWebkitColumnRuleWidth:
- case CSSPropertyWebkitColumnRuleStyle:
- case CSSPropertyWebkitColumnRuleColor:
</del><ins>+ case CSSPropertyColumnRuleWidth:
+ case CSSPropertyColumnRuleStyle:
+ case CSSPropertyColumnRuleColor:
</ins><span class="cx"> return makeVector(webkitColumnRuleShorthand());
</span><span class="cx"> case CSSPropertyFlexGrow:
</span><span class="cx"> case CSSPropertyFlexShrink:
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (175420 => 175421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2014-10-31 20:41:57 UTC (rev 175420)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2014-10-31 20:42:45 UTC (rev 175421)
</span><span class="lines">@@ -1792,7 +1792,7 @@
</span><span class="cx"> case CSSPropertyBorderBottomColor:
</span><span class="cx"> case CSSPropertyColor:
</span><span class="cx"> case CSSPropertyOutlineColor:
</span><del>- case CSSPropertyWebkitColumnRuleColor:
</del><ins>+ case CSSPropertyColumnRuleColor:
</ins><span class="cx"> case CSSPropertyWebkitTextDecorationColor:
</span><span class="cx"> case CSSPropertyWebkitTextEmphasisColor:
</span><span class="cx"> case CSSPropertyWebkitTextFillColor:
</span><span class="lines">@@ -2368,8 +2368,8 @@
</span><span class="cx"> case CSSPropertyWebkitBorderEnd:
</span><span class="cx"> case CSSPropertyWebkitBorderStart:
</span><span class="cx"> case CSSPropertyWebkitBorderRadius:
</span><del>- case CSSPropertyWebkitColumns:
- case CSSPropertyWebkitColumnRule:
</del><ins>+ case CSSPropertyColumns:
+ case CSSPropertyColumnRule:
</ins><span class="cx"> case CSSPropertyFlex:
</span><span class="cx"> case CSSPropertyFlexFlow:
</span><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="lines">@@ -3093,14 +3093,14 @@
</span><span class="cx"> case CSSPropertyWebkitColumnBreakAfter:
</span><span class="cx"> case CSSPropertyWebkitColumnBreakBefore:
</span><span class="cx"> case CSSPropertyWebkitColumnBreakInside:
</span><del>- case CSSPropertyWebkitColumnCount:
- case CSSPropertyWebkitColumnGap:
- case CSSPropertyWebkitColumnProgression:
- case CSSPropertyWebkitColumnRuleColor:
- case CSSPropertyWebkitColumnRuleStyle:
- case CSSPropertyWebkitColumnRuleWidth:
- case CSSPropertyWebkitColumnSpan:
- case CSSPropertyWebkitColumnWidth:
</del><ins>+ case CSSPropertyColumnCount:
+ case CSSPropertyColumnGap:
+ case CSSPropertyColumnProgression:
+ case CSSPropertyColumnRuleColor:
+ case CSSPropertyColumnRuleStyle:
+ case CSSPropertyColumnRuleWidth:
+ case CSSPropertyColumnSpan:
+ case CSSPropertyColumnWidth:
</ins><span class="cx"> #if ENABLE(CURSOR_VISIBILITY)
</span><span class="cx"> case CSSPropertyWebkitCursorVisibility:
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationCSSPropertyAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp (175420 => 175421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2014-10-31 20:41:57 UTC (rev 175420)
+++ trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2014-10-31 20:42:45 UTC (rev 175421)
</span><span class="lines">@@ -1181,10 +1181,10 @@
</span><span class="cx"> &RenderStyle::computedFontSize,
</span><span class="cx"> #endif
</span><span class="cx"> &RenderStyle::setFontSize),
</span><del>- 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),
</del><ins>+ 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),
</ins><span class="cx"> new PropertyWrapper<short>(CSSPropertyWebkitBorderHorizontalSpacing, &RenderStyle::horizontalBorderSpacing, &RenderStyle::setHorizontalBorderSpacing),
</span><span class="cx"> new PropertyWrapper<short>(CSSPropertyWebkitBorderVerticalSpacing, &RenderStyle::verticalBorderSpacing, &RenderStyle::setVerticalBorderSpacing),
</span><span class="cx"> new PropertyWrapper<int>(CSSPropertyZIndex, &RenderStyle::zIndex, &RenderStyle::setZIndex),
</span><span class="lines">@@ -1223,7 +1223,7 @@
</span><span class="cx"> new PropertyWrapper<float>(CSSPropertyWebkitShapeImageThreshold, &RenderStyle::shapeImageThreshold, &RenderStyle::setShapeImageThreshold),
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- new PropertyWrapperVisitedAffectedColor(CSSPropertyWebkitColumnRuleColor, MaybeInvalidColor, &RenderStyle::columnRuleColor, &RenderStyle::setColumnRuleColor, &RenderStyle::visitedLinkColumnRuleColor, &RenderStyle::setVisitedLinkColumnRuleColor),
</del><ins>+ new PropertyWrapperVisitedAffectedColor(CSSPropertyColumnRuleColor, MaybeInvalidColor, &RenderStyle::columnRuleColor, &RenderStyle::setColumnRuleColor, &RenderStyle::visitedLinkColumnRuleColor, &RenderStyle::setVisitedLinkColumnRuleColor),
</ins><span class="cx"> new PropertyWrapperVisitedAffectedColor(CSSPropertyWebkitTextStrokeColor, MaybeInvalidColor, &RenderStyle::textStrokeColor, &RenderStyle::setTextStrokeColor, &RenderStyle::visitedLinkTextStrokeColor, &RenderStyle::setVisitedLinkTextStrokeColor),
</span><span class="cx"> new PropertyWrapperVisitedAffectedColor(CSSPropertyWebkitTextFillColor, MaybeInvalidColor, &RenderStyle::textFillColor, &RenderStyle::setTextFillColor, &RenderStyle::visitedLinkTextFillColor, &RenderStyle::setVisitedLinkTextFillColor),
</span><span class="cx"> new PropertyWrapperVisitedAffectedColor(CSSPropertyBorderLeftColor, MaybeInvalidColor, &RenderStyle::borderLeftColor, &RenderStyle::setBorderLeftColor, &RenderStyle::visitedLinkBorderLeftColor, &RenderStyle::setVisitedLinkBorderLeftColor),
</span><span class="lines">@@ -1285,7 +1285,7 @@
</span><span class="cx"> CSSPropertyOutline,
</span><span class="cx"> CSSPropertyPadding,
</span><span class="cx"> CSSPropertyWebkitTextStroke,
</span><del>- CSSPropertyWebkitColumnRule,
</del><ins>+ CSSPropertyColumnRule,
</ins><span class="cx"> CSSPropertyWebkitBorderRadius,
</span><span class="cx"> CSSPropertyWebkitTransformOrigin
</span><span class="cx"> };
</span><span class="lines">@@ -1297,7 +1297,7 @@
</span><span class="cx"> //
</span><span class="cx"> // Compound properties that have components that should be animatable:
</span><span class="cx"> //
</span><del>- // CSSPropertyWebkitColumns
</del><ins>+ // CSSPropertyColumns
</ins><span class="cx"> // CSSPropertyWebkitBoxReflect
</span><span class="cx">
</span><span class="cx"> // Make sure unused slots have a value
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMultiColumnSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp (175420 => 175421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp 2014-10-31 20:41:57 UTC (rev 175420)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp 2014-10-31 20:42:45 UTC (rev 175421)
</span><span class="lines">@@ -573,7 +573,7 @@
</span><span class="cx">
</span><span class="cx"> RenderMultiColumnFlowThread* flowThread = multiColumnFlowThread();
</span><span class="cx"> const RenderStyle& blockStyle = parent()->style();
</span><del>- const Color& ruleColor = blockStyle.visitedDependentColor(CSSPropertyWebkitColumnRuleColor);
</del><ins>+ const Color& ruleColor = blockStyle.visitedDependentColor(CSSPropertyColumnRuleColor);
</ins><span class="cx"> bool ruleTransparent = blockStyle.columnRuleIsTransparent();
</span><span class="cx"> EBorderStyle ruleStyle = blockStyle.columnRuleStyle();
</span><span class="cx"> LayoutUnit ruleThickness = blockStyle.columnRuleWidth();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (175420 => 175421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2014-10-31 20:41:57 UTC (rev 175420)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2014-10-31 20:42:45 UTC (rev 175421)
</span><span class="lines">@@ -1522,7 +1522,7 @@
</span><span class="cx"> case CSSPropertyOutlineColor:
</span><span class="cx"> result = visitedLink ? visitedLinkOutlineColor() : outlineColor();
</span><span class="cx"> break;
</span><del>- case CSSPropertyWebkitColumnRuleColor:
</del><ins>+ case CSSPropertyColumnRuleColor:
</ins><span class="cx"> result = visitedLink ? visitedLinkColumnRuleColor() : columnRuleColor();
</span><span class="cx"> break;
</span><span class="cx"> case CSSPropertyWebkitTextDecorationColor:
</span></span></pre>
</div>
</div>
</body>
</html>