<!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>[193527] branches/safari-601-branch</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/193527">193527</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-12-05 11:54:32 -0800 (Sat, 05 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/191178">r191178</a>. rdar://problem/23772788</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCorecssCSSComputedStyleDeclarationcpp">branches/safari-601-branch/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorecssCSSParsercpp">branches/safari-601-branch/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorecssCSSPropertyNamesin">branches/safari-601-branch/Source/WebCore/css/CSSPropertyNames.in</a></li>
<li><a href="#branchessafari601branchSourceWebCorecssStylePropertiescpp">branches/safari-601-branch/Source/WebCore/css/StyleProperties.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorecssmakeproppl">branches/safari-601-branch/Source/WebCore/css/makeprop.pl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsfastcssallkeyworddirectionexpectedhtml">branches/safari-601-branch/LayoutTests/fast/css/all-keyword-direction-expected.html</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastcssallkeyworddirectionhtml">branches/safari-601-branch/LayoutTests/fast/css/all-keyword-direction.html</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastcssallkeywordinheritexpectedhtml">branches/safari-601-branch/LayoutTests/fast/css/all-keyword-inherit-expected.html</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastcssallkeywordinherithtml">branches/safari-601-branch/LayoutTests/fast/css/all-keyword-inherit.html</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastcssallkeywordinitialexpectedhtml">branches/safari-601-branch/LayoutTests/fast/css/all-keyword-initial-expected.html</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastcssallkeywordinitialhtml">branches/safari-601-branch/LayoutTests/fast/css/all-keyword-initial.html</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastcssallkeywordunsetexpectedhtml">branches/safari-601-branch/LayoutTests/fast/css/all-keyword-unset-expected.html</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastcssallkeywordunsethtml">branches/safari-601-branch/LayoutTests/fast/css/all-keyword-unset.html</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastcssvariablesallkeywordunsetexpectedhtml">branches/safari-601-branch/LayoutTests/fast/css/variables/all-keyword-unset-expected.html</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastcssvariablesallkeywordunsethtml">branches/safari-601-branch/LayoutTests/fast/css/variables/all-keyword-unset.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193526 => 193527)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-05 19:54:25 UTC (rev 193526)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-05 19:54:32 UTC (rev 193527)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2015-12-05 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r191178. rdar://problem/23772788
+
+ 2015-10-16 David Hyatt <hyatt@apple.com>
+
+ Implement the "all" CSS property.
+ https://bugs.webkit.org/show_bug.cgi?id=116966
+
+ Reviewed by Zalan Bujtas.
+
+ Added tests for the "all property, including a variables test!
+
+ * fast/css/all-keyword-direction-expected.html: Added.
+ * fast/css/all-keyword-direction.html: Added.
+ * fast/css/all-keyword-inherit-expected.html: Added.
+ * fast/css/all-keyword-inherit.html: Added.
+ * fast/css/all-keyword-initial-expected.html: Added.
+ * fast/css/all-keyword-initial.html: Added.
+ * fast/css/all-keyword-unset-expected.html: Added.
+ * fast/css/all-keyword-unset.html: Added.
+ * fast/css/variables/all-keyword-unset-expected.html: Added.
+ * fast/css/variables/all-keyword-unset.html: Added.
+
+2015-12-05 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r191151. rdar://problem/23772904
</span><span class="cx">
</span><span class="cx"> 2015-10-15 David Hyatt <hyatt@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastcssallkeyworddirectionexpectedhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/fast/css/all-keyword-direction-expected.html (0 => 193527)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/css/all-keyword-direction-expected.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/css/all-keyword-direction-expected.html 2015-12-05 19:54:32 UTC (rev 193527)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+<head>
+<style>
+html {
+ font-size: small;
+ background-color: #F0F0F0;
+ color: blue;
+}
+
+span { direction:rtl; }
+</style>
+</head>
+<body>
+<span id="quote">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</span> Phasellus eget velit sagittis.
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastcssallkeyworddirectionhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/fast/css/all-keyword-direction.html (0 => 193527)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/css/all-keyword-direction.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/css/all-keyword-direction.html 2015-12-05 19:54:32 UTC (rev 193527)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<head>
+<style>
+html {
+ font-size: small;
+ background-color: #F0F0F0;
+ color: blue;
+}
+
+blockquote {
+ background-color: skyblue;
+ color: red;
+ direction:rtl;
+ all: unset;
+}
+</style>
+</head>
+<body>
+<blockquote id="quote">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</blockquote> Phasellus eget velit sagittis.
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastcssallkeywordinheritexpectedhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/fast/css/all-keyword-inherit-expected.html (0 => 193527)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/css/all-keyword-inherit-expected.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/css/all-keyword-inherit-expected.html 2015-12-05 19:54:32 UTC (rev 193527)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+<head>
+<style>
+html {
+ font-size: small;
+ background-color: #F0F0F0;
+ color: blue;
+}
+</style>
+</head>
+<body>
+<div id="quote">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</div> Phasellus eget velit sagittis.
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastcssallkeywordinherithtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/fast/css/all-keyword-inherit.html (0 => 193527)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/css/all-keyword-inherit.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/css/all-keyword-inherit.html 2015-12-05 19:54:32 UTC (rev 193527)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<head>
+<style>
+html {
+ font-size: small;
+ background-color: #F0F0F0;
+ color: blue;
+}
+
+blockquote {
+ background-color: skyblue;
+ color: red;
+ all:inherit;
+}
+</style>
+</head>
+<body>
+<div>
+<blockquote id="quote">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</blockquote> Phasellus eget velit sagittis.
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastcssallkeywordinitialexpectedhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/fast/css/all-keyword-initial-expected.html (0 => 193527)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/css/all-keyword-initial-expected.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/css/all-keyword-initial-expected.html 2015-12-05 19:54:32 UTC (rev 193527)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+<head>
+<style>
+html {
+ font-size: small;
+ background-color: #F0F0F0;
+ color: blue;
+}
+
+span { font: initial; color:initial }
+</style>
+</head>
+<body>
+<span>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</span> Phasellus eget velit sagittis.
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastcssallkeywordinitialhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/fast/css/all-keyword-initial.html (0 => 193527)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/css/all-keyword-initial.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/css/all-keyword-initial.html 2015-12-05 19:54:32 UTC (rev 193527)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<head>
+<style>
+html {
+ font-size: small;
+ background-color: #F0F0F0;
+ color: blue;
+}
+
+blockquote {
+ background-color: skyblue;
+ color: red;
+ all: initial;
+}
+</style>
+</head>
+<body>
+<blockquote id="quote">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</blockquote> Phasellus eget velit sagittis.
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastcssallkeywordunsetexpectedhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/fast/css/all-keyword-unset-expected.html (0 => 193527)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/css/all-keyword-unset-expected.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/css/all-keyword-unset-expected.html 2015-12-05 19:54:32 UTC (rev 193527)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+<head>
+<style>
+html {
+ font-size: small;
+ background-color: #F0F0F0;
+ color: blue;
+}
+</style>
+</head>
+<body>
+<span id="quote">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</span> Phasellus eget velit sagittis.
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastcssallkeywordunsethtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/fast/css/all-keyword-unset.html (0 => 193527)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/css/all-keyword-unset.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/css/all-keyword-unset.html 2015-12-05 19:54:32 UTC (rev 193527)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<head>
+<style>
+html {
+ font-size: small;
+ background-color: #F0F0F0;
+ color: blue;
+}
+
+blockquote {
+ background-color: skyblue;
+ color: red;
+ all: unset;
+}
+</style>
+</head>
+<body>
+<blockquote id="quote">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</blockquote> Phasellus eget velit sagittis.
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastcssvariablesallkeywordunsetexpectedhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/fast/css/variables/all-keyword-unset-expected.html (0 => 193527)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/css/variables/all-keyword-unset-expected.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/css/variables/all-keyword-unset-expected.html 2015-12-05 19:54:32 UTC (rev 193527)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+<head>
+<style>
+html {
+ font-size: small;
+ background-color: #F0F0F0;
+ color: blue;
+}
+</style>
+</head>
+<body>
+<span id="quote">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</span> Phasellus eget velit sagittis.
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastcssvariablesallkeywordunsethtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/fast/css/variables/all-keyword-unset.html (0 => 193527)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/css/variables/all-keyword-unset.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/css/variables/all-keyword-unset.html 2015-12-05 19:54:32 UTC (rev 193527)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<head>
+<style>
+html {
+ font-size: small;
+ background-color: #F0F0F0;
+ color: blue;
+ --a: unset;
+}
+
+blockquote {
+ background-color: skyblue;
+ color: red;
+ all: var(--a);
+}
+</style>
+</head>
+<body>
+<blockquote id="quote">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</blockquote> Phasellus eget velit sagittis.
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193526 => 193527)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-05 19:54:25 UTC (rev 193526)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-05 19:54:32 UTC (rev 193527)
</span><span class="lines">@@ -1,5 +1,45 @@
</span><span class="cx"> 2015-12-05 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r191178. rdar://problem/23772788
+
+ 2015-10-16 David Hyatt <hyatt@apple.com>
+
+ Implement the "all" CSS property.
+ https://bugs.webkit.org/show_bug.cgi?id=116966
+
+ Reviewed by Zalan Bujtas.
+
+ Added new tests in fast/css.
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::ComputedStyleExtractor::propertyValue):
+ Don't support "all" from computed style for now.
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseValue):
+ Make sure to bail after checking inherit/unset/initial for all, since you can't actually
+ accept longhand values in the shorthand declarations.
+
+ (WebCore::CSSParser::parseAnimationProperty):
+ "all" for animations is a special value and should not be confused with the property. It
+ animates everything and does not omit unicode-bidi/direction the way the "all" property does.
+
+ * css/CSSPropertyNames.in:
+ Add the "all" property to the list and use a special keyword in the Longhands value, "all",
+ that makeprop.pl will look for. This way we don't have to dump every single CSS property
+ into the Longhands expression, since that would be nuts.
+
+ * css/StyleProperties.cpp:
+ (WebCore::StyleProperties::getPropertyValue):
+ Look for a common value across all properties supported by "all". That way you can get
+ back inherit/initial/unset from it.
+
+ * css/makeprop.pl:
+ Make the perl script look for "all" in the longhand list, and if it sees it, put every
+ single CSS property into the list for the all shorthand.
+
+2015-12-05 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r191155. rdar://problem/23772908
</span><span class="cx">
</span><span class="cx"> 2015-10-15 David Hyatt <hyatt@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (193526 => 193527)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2015-12-05 19:54:25 UTC (rev 193526)
+++ branches/safari-601-branch/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2015-12-05 19:54:32 UTC (rev 193527)
</span><span class="lines">@@ -3239,6 +3239,7 @@
</span><span class="cx"> return zoomAdjustedPixelValueForLength(style->svgStyle().y(), *style);
</span><span class="cx">
</span><span class="cx"> /* Unimplemented CSS 3 properties (including CSS3 shorthand properties) */
</span><ins>+ case CSSPropertyAll:
</ins><span class="cx"> case CSSPropertyAnimation:
</span><span class="cx"> case CSSPropertyWebkitTextEmphasis:
</span><span class="cx"> case CSSPropertyTextLineThrough:
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/css/CSSParser.cpp (193526 => 193527)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/css/CSSParser.cpp 2015-12-05 19:54:25 UTC (rev 193526)
+++ branches/safari-601-branch/Source/WebCore/css/CSSParser.cpp 2015-12-05 19:54:32 UTC (rev 193527)
</span><span class="lines">@@ -1954,6 +1954,9 @@
</span><span class="cx"> addExpandedPropertyForValue(propId, cssValuePool.createUnsetValue(), important);
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><ins>+
+ if (propId == CSSPropertyAll)
+ return false; // "all" doesn't allow you to specify anything other than inherit/initial/unset.
</ins><span class="cx">
</span><span class="cx"> if (isKeywordPropertyID(propId)) {
</span><span class="cx"> if (!isValidKeywordPropertyAndValue(propId, id, m_context, m_styleSheet))
</span><span class="lines">@@ -5053,7 +5056,7 @@
</span><span class="cx"> if (value.unit != CSSPrimitiveValue::CSS_IDENT)
</span><span class="cx"> return nullptr;
</span><span class="cx"> CSSPropertyID result = cssPropertyID(value.string);
</span><del>- if (result)
</del><ins>+ if (result && result != CSSPropertyAll) // "all" value in animation is not equivalent to the all property.
</ins><span class="cx"> return cssValuePool().createIdentifierValue(result);
</span><span class="cx"> if (equalIgnoringCase(value, "all")) {
</span><span class="cx"> context.sawAnimationPropertyKeyword();
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/css/CSSPropertyNames.in (193526 => 193527)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/css/CSSPropertyNames.in 2015-12-05 19:54:25 UTC (rev 193526)
+++ branches/safari-601-branch/Source/WebCore/css/CSSPropertyNames.in 2015-12-05 19:54:32 UTC (rev 193527)
</span><span class="lines">@@ -125,6 +125,7 @@
</span><span class="cx">
</span><span class="cx"> // The remaining properties are listed in alphabetical order
</span><span class="cx"> alignment-baseline [SVG]
</span><ins>+all [Longhands=all]
</ins><span class="cx"> animation [Longhands=animation-name|animation-duration|animation-timing-function|animation-delay|animation-iteration-count|animation-direction|animation-fill-mode]
</span><span class="cx"> animation-delay [AnimationProperty, NameForMethods=Delay]
</span><span class="cx"> animation-direction [AnimationProperty, NameForMethods=Direction]
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorecssStylePropertiescpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/css/StyleProperties.cpp (193526 => 193527)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/css/StyleProperties.cpp 2015-12-05 19:54:25 UTC (rev 193526)
+++ branches/safari-601-branch/Source/WebCore/css/StyleProperties.cpp 2015-12-05 19:54:32 UTC (rev 193527)
</span><span class="lines">@@ -127,6 +127,8 @@
</span><span class="cx">
</span><span class="cx"> // Shorthand and 4-values properties
</span><span class="cx"> switch (propertyID) {
</span><ins>+ case CSSPropertyAll:
+ return getCommonValue(allShorthand());
</ins><span class="cx"> case CSSPropertyAnimation:
</span><span class="cx"> return getLayeredShorthandValue(animationShorthand());
</span><span class="cx"> case CSSPropertyBorderSpacing:
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorecssmakeproppl"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/css/makeprop.pl (193526 => 193527)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/css/makeprop.pl 2015-12-05 19:54:25 UTC (rev 193526)
+++ branches/safari-601-branch/Source/WebCore/css/makeprop.pl 2015-12-05 19:54:32 UTC (rev 193527)
</span><span class="lines">@@ -960,9 +960,19 @@
</span><span class="cx"> print SHORTHANDS_CPP "{\n";
</span><span class="cx"> print SHORTHANDS_CPP " static const CSSPropertyID " . $lowercaseId . "Properties[] = {\n";
</span><span class="cx"> foreach (@longhands) {
</span><del>- die "Unknown CSS property used in Longhands: " . $nameToId{$_} if !exists($nameToId{$_});
- push(@{$longhandToShorthands{$_}}, $name);
- print SHORTHANDS_CPP " CSSProperty" . $nameToId{$_} . ",\n";
</del><ins>+ if ($_ eq "all") {
+ foreach my $propname (@names) {
+ next if (exists $propertiesWithStyleBuilderOptions{$propname}{"Longhands"});
+ next if ($propname eq "direction" || $propname eq "unicode-bidi");
+ die "Unknown CSS property used in all shorthand: " . $nameToId{$propname} if !exists($nameToId{$propname});
+ push(@{$longhandToShorthands{$propname}}, $name);
+ print SHORTHANDS_CPP " CSSProperty" . $nameToId{$propname} . ",\n";
+ }
+ } else {
+ die "Unknown CSS property used in Longhands: " . $nameToId{$_} if !exists($nameToId{$_});
+ push(@{$longhandToShorthands{$_}}, $name);
+ print SHORTHANDS_CPP " CSSProperty" . $nameToId{$_} . ",\n";
+ }
</ins><span class="cx"> }
</span><span class="cx"> print SHORTHANDS_CPP " };\n";
</span><span class="cx"> print SHORTHANDS_CPP " return StylePropertyShorthand(CSSProperty" . $nameToId{$name} . ", " . $lowercaseId . "Properties);\n";
</span></span></pre>
</div>
</div>
</body>
</html>