<!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>[193561] branches/safari-601.1.46-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/193561">193561</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-12-05 23:04:51 -0800 (Sat, 05 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/191151">r191151</a>. rdar://problem/23772885</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsChangeLog">branches/safari-601.1.46-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601146branchLayoutTestsTestExpectations">branches/safari-601.1.46-branch/LayoutTests/TestExpectations</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreCMakeListstxt">branches/safari-601.1.46-branch/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreChangeLog">branches/safari-601.1.46-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreWebCorexcodeprojprojectpbxproj">branches/safari-601.1.46-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#branchessafari601146branchSourceWebCorebindingsobjcDOMCSSmm">branches/safari-601.1.46-branch/Source/WebCore/bindings/objc/DOMCSS.mm</a></li>
<li><a href="#branchessafari601146branchSourceWebCorecssCSSParsercpp">branches/safari-601.1.46-branch/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCorecssCSSToStyleMapcpp">branches/safari-601.1.46-branch/Source/WebCore/css/CSSToStyleMap.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCorecssCSSValuecpp">branches/safari-601.1.46-branch/Source/WebCore/css/CSSValue.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCorecssCSSValueh">branches/safari-601.1.46-branch/Source/WebCore/css/CSSValue.h</a></li>
<li><a href="#branchessafari601146branchSourceWebCorecssCSSValueKeywordsin">branches/safari-601.1.46-branch/Source/WebCore/css/CSSValueKeywords.in</a></li>
<li><a href="#branchessafari601146branchSourceWebCorecssCSSValuePoolcpp">branches/safari-601.1.46-branch/Source/WebCore/css/CSSValuePool.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCorecssCSSValuePoolh">branches/safari-601.1.46-branch/Source/WebCore/css/CSSValuePool.h</a></li>
<li><a href="#branchessafari601146branchSourceWebCorecssStyleResolvercpp">branches/safari-601.1.46-branch/Source/WebCore/css/StyleResolver.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsfastcssunsetkeywordexpectedhtml">branches/safari-601.1.46-branch/LayoutTests/fast/css/unset-keyword-expected.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfastcssunsetkeywordhtml">branches/safari-601.1.46-branch/LayoutTests/fast/css/unset-keyword.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfastcssvariablestestsuite129expectedhtml">branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/129-expected.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfastcssvariablestestsuite129html">branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/129.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfastcssvariablestestsuite130expectedhtml">branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/130-expected.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfastcssvariablestestsuite130html">branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/130.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfastcssvariablestestsuite134expectedhtml">branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/134-expected.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfastcssvariablestestsuite134html">branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/134.html</a></li>
<li><a href="#branchessafari601146branchSourceWebCorecssCSSUnsetValuecpp">branches/safari-601.1.46-branch/Source/WebCore/css/CSSUnsetValue.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCorecssCSSUnsetValueh">branches/safari-601.1.46-branch/Source/WebCore/css/CSSUnsetValue.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsfastcssvariablestestsuitefailures129expectedhtml">branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/failures/129-expected.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfastcssvariablestestsuitefailures129html">branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/failures/129.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfastcssvariablestestsuitefailures130expectedhtml">branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/failures/130-expected.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfastcssvariablestestsuitefailures130html">branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/failures/130.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfastcssvariablestestsuitefailures134expectedhtml">branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/failures/134-expected.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfastcssvariablestestsuitefailures134html">branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/failures/134.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (193560 => 193561)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-12-06 06:24:18 UTC (rev 193560)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-12-06 07:04:51 UTC (rev 193561)
</span><span class="lines">@@ -1,5 +1,37 @@
</span><span class="cx"> 2015-12-05 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r191151.
+
+ 2015-10-15 David Hyatt <hyatt@apple.com>
+
+ Add support for the CSS 'unset' keyword.
+ https://bugs.webkit.org/show_bug.cgi?id=148614
+
+ Reviewed by Dean Jackson.
+
+ * TestExpectations:
+ Remove the 3 failing variables tests that used the unset keyword now that they pass.
+
+ * fast/css/unset-keyword-expected.html: Added.
+ * fast/css/unset-keyword.html: Added.
+ New test for both inherited and initial properties.
+
+ * fast/css/variables/test-suite/129-expected.html: Added.
+ * fast/css/variables/test-suite/129.html: Added.
+ * fast/css/variables/test-suite/130-expected.html: Added.
+ * fast/css/variables/test-suite/130.html: Added.
+ * fast/css/variables/test-suite/134-expected.html: Added.
+ * fast/css/variables/test-suite/134.html: Added.
+ * fast/css/variables/test-suite/failures/129-expected.html: Removed.
+ * fast/css/variables/test-suite/failures/129.html: Removed.
+ * fast/css/variables/test-suite/failures/130-expected.html: Removed.
+ * fast/css/variables/test-suite/failures/130.html: Removed.
+ * fast/css/variables/test-suite/failures/134-expected.html: Removed.
+ * fast/css/variables/test-suite/failures/134.html: Removed.
+ Move these tests into the passing directory.
+
+2015-12-05 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r191128.
</span><span class="cx">
</span><span class="cx"> 2015-10-14 David Hyatt <hyatt@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/TestExpectations (193560 => 193561)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/TestExpectations 2015-12-06 06:24:18 UTC (rev 193560)
+++ branches/safari-601.1.46-branch/LayoutTests/TestExpectations 2015-12-06 07:04:51 UTC (rev 193561)
</span><span class="lines">@@ -572,9 +572,6 @@
</span><span class="cx"> webkit.org/b/150183 fast/css/variables/test-suite/failures/111.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/150183 fast/css/variables/test-suite/failures/115.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/150183 fast/css/variables/test-suite/failures/126.html [ ImageOnlyFailure ]
</span><del>-webkit.org/b/150183 fast/css/variables/test-suite/failures/129.html [ ImageOnlyFailure ]
-webkit.org/b/150183 fast/css/variables/test-suite/failures/130.html [ ImageOnlyFailure ]
-webkit.org/b/150183 fast/css/variables/test-suite/failures/134.html [ ImageOnlyFailure ]
</del><span class="cx"> webkit.org/b/150183 fast/css/variables/test-suite/failures/152.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/150183 fast/css/variables/test-suite/failures/159.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/150183 fast/css/variables/test-suite/failures/161.html [ ImageOnlyFailure ]
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastcssunsetkeywordexpectedhtmlfromrev193525branchessafari601branchLayoutTestsfastcssunsetkeywordexpectedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46-branch/LayoutTests/fast/css/unset-keyword-expected.html (from rev 193525, branches/safari-601-branch/LayoutTests/fast/css/unset-keyword-expected.html) (0 => 193561)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/css/unset-keyword-expected.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/css/unset-keyword-expected.html 2015-12-06 07:04:51 UTC (rev 193561)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<head>
+<style>
+body { color: green; background-color:#ccc; }
+p { border-left:5px solid black; border-right:5px solid black; }
+</style>
+</head>
+<body>
+This text should be green on a grey background and have only side borders.
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastcssunsetkeywordhtmlfromrev193525branchessafari601branchLayoutTestsfastcssunsetkeywordhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46-branch/LayoutTests/fast/css/unset-keyword.html (from rev 193525, branches/safari-601-branch/LayoutTests/fast/css/unset-keyword.html) (0 => 193561)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/css/unset-keyword.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/css/unset-keyword.html 2015-12-06 07:04:51 UTC (rev 193561)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<head>
+<style>
+body { color: green; background-color:#ccc; }
+p { border:5px solid black; color: orange; color:unset; background-color:blue; background-color:unset; border-top:unset; border-bottom:unset; }
+</style>
+</head>
+<body>
+This text should be green on a grey background and have only side borders.
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastcssvariablestestsuite129expectedhtmlfromrev193525branchessafari601branchLayoutTestsfastcssvariablestestsuite129expectedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/129-expected.html (from rev 193525, branches/safari-601-branch/LayoutTests/fast/css/variables/test-suite/129-expected.html) (0 => 193561)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/129-expected.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/129-expected.html 2015-12-06 07:04:51 UTC (rev 193561)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+<!DOCTYPE html>
+<!--
+ Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/
+--><html><head><title>CSS Reftest Reference</title>
+<link href="mailto:cam@mcc.id.au" rel="author" title="Cameron McCormack">
+<style>
+p {
+ color: green;
+}
+</style>
+</head><body><p>This text must be green.</p>
+</body></html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastcssvariablestestsuite129htmlfromrev193525branchessafari601branchLayoutTestsfastcssvariablestestsuite129html"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/129.html (from rev 193525, branches/safari-601-branch/LayoutTests/fast/css/variables/test-suite/129.html) (0 => 193561)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/129.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/129.html 2015-12-06 07:04:51 UTC (rev 193561)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+<!DOCTYPE html>
+<!--
+ Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/
+--><html><head><title>CSS Test: Test declaring a variable whose value is "unset" where there is a variable to inherit from.</title>
+<link href="mailto:cam@mcc.id.au" rel="author" title="Cameron McCormack">
+<link href="http://www.w3.org/TR/css-variables-1/#defining-variables" rel="help">
+<link href="support/color-green-ref.htm" rel="match">
+<style>
+body {
+ --a: green;
+ color: crimson;
+}
+p {
+ color: red;
+}
+p {
+ color: orange;
+ --a: unset;
+ color: var(--a);
+}
+</style>
+</head><body><p>This text must be green.</p>
+</body></html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastcssvariablestestsuite130expectedhtmlfromrev193525branchessafari601branchLayoutTestsfastcssvariablestestsuite130expectedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/130-expected.html (from rev 193525, branches/safari-601-branch/LayoutTests/fast/css/variables/test-suite/130-expected.html) (0 => 193561)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/130-expected.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/130-expected.html 2015-12-06 07:04:51 UTC (rev 193561)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+<!DOCTYPE html>
+<!--
+ Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/
+--><html><head><title>CSS Reftest Reference</title>
+<link href="mailto:cam@mcc.id.au" rel="author" title="Cameron McCormack">
+<style>
+p {
+ color: green;
+}
+</style>
+</head><body><p>This text must be green.</p>
+</body></html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastcssvariablestestsuite130htmlfromrev193525branchessafari601branchLayoutTestsfastcssvariablestestsuite130html"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/130.html (from rev 193525, branches/safari-601-branch/LayoutTests/fast/css/variables/test-suite/130.html) (0 => 193561)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/130.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/130.html 2015-12-06 07:04:51 UTC (rev 193561)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+<!DOCTYPE html>
+<!--
+ Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/
+--><html><head><title>CSS Test: Test declaring a variable whose value consists of a reference to a variable whose value is "unset".</title>
+<link href="mailto:cam@mcc.id.au" rel="author" title="Cameron McCormack">
+<link href="http://www.w3.org/TR/css-variables-1/#defining-variables" rel="help">
+<link href="support/color-green-ref.htm" rel="match">
+<style>
+body {
+ --b: green;
+ color: crimson;
+}
+p {
+ color: red;
+}
+p {
+ color: orange;
+ --a: var(--b);
+ --b: unset;
+ color: var(--a);
+}
+</style>
+</head><body><p>This text must be green.</p>
+</body></html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastcssvariablestestsuite134expectedhtmlfromrev193525branchessafari601branchLayoutTestsfastcssvariablestestsuite134expectedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/134-expected.html (from rev 193525, branches/safari-601-branch/LayoutTests/fast/css/variables/test-suite/134-expected.html) (0 => 193561)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/134-expected.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/134-expected.html 2015-12-06 07:04:51 UTC (rev 193561)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+<!DOCTYPE html>
+<!--
+ Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/
+--><html><head><title>CSS Reftest Reference</title>
+<link href="mailto:cam@mcc.id.au" rel="author" title="Cameron McCormack">
+<style>
+p {
+ color: green;
+}
+</style>
+</head><body><p>This text must be green.</p>
+</body></html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastcssvariablestestsuite134htmlfromrev193525branchessafari601branchLayoutTestsfastcssvariablestestsuite134html"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/134.html (from rev 193525, branches/safari-601-branch/LayoutTests/fast/css/variables/test-suite/134.html) (0 => 193561)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/134.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/134.html 2015-12-06 07:04:51 UTC (rev 193561)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+<!DOCTYPE html>
+<!--
+ Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/
+--><html><head><title>CSS Test: Test declaring a variable whose value is "unset" where there is no variable to inherit from.</title>
+<link href="mailto:cam@mcc.id.au" rel="author" title="Cameron McCormack">
+<link href="http://www.w3.org/TR/css-variables-1/#defining-variables" rel="help">
+<link href="support/color-green-ref.htm" rel="match">
+<style>
+p {
+ color: red;
+}
+p {
+ color: orange;
+ --a: unset;
+ color: var(--a,green);
+}
+</style>
+</head><body><p>This text must be green.</p>
+</body></html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastcssvariablestestsuitefailures129expectedhtml"></a>
<div class="delfile"><h4>Deleted: branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/failures/129-expected.html (193560 => 193561)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/failures/129-expected.html 2015-12-06 06:24:18 UTC (rev 193560)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/failures/129-expected.html 2015-12-06 07:04:51 UTC (rev 193561)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-<!DOCTYPE html>
-<!--
- Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/
---><html><head><title>CSS Reftest Reference</title>
-<link href="mailto:cam@mcc.id.au" rel="author" title="Cameron McCormack">
-<style>
-p {
- color: green;
-}
-</style>
-</head><body><p>This text must be green.</p>
-</body></html>
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastcssvariablestestsuitefailures129html"></a>
<div class="delfile"><h4>Deleted: branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/failures/129.html (193560 => 193561)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/failures/129.html 2015-12-06 06:24:18 UTC (rev 193560)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/failures/129.html 2015-12-06 07:04:51 UTC (rev 193561)
</span><span class="lines">@@ -1,24 +0,0 @@
</span><del>-<!DOCTYPE html>
-<!--
- Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/
---><html><head><title>CSS Test: Test declaring a variable whose value is "unset" where there is a variable to inherit from.</title>
-<link href="mailto:cam@mcc.id.au" rel="author" title="Cameron McCormack">
-<link href="http://www.w3.org/TR/css-variables-1/#defining-variables" rel="help">
-<link href="support/color-green-ref.htm" rel="match">
-<style>
-body {
- --a: green;
- color: crimson;
-}
-p {
- color: red;
-}
-p {
- color: orange;
- --a: unset;
- color: var(--a);
-}
-</style>
-</head><body><p>This text must be green.</p>
-</body></html>
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastcssvariablestestsuitefailures130expectedhtml"></a>
<div class="delfile"><h4>Deleted: branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/failures/130-expected.html (193560 => 193561)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/failures/130-expected.html 2015-12-06 06:24:18 UTC (rev 193560)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/failures/130-expected.html 2015-12-06 07:04:51 UTC (rev 193561)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-<!DOCTYPE html>
-<!--
- Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/
---><html><head><title>CSS Reftest Reference</title>
-<link href="mailto:cam@mcc.id.au" rel="author" title="Cameron McCormack">
-<style>
-p {
- color: green;
-}
-</style>
-</head><body><p>This text must be green.</p>
-</body></html>
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastcssvariablestestsuitefailures130html"></a>
<div class="delfile"><h4>Deleted: branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/failures/130.html (193560 => 193561)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/failures/130.html 2015-12-06 06:24:18 UTC (rev 193560)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/failures/130.html 2015-12-06 07:04:51 UTC (rev 193561)
</span><span class="lines">@@ -1,25 +0,0 @@
</span><del>-<!DOCTYPE html>
-<!--
- Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/
---><html><head><title>CSS Test: Test declaring a variable whose value consists of a reference to a variable whose value is "unset".</title>
-<link href="mailto:cam@mcc.id.au" rel="author" title="Cameron McCormack">
-<link href="http://www.w3.org/TR/css-variables-1/#defining-variables" rel="help">
-<link href="support/color-green-ref.htm" rel="match">
-<style>
-body {
- --b: green;
- color: crimson;
-}
-p {
- color: red;
-}
-p {
- color: orange;
- --a: var(--b);
- --b: unset;
- color: var(--a);
-}
-</style>
-</head><body><p>This text must be green.</p>
-</body></html>
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastcssvariablestestsuitefailures134expectedhtml"></a>
<div class="delfile"><h4>Deleted: branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/failures/134-expected.html (193560 => 193561)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/failures/134-expected.html 2015-12-06 06:24:18 UTC (rev 193560)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/failures/134-expected.html 2015-12-06 07:04:51 UTC (rev 193561)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-<!DOCTYPE html>
-<!--
- Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/
---><html><head><title>CSS Reftest Reference</title>
-<link href="mailto:cam@mcc.id.au" rel="author" title="Cameron McCormack">
-<style>
-p {
- color: green;
-}
-</style>
-</head><body><p>This text must be green.</p>
-</body></html>
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastcssvariablestestsuitefailures134html"></a>
<div class="delfile"><h4>Deleted: branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/failures/134.html (193560 => 193561)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/failures/134.html 2015-12-06 06:24:18 UTC (rev 193560)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/css/variables/test-suite/failures/134.html 2015-12-06 07:04:51 UTC (rev 193561)
</span><span class="lines">@@ -1,20 +0,0 @@
</span><del>-<!DOCTYPE html>
-<!--
- Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/
---><html><head><title>CSS Test: Test declaring a variable whose value is "unset" where there is no variable to inherit from.</title>
-<link href="mailto:cam@mcc.id.au" rel="author" title="Cameron McCormack">
-<link href="http://www.w3.org/TR/css-variables-1/#defining-variables" rel="help">
-<link href="support/color-green-ref.htm" rel="match">
-<style>
-p {
- color: red;
-}
-p {
- color: orange;
- --a: unset;
- color: var(--a,green);
-}
-</style>
-</head><body><p>This text must be green.</p>
-</body></html>
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/CMakeLists.txt (193560 => 193561)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/CMakeLists.txt 2015-12-06 06:24:18 UTC (rev 193560)
+++ branches/safari-601.1.46-branch/Source/WebCore/CMakeLists.txt 2015-12-06 07:04:51 UTC (rev 193561)
</span><span class="lines">@@ -1313,6 +1313,7 @@
</span><span class="cx"> css/CSSToLengthConversionData.cpp
</span><span class="cx"> css/CSSToStyleMap.cpp
</span><span class="cx"> css/CSSUnicodeRangeValue.cpp
</span><ins>+ css/CSSUnsetValue.cpp
</ins><span class="cx"> css/CSSValue.cpp
</span><span class="cx"> css/CSSValueList.cpp
</span><span class="cx"> css/CSSValuePool.cpp
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (193560 => 193561)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-06 06:24:18 UTC (rev 193560)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-06 07:04:51 UTC (rev 193561)
</span><span class="lines">@@ -1,5 +1,93 @@
</span><span class="cx"> 2015-12-05 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r191151.
+
+ 2015-10-15 David Hyatt <hyatt@apple.com>
+
+ Add support for the CSS 'unset' keyword.
+ https://bugs.webkit.org/show_bug.cgi?id=148614
+
+ Reviewed by Dean Jackson.
+
+ Added new test in fast/css, and existing variables tests also use unset in several tests.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ Add CSSUnsetValue.cpp to the project.
+
+ * bindings/objc/DOMCSS.mm:
+ (kitClass):
+ Make sure UNSET is handled in the switch.
+
+ * css/CSSParser.cpp:
+ (WebCore::parseKeywordValue):
+ (WebCore::CSSParser::parseValue):
+ (WebCore::CSSParser::parseCustomPropertyDeclaration):
+ Add cases to create a CSSUnsetValue properly.
+
+ * css/CSSToStyleMap.cpp:
+ (WebCore::CSSToStyleMap::styleImage):
+ (WebCore::CSSToStyleMap::mapFillAttachment):
+ (WebCore::CSSToStyleMap::mapFillClip):
+ (WebCore::CSSToStyleMap::mapFillComposite):
+ (WebCore::CSSToStyleMap::mapFillBlendMode):
+ (WebCore::CSSToStyleMap::mapFillOrigin):
+ (WebCore::CSSToStyleMap::mapFillImage):
+ (WebCore::CSSToStyleMap::mapFillRepeatX):
+ (WebCore::CSSToStyleMap::mapFillRepeatY):
+ (WebCore::convertToLengthSize):
+ (WebCore::CSSToStyleMap::mapFillSize):
+ (WebCore::CSSToStyleMap::mapFillXPosition):
+ (WebCore::CSSToStyleMap::mapFillYPosition):
+ (WebCore::CSSToStyleMap::mapFillMaskSourceType):
+ (WebCore::CSSToStyleMap::mapAnimationDelay):
+ (WebCore::CSSToStyleMap::mapAnimationDirection):
+ (WebCore::CSSToStyleMap::mapAnimationDuration):
+ (WebCore::CSSToStyleMap::mapAnimationFillMode):
+ (WebCore::CSSToStyleMap::mapAnimationIterationCount):
+ (WebCore::CSSToStyleMap::mapAnimationName):
+ (WebCore::CSSToStyleMap::mapAnimationPlayState):
+ (WebCore::CSSToStyleMap::mapAnimationProperty):
+ (WebCore::CSSToStyleMap::mapAnimationTimingFunction):
+ (WebCore::CSSToStyleMap::mapAnimationTrigger):
+ The background and animation functions need to check for unset and be able to map it properly to initial. This is done
+ with a new treatAsInitial method on CSSValue that can take the property ID and check for both initial
+ or unset on a non-inherited property.
+
+ * css/CSSUnsetValue.cpp: Added.
+ (WebCore::CSSUnsetValue::customCSSText):
+ * css/CSSUnsetValue.h: Added.
+ (WebCore::CSSUnsetValue::create):
+ (WebCore::CSSUnsetValue::equals):
+ (WebCore::CSSUnsetValue::CSSUnsetValue):
+ This new value looks exactly like CSSInheritedValue and CSSInitialValue.
+
+ * css/CSSValue.cpp:
+ (WebCore::CSSValue::cssValueType):
+ (WebCore::CSSValue::cssText):
+ (WebCore::CSSValue::destroy):
+ (WebCore::CSSValue::isInvalidCustomPropertyValue):
+ (WebCore::CSSValue::treatAsInheritedValue):
+ (WebCore::CSSValue::treatAsInitialValue):
+ * css/CSSValue.h:
+ (WebCore::CSSValue::isUnsetValue):
+ Add isUnsetValue and the UnsetClass. Add support for treatAsInheritedValue and treatAsInitialValue to have
+ a way to query for initial/inherit or the matching unset type.
+
+ * css/CSSValueKeywords.in:
+ Add the unset keyword.
+
+ * css/CSSValuePool.cpp:
+ (WebCore::CSSValuePool::CSSValuePool):
+ * css/CSSValuePool.h:
+ (WebCore::CSSValuePool::createUnsetValue):
+ Have a singleton model for unset just like we do for inherit/initial.
+
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::applyProperty):
+ Handle unset correctly. It maps to inherit for inherited properties and initial for non-inherited ones.
+
+2015-12-05 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r191825.
</span><span class="cx">
</span><span class="cx"> 2015-10-30 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj (193560 => 193561)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-12-06 06:24:18 UTC (rev 193560)
+++ branches/safari-601.1.46-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-12-06 07:04:51 UTC (rev 193561)
</span><span class="lines">@@ -2548,8 +2548,6 @@
</span><span class="cx"> 7C48A6D1191C9D6500026674 /* WebKitNamespace.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C48A6CF191C9D6500026674 /* WebKitNamespace.h */; };
</span><span class="cx"> 7C4902A218B825F8007D9298 /* DOMWheelEventInternal.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 85989DCA0ACC8BBD00A0BC51 /* DOMWheelEventInternal.h */; };
</span><span class="cx"> 7C4C96DC1AD4483500365A50 /* JSReadableStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C4C96D81AD4483500365A50 /* JSReadableStream.cpp */; };
</span><del>- 7C4C96DC1AD4483500365A51 /* ReadableStreamBuiltins.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C4C96D81AD4483500365A51 /* ReadableStreamBuiltins.cpp */; };
- 7C4C96DC1AD4483500365A52 /* CountQueuingStrategyBuiltins.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C4C96D81AD4483500365A52 /* CountQueuingStrategyBuiltins.cpp */; };
</del><span class="cx"> 7C4C96DD1AD4483500365A50 /* JSReadableStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C4C96D91AD4483500365A50 /* JSReadableStream.h */; };
</span><span class="cx"> 7C4C96DE1AD4483500365A50 /* JSReadableStreamReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C4C96DA1AD4483500365A50 /* JSReadableStreamReader.cpp */; };
</span><span class="cx"> 7C4C96DF1AD4483500365A50 /* JSReadableStreamReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C4C96DB1AD4483500365A50 /* JSReadableStreamReader.h */; };
</span><span class="lines">@@ -5380,6 +5378,8 @@
</span><span class="cx"> BC772E16133162C2001EC9CE /* CSSLineBoxContainValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC772E15133162C2001EC9CE /* CSSLineBoxContainValue.cpp */; };
</span><span class="cx"> BC779E141BB215BB00CAA8BF /* CSSCustomPropertyValue.h in Headers */ = {isa = PBXBuildFile; fileRef = BC779E131BB215BB00CAA8BF /* CSSCustomPropertyValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BC779E171BB227CA00CAA8BF /* StyleCustomPropertyData.h in Headers */ = {isa = PBXBuildFile; fileRef = BC779E151BB226A200CAA8BF /* StyleCustomPropertyData.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ BC7D8FEF1BD03B6400FFE540 /* CSSUnsetValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC7D8FED1BD03B6400FFE540 /* CSSUnsetValue.cpp */; settings = {ASSET_TAGS = (); }; };
+ BC7D8FF01BD03B6400FFE540 /* CSSUnsetValue.h in Headers */ = {isa = PBXBuildFile; fileRef = BC7D8FEE1BD03B6400FFE540 /* CSSUnsetValue.h */; settings = {ASSET_TAGS = (); }; };
</ins><span class="cx"> BC7F44A80B9E324E00A9D081 /* ImageObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = BC7F44A70B9E324E00A9D081 /* ImageObserver.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BC7FA6200D1F0CBD00DB22A9 /* LiveNodeList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC7FA61E0D1F0CBD00DB22A9 /* LiveNodeList.cpp */; };
</span><span class="cx"> BC7FA6210D1F0CBD00DB22A9 /* LiveNodeList.h in Headers */ = {isa = PBXBuildFile; fileRef = BC7FA61F0D1F0CBD00DB22A9 /* LiveNodeList.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -9876,8 +9876,6 @@
</span><span class="cx"> 7C48A6CF191C9D6500026674 /* WebKitNamespace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitNamespace.h; sourceTree = "<group>"; };
</span><span class="cx"> 7C48A6D2191C9D8E00026674 /* WebKitNamespace.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebKitNamespace.idl; sourceTree = "<group>"; };
</span><span class="cx"> 7C4C96D81AD4483500365A50 /* JSReadableStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSReadableStream.cpp; sourceTree = "<group>"; };
</span><del>- 7C4C96D81AD4483500365A51 /* ReadableStreamBuiltins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ReadableStreamBuiltins.cpp; sourceTree = "<group>"; };
- 7C4C96D81AD4483500365A52 /* CountQueuingStrategyBuiltins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CountQueuingStrategyBuiltins.cpp; sourceTree = "<group>"; };
</del><span class="cx"> 7C4C96D91AD4483500365A50 /* JSReadableStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSReadableStream.h; sourceTree = "<group>"; };
</span><span class="cx"> 7C4C96DA1AD4483500365A50 /* JSReadableStreamReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSReadableStreamReader.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7C4C96DB1AD4483500365A50 /* JSReadableStreamReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSReadableStreamReader.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -12948,6 +12946,8 @@
</span><span class="cx"> BC779E131BB215BB00CAA8BF /* CSSCustomPropertyValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSCustomPropertyValue.h; sourceTree = "<group>"; };
</span><span class="cx"> BC779E151BB226A200CAA8BF /* StyleCustomPropertyData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleCustomPropertyData.h; sourceTree = "<group>"; };
</span><span class="cx"> BC7B2AF80450824100A8000F /* Scrollbar.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Scrollbar.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
</span><ins>+ BC7D8FED1BD03B6400FFE540 /* CSSUnsetValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSUnsetValue.cpp; sourceTree = "<group>"; };
+ BC7D8FEE1BD03B6400FFE540 /* CSSUnsetValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSUnsetValue.h; sourceTree = "<group>"; };
</ins><span class="cx"> BC7F44A70B9E324E00A9D081 /* ImageObserver.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ImageObserver.h; sourceTree = "<group>"; };
</span><span class="cx"> BC7FA61E0D1F0CBD00DB22A9 /* LiveNodeList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LiveNodeList.cpp; sourceTree = "<group>"; };
</span><span class="cx"> BC7FA61F0D1F0CBD00DB22A9 /* LiveNodeList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LiveNodeList.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -22649,6 +22649,8 @@
</span><span class="cx"> 371F53E70D2704F900ECE0D5 /* CSSUnicodeRangeValue.h */,
</span><span class="cx"> A80E6CCE0A1989CA007FB8C5 /* CSSUnknownRule.h */,
</span><span class="cx"> 85C56CAD0AA89FE000D95755 /* CSSUnknownRule.idl */,
</span><ins>+ BC7D8FED1BD03B6400FFE540 /* CSSUnsetValue.cpp */,
+ BC7D8FEE1BD03B6400FFE540 /* CSSUnsetValue.h */,
</ins><span class="cx"> AD03AAF81468453900A39B5B /* CSSValue.cpp */,
</span><span class="cx"> A80E6CC40A1989CA007FB8C5 /* CSSValue.h */,
</span><span class="cx"> 14CF787109F587CA00EB3665 /* CSSValue.idl */,
</span><span class="lines">@@ -26868,6 +26870,7 @@
</span><span class="cx"> B2A1F2AB0CEF0ABF00442F6A /* SVGFontElement.h in Headers */,
</span><span class="cx"> B2227A150D00BF220071B782 /* SVGFontFaceElement.h in Headers */,
</span><span class="cx"> B2227A180D00BF220071B782 /* SVGFontFaceFormatElement.h in Headers */,
</span><ins>+ BC7D8FF01BD03B6400FFE540 /* CSSUnsetValue.h in Headers */,
</ins><span class="cx"> B2227A1B0D00BF220071B782 /* SVGFontFaceNameElement.h in Headers */,
</span><span class="cx"> B2227A1E0D00BF220071B782 /* SVGFontFaceSrcElement.h in Headers */,
</span><span class="cx"> B2227A210D00BF220071B782 /* SVGFontFaceUriElement.h in Headers */,
</span><span class="lines">@@ -28847,6 +28850,7 @@
</span><span class="cx"> 409EBDC516B7F3CA00CBA3FC /* JSCSSFontFaceLoadEvent.cpp in Sources */,
</span><span class="cx"> BC46C1FC0C0DDC8F0020CFC3 /* JSCSSFontFaceRule.cpp in Sources */,
</span><span class="cx"> BC46C1FE0C0DDC8F0020CFC3 /* JSCSSImportRule.cpp in Sources */,
</span><ins>+ BC7D8FEF1BD03B6400FFE540 /* CSSUnsetValue.cpp in Sources */,
</ins><span class="cx"> 316FE0710E6CCBEE00BF6088 /* JSCSSKeyframeRule.cpp in Sources */,
</span><span class="cx"> 316FE0730E6CCBEE00BF6088 /* JSCSSKeyframesRule.cpp in Sources */,
</span><span class="cx"> BC46C2000C0DDC8F0020CFC3 /* JSCSSMediaRule.cpp in Sources */,
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorebindingsobjcDOMCSSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/bindings/objc/DOMCSS.mm (193560 => 193561)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/bindings/objc/DOMCSS.mm 2015-12-06 06:24:18 UTC (rev 193560)
+++ branches/safari-601.1.46-branch/Source/WebCore/bindings/objc/DOMCSS.mm 2015-12-06 07:04:51 UTC (rev 193561)
</span><span class="lines">@@ -124,6 +124,7 @@
</span><span class="cx"> return [DOMCSSValueList class];
</span><span class="cx"> case WebCore::CSSValue::CSS_INHERIT:
</span><span class="cx"> case WebCore::CSSValue::CSS_INITIAL:
</span><ins>+ case WebCore::CSSValue::CSS_UNSET:
</ins><span class="cx"> return [DOMCSSValue class];
</span><span class="cx"> case WebCore::CSSValue::CSS_CUSTOM:
</span><span class="cx"> return [DOMCSSValue class];
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/css/CSSParser.cpp (193560 => 193561)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/css/CSSParser.cpp 2015-12-06 06:24:18 UTC (rev 193560)
+++ branches/safari-601.1.46-branch/Source/WebCore/css/CSSParser.cpp 2015-12-06 07:04:51 UTC (rev 193561)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx"> #include "CSSStyleSheet.h"
</span><span class="cx"> #include "CSSTimingFunctionValue.h"
</span><span class="cx"> #include "CSSUnicodeRangeValue.h"
</span><ins>+#include "CSSUnsetValue.h"
</ins><span class="cx"> #include "CSSValueKeywords.h"
</span><span class="cx"> #include "CSSValueList.h"
</span><span class="cx"> #include "CSSValuePool.h"
</span><span class="lines">@@ -1210,6 +1211,8 @@
</span><span class="cx"> value = cssValuePool().createInheritedValue();
</span><span class="cx"> else if (valueID == CSSValueInitial)
</span><span class="cx"> value = cssValuePool().createExplicitInitialValue();
</span><ins>+ else if (valueID == CSSValueUnset)
+ value = cssValuePool().createUnsetValue();
</ins><span class="cx"> else if (isValidKeywordPropertyAndValue(propertyId, valueID, parserContext, styleSheetContents))
</span><span class="cx"> value = cssValuePool().createIdentifierValue(valueID);
</span><span class="cx"> else
</span><span class="lines">@@ -1945,6 +1948,11 @@
</span><span class="cx"> return false;
</span><span class="cx"> addExpandedPropertyForValue(propId, cssValuePool().createExplicitInitialValue(), important);
</span><span class="cx"> return true;
</span><ins>+ } else if (id == CSSValueUnset) {
+ if (num != 1)
+ return false;
+ addExpandedPropertyForValue(propId, cssValuePool.createUnsetValue(), important);
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (isKeywordPropertyID(propId)) {
</span><span class="lines">@@ -4159,6 +4167,8 @@
</span><span class="cx"> value = cssValuePool().createInheritedValue();
</span><span class="cx"> else if (id == CSSValueInitial)
</span><span class="cx"> value = cssValuePool().createExplicitInitialValue();
</span><ins>+ else if (id == CSSValueUnset)
+ value = cssValuePool().createUnsetValue();
</ins><span class="cx"> else {
</span><span class="cx"> RefPtr<CSSValueList> valueList = CSSValueList::createFromParserValueList(*m_valueList);
</span><span class="cx"> if (m_valueList->containsVariables())
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorecssCSSToStyleMapcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/css/CSSToStyleMap.cpp (193560 => 193561)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/css/CSSToStyleMap.cpp 2015-12-06 06:24:18 UTC (rev 193560)
+++ branches/safari-601.1.46-branch/Source/WebCore/css/CSSToStyleMap.cpp 2015-12-06 07:04:51 UTC (rev 193561)
</span><span class="lines">@@ -71,9 +71,9 @@
</span><span class="cx"> return m_resolver->styleImage(propertyId, value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CSSToStyleMap::mapFillAttachment(CSSPropertyID, FillLayer& layer, const CSSValue& value)
</del><ins>+void CSSToStyleMap::mapFillAttachment(CSSPropertyID propertyID, FillLayer& layer, const CSSValue& value)
</ins><span class="cx"> {
</span><del>- if (value.isInitialValue()) {
</del><ins>+ if (value.treatAsInitialValue(propertyID)) {
</ins><span class="cx"> layer.setAttachment(FillLayer::initialFillAttachment(layer.type()));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -96,9 +96,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CSSToStyleMap::mapFillClip(CSSPropertyID, FillLayer& layer, const CSSValue& value)
</del><ins>+void CSSToStyleMap::mapFillClip(CSSPropertyID propertyID, FillLayer& layer, const CSSValue& value)
</ins><span class="cx"> {
</span><del>- if (value.isInitialValue()) {
</del><ins>+ if (value.treatAsInitialValue(propertyID)) {
</ins><span class="cx"> layer.setClip(FillLayer::initialFillClip(layer.type()));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -109,9 +109,9 @@
</span><span class="cx"> layer.setClip(downcast<CSSPrimitiveValue>(value));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CSSToStyleMap::mapFillComposite(CSSPropertyID, FillLayer& layer, const CSSValue& value)
</del><ins>+void CSSToStyleMap::mapFillComposite(CSSPropertyID propertyID, FillLayer& layer, const CSSValue& value)
</ins><span class="cx"> {
</span><del>- if (value.isInitialValue()) {
</del><ins>+ if (value.treatAsInitialValue(propertyID)) {
</ins><span class="cx"> layer.setComposite(FillLayer::initialFillComposite(layer.type()));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -122,9 +122,9 @@
</span><span class="cx"> layer.setComposite(downcast<CSSPrimitiveValue>(value));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CSSToStyleMap::mapFillBlendMode(CSSPropertyID, FillLayer& layer, const CSSValue& value)
</del><ins>+void CSSToStyleMap::mapFillBlendMode(CSSPropertyID propertyID, FillLayer& layer, const CSSValue& value)
</ins><span class="cx"> {
</span><del>- if (value.isInitialValue()) {
</del><ins>+ if (value.treatAsInitialValue(propertyID)) {
</ins><span class="cx"> layer.setBlendMode(FillLayer::initialFillBlendMode(layer.type()));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -135,9 +135,9 @@
</span><span class="cx"> layer.setBlendMode(downcast<CSSPrimitiveValue>(value));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CSSToStyleMap::mapFillOrigin(CSSPropertyID, FillLayer& layer, const CSSValue& value)
</del><ins>+void CSSToStyleMap::mapFillOrigin(CSSPropertyID propertyID, FillLayer& layer, const CSSValue& value)
</ins><span class="cx"> {
</span><del>- if (value.isInitialValue()) {
</del><ins>+ if (value.treatAsInitialValue(propertyID)) {
</ins><span class="cx"> layer.setOrigin(FillLayer::initialFillOrigin(layer.type()));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -148,19 +148,19 @@
</span><span class="cx"> layer.setOrigin(downcast<CSSPrimitiveValue>(value));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CSSToStyleMap::mapFillImage(CSSPropertyID property, FillLayer& layer, CSSValue& value)
</del><ins>+void CSSToStyleMap::mapFillImage(CSSPropertyID propertyID, FillLayer& layer, CSSValue& value)
</ins><span class="cx"> {
</span><del>- if (value.isInitialValue()) {
</del><ins>+ if (value.treatAsInitialValue(propertyID)) {
</ins><span class="cx"> layer.setImage(FillLayer::initialFillImage(layer.type()));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- layer.setImage(styleImage(property, value));
</del><ins>+ layer.setImage(styleImage(propertyID, value));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void CSSToStyleMap::mapFillRepeatX(CSSPropertyID, FillLayer& layer, const CSSValue& value)
</del><ins>+void CSSToStyleMap::mapFillRepeatX(CSSPropertyID propertyID, FillLayer& layer, const CSSValue& value)
</ins><span class="cx"> {
</span><del>- if (value.isInitialValue()) {
</del><ins>+ if (value.treatAsInitialValue(propertyID)) {
</ins><span class="cx"> layer.setRepeatX(FillLayer::initialFillRepeatX(layer.type()));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -171,9 +171,9 @@
</span><span class="cx"> layer.setRepeatX(downcast<CSSPrimitiveValue>(value));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CSSToStyleMap::mapFillRepeatY(CSSPropertyID, FillLayer& layer, const CSSValue& value)
</del><ins>+void CSSToStyleMap::mapFillRepeatY(CSSPropertyID propertyID, FillLayer& layer, const CSSValue& value)
</ins><span class="cx"> {
</span><del>- if (value.isInitialValue()) {
</del><ins>+ if (value.treatAsInitialValue(propertyID)) {
</ins><span class="cx"> layer.setRepeatY(FillLayer::initialFillRepeatY(layer.type()));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -195,9 +195,9 @@
</span><span class="cx"> return !size.width().isUndefined() && !size.height().isUndefined();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CSSToStyleMap::mapFillSize(CSSPropertyID, FillLayer& layer, const CSSValue& value)
</del><ins>+void CSSToStyleMap::mapFillSize(CSSPropertyID propertyID, FillLayer& layer, const CSSValue& value)
</ins><span class="cx"> {
</span><del>- if (value.isInitialValue()) {
</del><ins>+ if (value.treatAsInitialValue(propertyID)) {
</ins><span class="cx"> layer.setSize(FillLayer::initialFillSize(layer.type()));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx">
</span><span class="cx"> void CSSToStyleMap::mapFillXPosition(CSSPropertyID propertyID, FillLayer& layer, const CSSValue& value)
</span><span class="cx"> {
</span><del>- if (value.isInitialValue()) {
</del><ins>+ if (value.treatAsInitialValue(propertyID)) {
</ins><span class="cx"> layer.setXPosition(FillLayer::initialFillXPosition(layer.type()));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -257,7 +257,7 @@
</span><span class="cx">
</span><span class="cx"> void CSSToStyleMap::mapFillYPosition(CSSPropertyID propertyID, FillLayer& layer, const CSSValue& value)
</span><span class="cx"> {
</span><del>- if (value.isInitialValue()) {
</del><ins>+ if (value.treatAsInitialValue(propertyID)) {
</ins><span class="cx"> layer.setYPosition(FillLayer::initialFillYPosition(layer.type()));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -287,10 +287,10 @@
</span><span class="cx"> layer.setBackgroundYOrigin(*pair->first());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CSSToStyleMap::mapFillMaskSourceType(CSSPropertyID, FillLayer& layer, const CSSValue& value)
</del><ins>+void CSSToStyleMap::mapFillMaskSourceType(CSSPropertyID propertyID, FillLayer& layer, const CSSValue& value)
</ins><span class="cx"> {
</span><span class="cx"> EMaskSourceType type = FillLayer::initialFillMaskSourceType(layer.type());
</span><del>- if (value.isInitialValue()) {
</del><ins>+ if (value.treatAsInitialValue(propertyID)) {
</ins><span class="cx"> layer.setMaskSourceType(type);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -316,7 +316,7 @@
</span><span class="cx">
</span><span class="cx"> void CSSToStyleMap::mapAnimationDelay(Animation& animation, const CSSValue& value)
</span><span class="cx"> {
</span><del>- if (value.isInitialValue()) {
</del><ins>+ if (value.treatAsInitialValue(CSSPropertyWebkitAnimationDelay)) {
</ins><span class="cx"> animation.setDelay(Animation::initialDelay());
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -329,7 +329,7 @@
</span><span class="cx">
</span><span class="cx"> void CSSToStyleMap::mapAnimationDirection(Animation& layer, const CSSValue& value)
</span><span class="cx"> {
</span><del>- if (value.isInitialValue()) {
</del><ins>+ if (value.treatAsInitialValue(CSSPropertyWebkitAnimationDirection)) {
</ins><span class="cx"> layer.setDirection(Animation::initialDirection());
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -357,7 +357,7 @@
</span><span class="cx">
</span><span class="cx"> void CSSToStyleMap::mapAnimationDuration(Animation& animation, const CSSValue& value)
</span><span class="cx"> {
</span><del>- if (value.isInitialValue()) {
</del><ins>+ if (value.treatAsInitialValue(CSSPropertyWebkitAnimationDuration)) {
</ins><span class="cx"> animation.setDuration(Animation::initialDuration());
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -370,7 +370,7 @@
</span><span class="cx">
</span><span class="cx"> void CSSToStyleMap::mapAnimationFillMode(Animation& layer, const CSSValue& value)
</span><span class="cx"> {
</span><del>- if (value.isInitialValue()) {
</del><ins>+ if (value.treatAsInitialValue(CSSPropertyWebkitAnimationFillMode)) {
</ins><span class="cx"> layer.setFillMode(Animation::initialFillMode());
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -398,7 +398,7 @@
</span><span class="cx">
</span><span class="cx"> void CSSToStyleMap::mapAnimationIterationCount(Animation& animation, const CSSValue& value)
</span><span class="cx"> {
</span><del>- if (value.isInitialValue()) {
</del><ins>+ if (value.treatAsInitialValue(CSSPropertyWebkitAnimationIterationCount)) {
</ins><span class="cx"> animation.setIterationCount(Animation::initialIterationCount());
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -415,7 +415,7 @@
</span><span class="cx">
</span><span class="cx"> void CSSToStyleMap::mapAnimationName(Animation& layer, const CSSValue& value)
</span><span class="cx"> {
</span><del>- if (value.isInitialValue()) {
</del><ins>+ if (value.treatAsInitialValue(CSSPropertyWebkitAnimationName)) {
</ins><span class="cx"> layer.setName(Animation::initialName());
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -432,7 +432,7 @@
</span><span class="cx">
</span><span class="cx"> void CSSToStyleMap::mapAnimationPlayState(Animation& layer, const CSSValue& value)
</span><span class="cx"> {
</span><del>- if (value.isInitialValue()) {
</del><ins>+ if (value.treatAsInitialValue(CSSPropertyWebkitAnimationPlayState)) {
</ins><span class="cx"> layer.setPlayState(Animation::initialPlayState());
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -446,7 +446,7 @@
</span><span class="cx">
</span><span class="cx"> void CSSToStyleMap::mapAnimationProperty(Animation& animation, const CSSValue& value)
</span><span class="cx"> {
</span><del>- if (value.isInitialValue()) {
</del><ins>+ if (value.treatAsInitialValue(CSSPropertyWebkitAnimation)) {
</ins><span class="cx"> animation.setAnimationMode(Animation::AnimateAll);
</span><span class="cx"> animation.setProperty(CSSPropertyInvalid);
</span><span class="cx"> return;
</span><span class="lines">@@ -470,7 +470,7 @@
</span><span class="cx">
</span><span class="cx"> void CSSToStyleMap::mapAnimationTimingFunction(Animation& animation, const CSSValue& value)
</span><span class="cx"> {
</span><del>- if (value.isInitialValue()) {
</del><ins>+ if (value.treatAsInitialValue(CSSPropertyWebkitAnimationTimingFunction)) {
</ins><span class="cx"> animation.setTimingFunction(Animation::initialTimingFunction());
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -516,7 +516,7 @@
</span><span class="cx"> #if ENABLE(CSS_ANIMATIONS_LEVEL_2)
</span><span class="cx"> void CSSToStyleMap::mapAnimationTrigger(Animation& animation, const CSSValue& value)
</span><span class="cx"> {
</span><del>- if (value.isInitialValue()) {
</del><ins>+ if (value.treatAsInitialValue(CSSPropertyWebkitAnimationTrigger)) {
</ins><span class="cx"> animation.setTrigger(Animation::initialTrigger());
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorecssCSSUnsetValuecppfromrev193525branchessafari601branchSourceWebCorecssCSSUnsetValuecpp"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46-branch/Source/WebCore/css/CSSUnsetValue.cpp (from rev 193525, branches/safari-601-branch/Source/WebCore/css/CSSUnsetValue.cpp) (0 => 193561)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/css/CSSUnsetValue.cpp (rev 0)
+++ branches/safari-601.1.46-branch/Source/WebCore/css/CSSUnsetValue.cpp 2015-12-06 07:04:51 UTC (rev 193561)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "CSSUnsetValue.h"
+
+#include <wtf/text/WTFString.h>
+
+namespace WebCore {
+
+String CSSUnsetValue::customCSSText() const
+{
+ return ASCIILiteral("unset");
+}
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="branchessafari601146branchSourceWebCorecssCSSUnsetValuehfromrev193525branchessafari601branchSourceWebCorecssCSSUnsetValueh"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46-branch/Source/WebCore/css/CSSUnsetValue.h (from rev 193525, branches/safari-601-branch/Source/WebCore/css/CSSUnsetValue.h) (0 => 193561)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/css/CSSUnsetValue.h (rev 0)
+++ branches/safari-601.1.46-branch/Source/WebCore/css/CSSUnsetValue.h 2015-12-06 07:04:51 UTC (rev 193561)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef CSSUnsetValue_h
+#define CSSUnsetValue_h
+
+#include "CSSValue.h"
+#include <wtf/PassRefPtr.h>
+
+namespace WebCore {
+
+class CSSUnsetValue : public CSSValue {
+public:
+ static Ref<CSSUnsetValue> create()
+ {
+ return adoptRef(*new CSSUnsetValue);
+ }
+
+ String customCSSText() const;
+
+ bool equals(const CSSUnsetValue&) const { return true; }
+
+private:
+ CSSUnsetValue()
+ : CSSValue(UnsetClass)
+ {
+ }
+};
+
+} // namespace WebCore
+
+SPECIALIZE_TYPE_TRAITS_CSS_VALUE(CSSUnsetValue, isUnsetValue())
+
+#endif // CSSUnsetValue_h
</ins></span></pre></div>
<a id="branchessafari601146branchSourceWebCorecssCSSValuecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/css/CSSValue.cpp (193560 => 193561)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/css/CSSValue.cpp 2015-12-06 06:24:18 UTC (rev 193560)
+++ branches/safari-601.1.46-branch/Source/WebCore/css/CSSValue.cpp 2015-12-06 07:04:51 UTC (rev 193561)
</span><span class="lines">@@ -50,10 +50,12 @@
</span><span class="cx"> #include "CSSLineBoxContainValue.h"
</span><span class="cx"> #include "CSSNamedImageValue.h"
</span><span class="cx"> #include "CSSPrimitiveValue.h"
</span><ins>+#include "CSSProperty.h"
</ins><span class="cx"> #include "CSSReflectValue.h"
</span><span class="cx"> #include "CSSShadowValue.h"
</span><span class="cx"> #include "CSSTimingFunctionValue.h"
</span><span class="cx"> #include "CSSUnicodeRangeValue.h"
</span><ins>+#include "CSSUnsetValue.h"
</ins><span class="cx"> #include "CSSValueList.h"
</span><span class="cx"> #include "CSSVariableDependentValue.h"
</span><span class="cx"> #include "CSSVariableValue.h"
</span><span class="lines">@@ -110,6 +112,8 @@
</span><span class="cx"> return CSS_VALUE_LIST;
</span><span class="cx"> if (isInitialValue())
</span><span class="cx"> return CSS_INITIAL;
</span><ins>+ if (isUnsetValue())
+ return CSS_UNSET;
</ins><span class="cx"> return CSS_CUSTOM;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -297,6 +301,8 @@
</span><span class="cx"> return downcast<CSSInheritedValue>(*this).customCSSText();
</span><span class="cx"> case InitialClass:
</span><span class="cx"> return downcast<CSSInitialValue>(*this).customCSSText();
</span><ins>+ case UnsetClass:
+ return downcast<CSSUnsetValue>(*this).customCSSText();
</ins><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> case GridLineNamesClass:
</span><span class="cx"> return downcast<CSSGridLineNamesValue>(*this).customCSSText();
</span><span class="lines">@@ -406,6 +412,9 @@
</span><span class="cx"> case InitialClass:
</span><span class="cx"> delete downcast<CSSInitialValue>(this);
</span><span class="cx"> return;
</span><ins>+ case UnsetClass:
+ delete downcast<CSSUnsetValue>(this);
+ return;
</ins><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> case GridLineNamesClass:
</span><span class="cx"> delete downcast<CSSGridLineNamesValue>(this);
</span><span class="lines">@@ -515,4 +524,14 @@
</span><span class="cx"> return isCustomPropertyValue() && downcast<CSSCustomPropertyValue>(*this).isInvalid();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool CSSValue::treatAsInheritedValue(CSSPropertyID propertyID) const
+{
+ return classType() == InheritedClass || (classType() == UnsetClass && CSSProperty::isInheritedProperty(propertyID));
</ins><span class="cx"> }
</span><ins>+
+bool CSSValue::treatAsInitialValue(CSSPropertyID propertyID) const
+{
+ return classType() == InitialClass || (classType() == UnsetClass && !CSSProperty::isInheritedProperty(propertyID));
+}
+
+}
</ins></span></pre></div>
<a id="branchessafari601146branchSourceWebCorecssCSSValueh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/css/CSSValue.h (193560 => 193561)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/css/CSSValue.h 2015-12-06 06:24:18 UTC (rev 193560)
+++ branches/safari-601.1.46-branch/Source/WebCore/css/CSSValue.h 2015-12-06 07:04:51 UTC (rev 193561)
</span><span class="lines">@@ -32,7 +32,8 @@
</span><span class="cx">
</span><span class="cx"> class CachedResource;
</span><span class="cx"> class StyleSheetContents;
</span><del>-
</del><ins>+enum CSSPropertyID : uint16_t;
+
</ins><span class="cx"> // FIXME: The current CSSValue and subclasses should be turned into internal types (StyleValue).
</span><span class="cx"> // The few subtypes that are actually exposed in CSSOM can be seen in the cloneForCSSOM() function.
</span><span class="cx"> // They should be handled by separate wrapper classes.
</span><span class="lines">@@ -45,8 +46,8 @@
</span><span class="cx"> CSS_PRIMITIVE_VALUE = 1,
</span><span class="cx"> CSS_VALUE_LIST = 2,
</span><span class="cx"> CSS_CUSTOM = 3,
</span><del>- CSS_INITIAL = 4
-
</del><ins>+ CSS_INITIAL = 4,
+ CSS_UNSET = 5
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // Override RefCounted's deref() to ensure operator delete is called on
</span><span class="lines">@@ -92,6 +93,9 @@
</span><span class="cx"> bool isImplicitInitialValue() const;
</span><span class="cx"> bool isInheritedValue() const { return m_classType == InheritedClass; }
</span><span class="cx"> bool isInitialValue() const { return m_classType == InitialClass; }
</span><ins>+ bool isUnsetValue() const { return m_classType == UnsetClass; }
+ bool treatAsInitialValue(CSSPropertyID) const;
+ bool treatAsInheritedValue(CSSPropertyID) const;
</ins><span class="cx"> bool isLinearGradientValue() const { return m_classType == LinearGradientClass; }
</span><span class="cx"> bool isRadialGradientValue() const { return m_classType == RadialGradientClass; }
</span><span class="cx"> bool isReflectValue() const { return m_classType == ReflectClass; }
</span><span class="lines">@@ -164,6 +168,7 @@
</span><span class="cx">
</span><span class="cx"> InheritedClass,
</span><span class="cx"> InitialClass,
</span><ins>+ UnsetClass,
</ins><span class="cx">
</span><span class="cx"> ReflectClass,
</span><span class="cx"> ShadowClass,
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorecssCSSValueKeywordsin"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/css/CSSValueKeywords.in (193560 => 193561)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/css/CSSValueKeywords.in 2015-12-06 06:24:18 UTC (rev 193560)
+++ branches/safari-601.1.46-branch/Source/WebCore/css/CSSValueKeywords.in 2015-12-06 07:04:51 UTC (rev 193561)
</span><span class="lines">@@ -3,6 +3,8 @@
</span><span class="cx"> //
</span><span class="cx"> inherit
</span><span class="cx"> initial
</span><ins>+unset
+
</ins><span class="cx"> //
</span><span class="cx"> // CSS_PROP_OUTLINE_STYLE
</span><span class="cx"> // CSS_PROP_BORDER_TOP_STYLE
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorecssCSSValuePoolcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/css/CSSValuePool.cpp (193560 => 193561)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/css/CSSValuePool.cpp 2015-12-06 06:24:18 UTC (rev 193560)
+++ branches/safari-601.1.46-branch/Source/WebCore/css/CSSValuePool.cpp 2015-12-06 07:04:51 UTC (rev 193561)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> : m_inheritedValue(CSSInheritedValue::create())
</span><span class="cx"> , m_implicitInitialValue(CSSInitialValue::createImplicit())
</span><span class="cx"> , m_explicitInitialValue(CSSInitialValue::createExplicit())
</span><ins>+ , m_unsetValue(CSSUnsetValue::create())
</ins><span class="cx"> , m_colorTransparent(CSSPrimitiveValue::createColor(Color::transparent))
</span><span class="cx"> , m_colorWhite(CSSPrimitiveValue::createColor(Color::white))
</span><span class="cx"> , m_colorBlack(CSSPrimitiveValue::createColor(Color::black))
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorecssCSSValuePoolh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/css/CSSValuePool.h (193560 => 193561)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/css/CSSValuePool.h 2015-12-06 06:24:18 UTC (rev 193560)
+++ branches/safari-601.1.46-branch/Source/WebCore/css/CSSValuePool.h 2015-12-06 07:04:51 UTC (rev 193561)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "CSSInitialValue.h"
</span><span class="cx"> #include "CSSPrimitiveValue.h"
</span><span class="cx"> #include "CSSPropertyNames.h"
</span><ins>+#include "CSSUnsetValue.h"
</ins><span class="cx"> #include "CSSValueKeywords.h"
</span><span class="cx"> #include <utility>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="lines">@@ -52,6 +53,7 @@
</span><span class="cx"> Ref<CSSInheritedValue> createInheritedValue() { return m_inheritedValue.copyRef(); }
</span><span class="cx"> Ref<CSSInitialValue> createImplicitInitialValue() { return m_implicitInitialValue.copyRef(); }
</span><span class="cx"> Ref<CSSInitialValue> createExplicitInitialValue() { return m_explicitInitialValue.copyRef(); }
</span><ins>+ Ref<CSSUnsetValue> createUnsetValue() { return m_unsetValue.copyRef(); }
</ins><span class="cx"> Ref<CSSPrimitiveValue> createIdentifierValue(CSSValueID identifier);
</span><span class="cx"> Ref<CSSPrimitiveValue> createIdentifierValue(CSSPropertyID identifier);
</span><span class="cx"> Ref<CSSPrimitiveValue> createColorValue(unsigned rgbValue);
</span><span class="lines">@@ -69,6 +71,7 @@
</span><span class="cx"> Ref<CSSInheritedValue> m_inheritedValue;
</span><span class="cx"> Ref<CSSInitialValue> m_implicitInitialValue;
</span><span class="cx"> Ref<CSSInitialValue> m_explicitInitialValue;
</span><ins>+ Ref<CSSUnsetValue> m_unsetValue;
</ins><span class="cx">
</span><span class="cx"> RefPtr<CSSPrimitiveValue> m_identifierValueCache[numCSSValueKeywords];
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/css/StyleResolver.cpp (193560 => 193561)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/css/StyleResolver.cpp 2015-12-06 06:24:18 UTC (rev 193560)
+++ branches/safari-601.1.46-branch/Source/WebCore/css/StyleResolver.cpp 2015-12-06 07:04:51 UTC (rev 193561)
</span><span class="lines">@@ -1932,7 +1932,14 @@
</span><span class="cx">
</span><span class="cx"> bool isInherit = state.parentStyle() && valueToCheckForInheritInitial->isInheritedValue();
</span><span class="cx"> bool isInitial = valueToCheckForInheritInitial->isInitialValue() || (!state.parentStyle() && valueToCheckForInheritInitial->isInheritedValue());
</span><del>-
</del><ins>+
+ if (valueToCheckForInheritInitial->isUnsetValue()) {
+ if (CSSProperty::isInheritedProperty(id))
+ isInherit = true;
+ else
+ isInitial = true;
+ }
+
</ins><span class="cx"> ASSERT(!isInherit || !isInitial); // isInherit -> !isInitial && isInitial -> !isInherit
</span><span class="cx">
</span><span class="cx"> if (!state.applyPropertyToRegularStyle() && (!state.applyPropertyToVisitedLinkStyle() || !isValidVisitedLinkProperty(id))) {
</span></span></pre>
</div>
</div>
</body>
</html>