<!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>[191252] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/191252">191252</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2015-10-17 16:13:43 -0700 (Sat, 17 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Implement the CSS4 'revert' keyword.
https://bugs.webkit.org/show_bug.cgi?id=149702
Reviewed by Simon Fraser.
Source/WebCore:
Added new tests in fast/css and fast/css/variables.
* CMakeLists.txt:
* WebCore.xcodeproj/project.pbxproj:
Add CSSRevertValue to the project and makefiles.
* css/CSSParser.cpp:
(WebCore::parseKeywordValue):
Make sure to handle "revert" in the keyword parsing path (along with inherit/initial/unset).
(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::parseCustomPropertyDeclaration):
At the parser level, "revert" is just like inherit/initial/unset and gets its own special
singleton value, CSSRevertValue.
* css/CSSRevertValue.cpp: Added.
(WebCore::CSSRevertValue::customCSSText):
* css/CSSRevertValue.h: Added.
(WebCore::CSSRevertValue::create):
(WebCore::CSSRevertValue::equals):
(WebCore::CSSRevertValue::CSSRevertValue):
This value is identical to the inherit/initial/unset values, i.e., its own special value
that can be used to indicate a revert when doing style resolution.
* css/CSSValue.cpp:
(WebCore::CSSValue::cssValueType):
(WebCore::CSSValue::equals):
(WebCore::CSSValue::cssText):
(WebCore::CSSValue::destroy):
* css/CSSValue.h:
(WebCore::CSSValue::isInheritedValue):
(WebCore::CSSValue::isInitialValue):
(WebCore::CSSValue::isUnsetValue):
(WebCore::CSSValue::isRevertValue):
Add the RevertClass to CSSValue and make sure it is handled in all the appropriate methods.
* css/CSSValueKeywords.in:
Add the "revert" keyword to the list of allowed CSS keywords.
* css/CSSValuePool.cpp:
(WebCore::CSSValuePool::CSSValuePool):
* css/CSSValuePool.h:
(WebCore::CSSValuePool::createRevertValue):
Add support for a CSSRevertValue singleton, just like inherit/unset/initial.
* css/FontLoader.cpp:
(WebCore::FontLoader::resolveFontStyle):
Add "unset" and "revert" as special keywords to be ignored. This code seems to be turned off,
but patching it anyway.
* css/SelectorChecker.h:
Add a MatchDefault value of 0 to the LinkMatchMask. This enables it to be used as an index
to the correct value in Property (in the style resolution code).
* css/StyleResolver.cpp:
(WebCore::StyleResolver::State::initForStyleResolve):
Delete any lingering old CascadedProperty rollbacks for UA/user rules.
(WebCore::StyleResolver::styleForKeyframe):
(WebCore::StyleResolver::styleForPage):
(WebCore::StyleResolver::applyMatchedProperties):
Pass along the MatchResult as an additional parameter, since we need it to lazily compute
the cascade rollbacks if the "revert" keyword is encountered.
(WebCore::StyleResolver::cascadedPropertiesForRollback):
This method will lazily create and return a new CascadedProperties pointer that is cached
in the StyleResolver's state. This will contain only UA rules (for user reverts) and UA/user
rules (for author reverts). These will only be computed at most once for a given element
when doing a reversion, and they will be computed lazily, i.e., only if a revert is
requested.
(WebCore::StyleResolver::applyProperty):
Pass along the LinkMatchMask and the MatchResult to applyProperty. This way we know specifically
which link type we were computing if we have to revert (so that we roll back and look at the
same index in the reverted version). The MatchResult is passed along because it is needed
to build the CascadedProperties rollbacks.
The basic idea is that if a revert is encountered, the level that the rule came from is
checked. If it is UA level, just treat as "unset." If it is author or user level, get
the correct CascadedProperties rollback and repeat the applyProperty using the property
found in the rollback. If the property is not present in the cascade rollback, then the
revert becomes an unset.
(WebCore::StyleResolver::CascadedProperties::hasCustomProperty):
(WebCore::StyleResolver::CascadedProperties::customProperty):
Helpers used by applyProperty to check on custom properties, since they can revert too
just like a regular property can.
(WebCore::StyleResolver::CascadedProperties::setPropertyInternal):
(WebCore::StyleResolver::CascadedProperties::set):
(WebCore::StyleResolver::CascadedProperties::setDeferred):
Passing along the CascadeLevel (UA, User, Author) so that it can be stored in the Property.
This way when we do property application, we always know where the rule came from so
that the reversion can be handled properly.
(WebCore::StyleResolver::CascadedProperties::addStyleProperties):
(WebCore::cascadeLevelForIndex):
(WebCore::StyleResolver::CascadedProperties::addMatches):
When style properties are added, also figure out the CascadeLevel and pass it along to be
stored in the Property. We use the MatchResult's ranges to know where a property comes from.
(WebCore::StyleResolver::CascadedProperties::applyDeferredProperties):
(WebCore::StyleResolver::CascadedProperties::Property::apply):
(WebCore::StyleResolver::applyCascadedProperties):
Pass along the MatchResult so we know how to build the rollback.
* css/StyleResolver.h:
(WebCore::StyleResolver::State::cascadeLevel):
(WebCore::StyleResolver::State::setCascadeLevel):
(WebCore::StyleResolver::State::authorRollback):
(WebCore::StyleResolver::State::userRollback):
(WebCore::StyleResolver::State::setAuthorRollback):
(WebCore::StyleResolver::State::setUserRollback):
(WebCore::StyleResolver::state):
(WebCore::StyleResolver::cascadeLevel):
(WebCore::StyleResolver::setCascadeLevel):
Move CascadedProperties into the header. Add CascadeLevel to Property. Add the level and
rollbacks to the resolver's state.
LayoutTests:
* fast/css/all-keyword-revert-expected.html: Added.
* fast/css/all-keyword-revert.html: Added.
* fast/css/revert-color-expected.html: Added.
* fast/css/revert-color.html: Added.
* fast/css/revert-margins-expected.html: Added.
* fast/css/revert-margins.html: Added.
* fast/css/variables/all-keyword-revert-expected.html: Added.
* fast/css/variables/all-keyword-revert.html: Added.
* fast/css/variables/revert-inheritance-expected.html: Added.
* fast/css/variables/revert-inheritance.html: Added.
* fast/css/variables/revert-no-inheritance-expected.html: Added.
* fast/css/variables/revert-no-inheritance.html: Added.
* fast/css/variables/revert-variable-reference-expected.html: Added.
* fast/css/variables/revert-variable-reference.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcDOMCSSmm">trunk/Source/WebCore/bindings/objc/DOMCSS.mm</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSValuecpp">trunk/Source/WebCore/css/CSSValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueh">trunk/Source/WebCore/css/CSSValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueKeywordsin">trunk/Source/WebCore/css/CSSValueKeywords.in</a></li>
<li><a href="#trunkSourceWebCorecssCSSValuePoolcpp">trunk/Source/WebCore/css/CSSValuePool.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSValuePoolh">trunk/Source/WebCore/css/CSSValuePool.h</a></li>
<li><a href="#trunkSourceWebCorecssFontLoadercpp">trunk/Source/WebCore/css/FontLoader.cpp</a></li>
<li><a href="#trunkSourceWebCorecssSelectorCheckerh">trunk/Source/WebCore/css/SelectorChecker.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolverh">trunk/Source/WebCore/css/StyleResolver.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcssallkeywordrevertexpectedhtml">trunk/LayoutTests/fast/css/all-keyword-revert-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcssallkeywordreverthtml">trunk/LayoutTests/fast/css/all-keyword-revert.html</a></li>
<li><a href="#trunkLayoutTestsfastcssrevertcolorexpectedhtml">trunk/LayoutTests/fast/css/revert-color-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcssrevertcolorhtml">trunk/LayoutTests/fast/css/revert-color.html</a></li>
<li><a href="#trunkLayoutTestsfastcssrevertmarginsexpectedhtml">trunk/LayoutTests/fast/css/revert-margins-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcssrevertmarginshtml">trunk/LayoutTests/fast/css/revert-margins.html</a></li>
<li><a href="#trunkLayoutTestsfastcssvariablesallkeywordrevertexpectedhtml">trunk/LayoutTests/fast/css/variables/all-keyword-revert-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcssvariablesallkeywordreverthtml">trunk/LayoutTests/fast/css/variables/all-keyword-revert.html</a></li>
<li><a href="#trunkLayoutTestsfastcssvariablesrevertinheritanceexpectedhtml">trunk/LayoutTests/fast/css/variables/revert-inheritance-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcssvariablesrevertinheritancehtml">trunk/LayoutTests/fast/css/variables/revert-inheritance.html</a></li>
<li><a href="#trunkLayoutTestsfastcssvariablesrevertnoinheritanceexpectedhtml">trunk/LayoutTests/fast/css/variables/revert-no-inheritance-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcssvariablesrevertnoinheritancehtml">trunk/LayoutTests/fast/css/variables/revert-no-inheritance.html</a></li>
<li><a href="#trunkLayoutTestsfastcssvariablesrevertvariablereferenceexpectedhtml">trunk/LayoutTests/fast/css/variables/revert-variable-reference-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcssvariablesrevertvariablereferencehtml">trunk/LayoutTests/fast/css/variables/revert-variable-reference.html</a></li>
<li><a href="#trunkSourceWebCorecssCSSRevertValuecpp">trunk/Source/WebCore/css/CSSRevertValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSRevertValueh">trunk/Source/WebCore/css/CSSRevertValue.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (191251 => 191252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-10-17 22:40:41 UTC (rev 191251)
+++ trunk/LayoutTests/ChangeLog 2015-10-17 23:13:43 UTC (rev 191252)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-10-17 David Hyatt <hyatt@apple.com>
+
+ Implement the CSS4 'revert' keyword.
+ https://bugs.webkit.org/show_bug.cgi?id=149702
+
+ Reviewed by Simon Fraser.
+
+ * fast/css/all-keyword-revert-expected.html: Added.
+ * fast/css/all-keyword-revert.html: Added.
+ * fast/css/revert-color-expected.html: Added.
+ * fast/css/revert-color.html: Added.
+ * fast/css/revert-margins-expected.html: Added.
+ * fast/css/revert-margins.html: Added.
+ * fast/css/variables/all-keyword-revert-expected.html: Added.
+ * fast/css/variables/all-keyword-revert.html: Added.
+ * fast/css/variables/revert-inheritance-expected.html: Added.
+ * fast/css/variables/revert-inheritance.html: Added.
+ * fast/css/variables/revert-no-inheritance-expected.html: Added.
+ * fast/css/variables/revert-no-inheritance.html: Added.
+ * fast/css/variables/revert-variable-reference-expected.html: Added.
+ * fast/css/variables/revert-variable-reference.html: Added.
+
</ins><span class="cx"> 2015-10-17 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Delete FontPlatformData::allowsLigatures()
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssallkeywordrevertexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/all-keyword-revert-expected.html (0 => 191252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/all-keyword-revert-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/all-keyword-revert-expected.html 2015-10-17 23:13:43 UTC (rev 191252)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+<head>
+<style>
+html {
+ font-size: small;
+ background-color: #F0F0F0;
+ color: blue;
+}
+</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="trunkLayoutTestsfastcssallkeywordreverthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/all-keyword-revert.html (0 => 191252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/all-keyword-revert.html (rev 0)
+++ trunk/LayoutTests/fast/css/all-keyword-revert.html 2015-10-17 23:13:43 UTC (rev 191252)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<head>
+<style>
+html {
+ font-size: small;
+ background-color: #F0F0F0;
+ color: blue;
+}
+
+blockquote {
+ display:inline;
+ background-color: skyblue;
+ color: red;
+ all: revert;
+}
+</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="trunkLayoutTestsfastcssrevertcolorexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/revert-color-expected.html (0 => 191252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/revert-color-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/revert-color-expected.html 2015-10-17 23:13:43 UTC (rev 191252)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<head>
+<style>
+html {
+ font-size: small;
+ background-color: #F0F0F0;
+ color: blue;
+}
+
+blockquote { background-color: skyblue; }
+
+</style>
+</head>
+<body>
+<blockquote>This text should be blue.</blockquote>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssrevertcolorhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/revert-color.html (0 => 191252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/revert-color.html (rev 0)
+++ trunk/LayoutTests/fast/css/revert-color.html 2015-10-17 23:13:43 UTC (rev 191252)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+<head>
+<style>
+html {
+ font-size: small;
+ background-color: #F0F0F0;
+ color: blue;
+}
+
+blockquote {
+ background-color: skyblue;
+ color: red;
+ color: revert;
+}
+</style>
+</head>
+<body>
+<blockquote id="quote">This text should be blue.</blockquote>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssrevertmarginsexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/revert-margins-expected.html (0 => 191252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/revert-margins-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/revert-margins-expected.html 2015-10-17 23:13:43 UTC (rev 191252)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+<head>
+<style>
+blockquote {
+ margin-top:0;
+ margin-bottom:0;
+ border:1px solid black;
+}
+</style>
+</head>
+<body>
+<blockquote id="quote">This blockquote should have user agent margins for the left and right but the top and bottom margins should be 0.</blockquote>
+<blockquote id="quote">This blockquote should have user agent margins for the left and right but the top and bottom margins should be 0.</blockquote>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssrevertmarginshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/revert-margins.html (0 => 191252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/revert-margins.html (rev 0)
+++ trunk/LayoutTests/fast/css/revert-margins.html 2015-10-17 23:13:43 UTC (rev 191252)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<head>
+<style>
+blockquote {
+ margin:0;
+ margin-right:revert;
+ margin-left:revert;
+ border:1px solid black;
+}
+</style>
+</head>
+<body>
+<blockquote id="quote">This blockquote should have user agent margins for the left and right but the top and bottom margins should be 0.</blockquote>
+<blockquote id="quote">This blockquote should have user agent margins for the left and right but the top and bottom margins should be 0.</blockquote>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssvariablesallkeywordrevertexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/variables/all-keyword-revert-expected.html (0 => 191252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/variables/all-keyword-revert-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/all-keyword-revert-expected.html 2015-10-17 23:13:43 UTC (rev 191252)
</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="trunkLayoutTestsfastcssvariablesallkeywordreverthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/variables/all-keyword-revert.html (0 => 191252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/variables/all-keyword-revert.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/all-keyword-revert.html 2015-10-17 23:13:43 UTC (rev 191252)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+<head>
+<title>Test of failed variable lookup because of "revert" on a custom property causing all to reset everything.</title>
+<style>
+html {
+ font-size: small;
+ background-color: #F0F0F0;
+ color: blue;
+ --a: revert;
+}
+
+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="trunkLayoutTestsfastcssvariablesrevertinheritanceexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/variables/revert-inheritance-expected.html (0 => 191252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/variables/revert-inheritance-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/revert-inheritance-expected.html 2015-10-17 23:13:43 UTC (rev 191252)
</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="trunkLayoutTestsfastcssvariablesrevertinheritancehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/variables/revert-inheritance.html (0 => 191252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/variables/revert-inheritance.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/revert-inheritance.html 2015-10-17 23:13:43 UTC (rev 191252)
</span><span class="lines">@@ -0,0 +1,21 @@
</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 "revert" where there is a variable to inherit from.</title>
+<style>
+body {
+ --a: green;
+ color: crimson;
+}
+p {
+ color: red;
+}
+p {
+ color: orange;
+ --a: revert;
+ 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="trunkLayoutTestsfastcssvariablesrevertnoinheritanceexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/variables/revert-no-inheritance-expected.html (0 => 191252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/variables/revert-no-inheritance-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/revert-no-inheritance-expected.html 2015-10-17 23:13:43 UTC (rev 191252)
</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="trunkLayoutTestsfastcssvariablesrevertnoinheritancehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/variables/revert-no-inheritance.html (0 => 191252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/variables/revert-no-inheritance.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/revert-no-inheritance.html 2015-10-17 23:13:43 UTC (rev 191252)
</span><span class="lines">@@ -0,0 +1,17 @@
</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 "revert" where there is no variable to inherit from.</title>
+<style>
+p {
+ color: red;
+}
+p {
+ color: orange;
+ --a: revert;
+ 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="trunkLayoutTestsfastcssvariablesrevertvariablereferenceexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/variables/revert-variable-reference-expected.html (0 => 191252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/variables/revert-variable-reference-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/revert-variable-reference-expected.html 2015-10-17 23:13:43 UTC (rev 191252)
</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="trunkLayoutTestsfastcssvariablesrevertvariablereferencehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/variables/revert-variable-reference.html (0 => 191252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/variables/revert-variable-reference.html (rev 0)
+++ trunk/LayoutTests/fast/css/variables/revert-variable-reference.html 2015-10-17 23:13:43 UTC (rev 191252)
</span><span class="lines">@@ -0,0 +1,19 @@
</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 "revert".</title>
+<style>
+body {
+ --b: green;
+ color: red;
+}
+p {
+ color: orange;
+ --a: var(--b);
+ --b: revert;
+ 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="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (191251 => 191252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-10-17 22:40:41 UTC (rev 191251)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-10-17 23:13:43 UTC (rev 191252)
</span><span class="lines">@@ -1338,6 +1338,7 @@
</span><span class="cx"> css/CSSProperty.cpp
</span><span class="cx"> css/CSSPropertySourceData.cpp
</span><span class="cx"> css/CSSReflectValue.cpp
</span><ins>+ css/CSSRevertValue.cpp
</ins><span class="cx"> css/CSSRule.cpp
</span><span class="cx"> css/CSSRuleList.cpp
</span><span class="cx"> css/CSSSegmentedFontFace.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191251 => 191252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-17 22:40:41 UTC (rev 191251)
+++ trunk/Source/WebCore/ChangeLog 2015-10-17 23:13:43 UTC (rev 191252)
</span><span class="lines">@@ -1,3 +1,129 @@
</span><ins>+2015-10-17 David Hyatt <hyatt@apple.com>
+
+ Implement the CSS4 'revert' keyword.
+ https://bugs.webkit.org/show_bug.cgi?id=149702
+
+ Reviewed by Simon Fraser.
+
+ Added new tests in fast/css and fast/css/variables.
+
+ * CMakeLists.txt:
+ * WebCore.xcodeproj/project.pbxproj:
+ Add CSSRevertValue to the project and makefiles.
+
+ * css/CSSParser.cpp:
+ (WebCore::parseKeywordValue):
+ Make sure to handle "revert" in the keyword parsing path (along with inherit/initial/unset).
+
+ (WebCore::CSSParser::parseValue):
+ (WebCore::CSSParser::parseCustomPropertyDeclaration):
+ At the parser level, "revert" is just like inherit/initial/unset and gets its own special
+ singleton value, CSSRevertValue.
+
+ * css/CSSRevertValue.cpp: Added.
+ (WebCore::CSSRevertValue::customCSSText):
+ * css/CSSRevertValue.h: Added.
+ (WebCore::CSSRevertValue::create):
+ (WebCore::CSSRevertValue::equals):
+ (WebCore::CSSRevertValue::CSSRevertValue):
+ This value is identical to the inherit/initial/unset values, i.e., its own special value
+ that can be used to indicate a revert when doing style resolution.
+
+ * css/CSSValue.cpp:
+ (WebCore::CSSValue::cssValueType):
+ (WebCore::CSSValue::equals):
+ (WebCore::CSSValue::cssText):
+ (WebCore::CSSValue::destroy):
+ * css/CSSValue.h:
+ (WebCore::CSSValue::isInheritedValue):
+ (WebCore::CSSValue::isInitialValue):
+ (WebCore::CSSValue::isUnsetValue):
+ (WebCore::CSSValue::isRevertValue):
+ Add the RevertClass to CSSValue and make sure it is handled in all the appropriate methods.
+
+ * css/CSSValueKeywords.in:
+ Add the "revert" keyword to the list of allowed CSS keywords.
+
+ * css/CSSValuePool.cpp:
+ (WebCore::CSSValuePool::CSSValuePool):
+ * css/CSSValuePool.h:
+ (WebCore::CSSValuePool::createRevertValue):
+ Add support for a CSSRevertValue singleton, just like inherit/unset/initial.
+
+ * css/FontLoader.cpp:
+ (WebCore::FontLoader::resolveFontStyle):
+ Add "unset" and "revert" as special keywords to be ignored. This code seems to be turned off,
+ but patching it anyway.
+
+ * css/SelectorChecker.h:
+ Add a MatchDefault value of 0 to the LinkMatchMask. This enables it to be used as an index
+ to the correct value in Property (in the style resolution code).
+
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::State::initForStyleResolve):
+ Delete any lingering old CascadedProperty rollbacks for UA/user rules.
+
+ (WebCore::StyleResolver::styleForKeyframe):
+ (WebCore::StyleResolver::styleForPage):
+ (WebCore::StyleResolver::applyMatchedProperties):
+ Pass along the MatchResult as an additional parameter, since we need it to lazily compute
+ the cascade rollbacks if the "revert" keyword is encountered.
+
+ (WebCore::StyleResolver::cascadedPropertiesForRollback):
+ This method will lazily create and return a new CascadedProperties pointer that is cached
+ in the StyleResolver's state. This will contain only UA rules (for user reverts) and UA/user
+ rules (for author reverts). These will only be computed at most once for a given element
+ when doing a reversion, and they will be computed lazily, i.e., only if a revert is
+ requested.
+
+ (WebCore::StyleResolver::applyProperty):
+ Pass along the LinkMatchMask and the MatchResult to applyProperty. This way we know specifically
+ which link type we were computing if we have to revert (so that we roll back and look at the
+ same index in the reverted version). The MatchResult is passed along because it is needed
+ to build the CascadedProperties rollbacks.
+
+ The basic idea is that if a revert is encountered, the level that the rule came from is
+ checked. If it is UA level, just treat as "unset." If it is author or user level, get
+ the correct CascadedProperties rollback and repeat the applyProperty using the property
+ found in the rollback. If the property is not present in the cascade rollback, then the
+ revert becomes an unset.
+
+ (WebCore::StyleResolver::CascadedProperties::hasCustomProperty):
+ (WebCore::StyleResolver::CascadedProperties::customProperty):
+ Helpers used by applyProperty to check on custom properties, since they can revert too
+ just like a regular property can.
+
+ (WebCore::StyleResolver::CascadedProperties::setPropertyInternal):
+ (WebCore::StyleResolver::CascadedProperties::set):
+ (WebCore::StyleResolver::CascadedProperties::setDeferred):
+ Passing along the CascadeLevel (UA, User, Author) so that it can be stored in the Property.
+ This way when we do property application, we always know where the rule came from so
+ that the reversion can be handled properly.
+
+ (WebCore::StyleResolver::CascadedProperties::addStyleProperties):
+ (WebCore::cascadeLevelForIndex):
+ (WebCore::StyleResolver::CascadedProperties::addMatches):
+ When style properties are added, also figure out the CascadeLevel and pass it along to be
+ stored in the Property. We use the MatchResult's ranges to know where a property comes from.
+
+ (WebCore::StyleResolver::CascadedProperties::applyDeferredProperties):
+ (WebCore::StyleResolver::CascadedProperties::Property::apply):
+ (WebCore::StyleResolver::applyCascadedProperties):
+ Pass along the MatchResult so we know how to build the rollback.
+
+ * css/StyleResolver.h:
+ (WebCore::StyleResolver::State::cascadeLevel):
+ (WebCore::StyleResolver::State::setCascadeLevel):
+ (WebCore::StyleResolver::State::authorRollback):
+ (WebCore::StyleResolver::State::userRollback):
+ (WebCore::StyleResolver::State::setAuthorRollback):
+ (WebCore::StyleResolver::State::setUserRollback):
+ (WebCore::StyleResolver::state):
+ (WebCore::StyleResolver::cascadeLevel):
+ (WebCore::StyleResolver::setCascadeLevel):
+ Move CascadedProperties into the header. Add CascadeLevel to Property. Add the level and
+ rollbacks to the resolver's state.
+
</ins><span class="cx"> 2015-10-17 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Delete FontPlatformData::allowsLigatures()
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (191251 => 191252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-10-17 22:40:41 UTC (rev 191251)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-10-17 23:13:43 UTC (rev 191252)
</span><span class="lines">@@ -5499,6 +5499,8 @@
</span><span class="cx"> BC779E171BB227CA00CAA8BF /* StyleCustomPropertyData.h in Headers */ = {isa = PBXBuildFile; fileRef = BC779E151BB226A200CAA8BF /* StyleCustomPropertyData.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BC7D8FEF1BD03B6400FFE540 /* CSSUnsetValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC7D8FED1BD03B6400FFE540 /* CSSUnsetValue.cpp */; };
</span><span class="cx"> BC7D8FF01BD03B6400FFE540 /* CSSUnsetValue.h in Headers */ = {isa = PBXBuildFile; fileRef = BC7D8FEE1BD03B6400FFE540 /* CSSUnsetValue.h */; };
</span><ins>+ BC7D8FF31BD1A47900FFE540 /* CSSRevertValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC7D8FF11BD1A47900FFE540 /* CSSRevertValue.cpp */; settings = {ASSET_TAGS = (); }; };
+ BC7D8FF41BD1A47900FFE540 /* CSSRevertValue.h in Headers */ = {isa = PBXBuildFile; fileRef = BC7D8FF21BD1A47900FFE540 /* CSSRevertValue.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 */; };
</span><span class="lines">@@ -13219,6 +13221,8 @@
</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><span class="cx"> BC7D8FED1BD03B6400FFE540 /* CSSUnsetValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSUnsetValue.cpp; sourceTree = "<group>"; };
</span><span class="cx"> BC7D8FEE1BD03B6400FFE540 /* CSSUnsetValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSUnsetValue.h; sourceTree = "<group>"; };
</span><ins>+ BC7D8FF11BD1A47900FFE540 /* CSSRevertValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSRevertValue.cpp; sourceTree = "<group>"; };
+ BC7D8FF21BD1A47900FFE540 /* CSSRevertValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSRevertValue.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">@@ -23081,6 +23085,8 @@
</span><span class="cx"> 9362640A0DE1137D009D5A00 /* CSSReflectionDirection.h */,
</span><span class="cx"> BC5A12DD0DC0414800C9AFAD /* CSSReflectValue.cpp */,
</span><span class="cx"> BC5A12DE0DC0414800C9AFAD /* CSSReflectValue.h */,
</span><ins>+ BC7D8FF11BD1A47900FFE540 /* CSSRevertValue.cpp */,
+ BC7D8FF21BD1A47900FFE540 /* CSSRevertValue.h */,
</ins><span class="cx"> A80E6CDC0A1989CA007FB8C5 /* CSSRule.cpp */,
</span><span class="cx"> A80E6CE30A1989CA007FB8C5 /* CSSRule.h */,
</span><span class="cx"> 14CF7A7009F5CF9A00EB3665 /* CSSRule.idl */,
</span><span class="lines">@@ -24701,7 +24707,6 @@
</span><span class="cx"> E125F82C1822CFEC00D84CD9 /* CryptoAlgorithmSHA1.h in Headers */,
</span><span class="cx"> E19AC3EF1824DC7900349426 /* CryptoAlgorithmSHA224.h in Headers */,
</span><span class="cx"> E19AC3F11824DC7900349426 /* CryptoAlgorithmSHA256.h in Headers */,
</span><del>- 836CB1F81BD1E41800AF1591 /* JSHTMLTableDataCellElement.h in Headers */,
</del><span class="cx"> E19AC3F31824DC7900349426 /* CryptoAlgorithmSHA384.h in Headers */,
</span><span class="cx"> E19AC3F51824DC7900349426 /* CryptoAlgorithmSHA512.h in Headers */,
</span><span class="cx"> E1FE136718343A1000892F13 /* CryptoDigest.h in Headers */,
</span><span class="lines">@@ -24773,6 +24778,7 @@
</span><span class="cx"> 82E3D8DF122EA0D1003AE5BC /* CSSPropertySourceData.h in Headers */,
</span><span class="cx"> 9362640B0DE1137D009D5A00 /* CSSReflectionDirection.h in Headers */,
</span><span class="cx"> BC5A12E00DC0414800C9AFAD /* CSSReflectValue.h in Headers */,
</span><ins>+ BC7D8FF41BD1A47900FFE540 /* CSSRevertValue.h in Headers */,
</ins><span class="cx"> A80E6D0D0A1989CA007FB8C5 /* CSSRule.h in Headers */,
</span><span class="cx"> A80E6CF20A1989CA007FB8C5 /* CSSRuleList.h in Headers */,
</span><span class="cx"> 371F51A10D262FA000ECE0D5 /* CSSSegmentedFontFace.h in Headers */,
</span><span class="lines">@@ -25589,7 +25595,9 @@
</span><span class="cx"> A871DB2B0A150BD600B12A68 /* HTMLTableCaptionElement.h in Headers */,
</span><span class="cx"> A871DB2A0A150BD600B12A68 /* HTMLTableCellElement.h in Headers */,
</span><span class="cx"> A871DB2F0A150BD600B12A68 /* HTMLTableColElement.h in Headers */,
</span><ins>+ 836BAD221BD1CA670037356A /* HTMLTableDataCellElement.h in Headers */,
</ins><span class="cx"> A871DB270A150BD600B12A68 /* HTMLTableElement.h in Headers */,
</span><ins>+ 836BAD211BD1CA670037356A /* HTMLTableHeaderCellElement.h in Headers */,
</ins><span class="cx"> A871DB2C0A150BD600B12A68 /* HTMLTablePartElement.h in Headers */,
</span><span class="cx"> A871DB310A150BD600B12A68 /* HTMLTableRowElement.h in Headers */,
</span><span class="cx"> 93442C9E0D2B335C00338FF9 /* HTMLTableRowsCollection.h in Headers */,
</span><span class="lines">@@ -25992,7 +26000,9 @@
</span><span class="cx"> BCA169A30BFD55B40019CA76 /* JSHTMLTableCaptionElement.h in Headers */,
</span><span class="cx"> BC06EDE40BFD6D0D00856E9D /* JSHTMLTableCellElement.h in Headers */,
</span><span class="cx"> BC06ED9E0BFD660600856E9D /* JSHTMLTableColElement.h in Headers */,
</span><ins>+ 836CB1F81BD1E41800AF1591 /* JSHTMLTableDataCellElement.h in Headers */,
</ins><span class="cx"> BC06EE050BFD71AA00856E9D /* JSHTMLTableElement.h in Headers */,
</span><ins>+ 836CB1F61BD1E41800AF1591 /* JSHTMLTableHeaderCellElement.h in Headers */,
</ins><span class="cx"> BC06EDA00BFD660600856E9D /* JSHTMLTableRowElement.h in Headers */,
</span><span class="cx"> BC06ED070BFD5BAE00856E9D /* JSHTMLTableSectionElement.h in Headers */,
</span><span class="cx"> D6489D26166FFCF1007C031B /* JSHTMLTemplateElement.h in Headers */,
</span><span class="lines">@@ -26261,7 +26271,6 @@
</span><span class="cx"> 8542A7930AE5C93F00DF58DF /* JSSVGRect.h in Headers */,
</span><span class="cx"> B2FA3DEE0AB75A6F000E5AC4 /* JSSVGRectElement.h in Headers */,
</span><span class="cx"> B2FA3DF10AB75A6F000E5AC4 /* JSSVGRenderingIntent.h in Headers */,
</span><del>- 836CB1F61BD1E41800AF1591 /* JSHTMLTableHeaderCellElement.h in Headers */,
</del><span class="cx"> B2FA3DF30AB75A6F000E5AC4 /* JSSVGScriptElement.h in Headers */,
</span><span class="cx"> B2FA3DF50AB75A6F000E5AC4 /* JSSVGSetElement.h in Headers */,
</span><span class="cx"> B2FA3DF70AB75A6F000E5AC4 /* JSSVGStopElement.h in Headers */,
</span><span class="lines">@@ -27265,7 +27274,6 @@
</span><span class="cx"> 9393E605151A9A1800066F06 /* StyleCachedImageSet.h in Headers */,
</span><span class="cx"> 9DAC7C571AF2CB6400437C44 /* StyleContentAlignmentData.h in Headers */,
</span><span class="cx"> BC779E171BB227CA00CAA8BF /* StyleCustomPropertyData.h in Headers */,
</span><del>- 836BAD211BD1CA670037356A /* HTMLTableHeaderCellElement.h in Headers */,
</del><span class="cx"> BC5EB67F0E81D4A700B25965 /* StyleDashboardRegion.h in Headers */,
</span><span class="cx"> A8C4A7FD09D563270003AC8D /* StyledElement.h in Headers */,
</span><span class="cx"> BC5EB8B90E8201BD00B25965 /* StyleDeprecatedFlexibleBoxData.h in Headers */,
</span><span class="lines">@@ -27324,7 +27332,6 @@
</span><span class="cx"> 43A625F813B3304000AC94B8 /* SVGAnimatedColor.h in Headers */,
</span><span class="cx"> 08D46CE3127AD5FC0089694B /* SVGAnimatedEnumeration.h in Headers */,
</span><span class="cx"> 71FB967B1383D64600AC8A4C /* SVGAnimatedEnumerationPropertyTearOff.h in Headers */,
</span><del>- 836BAD221BD1CA670037356A /* HTMLTableDataCellElement.h in Headers */,
</del><span class="cx"> 0823D159127AD6AC000EBC95 /* SVGAnimatedInteger.h in Headers */,
</span><span class="cx"> 71E623D1151F72A60036E2F4 /* SVGAnimatedIntegerOptionalInteger.h in Headers */,
</span><span class="cx"> 089021A9126EF5DE0092D5EA /* SVGAnimatedLength.h in Headers */,
</span><span class="lines">@@ -28599,6 +28606,7 @@
</span><span class="cx"> 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */,
</span><span class="cx"> 82E3D8DE122EA0D1003AE5BC /* CSSPropertySourceData.cpp in Sources */,
</span><span class="cx"> BC5A12DF0DC0414800C9AFAD /* CSSReflectValue.cpp in Sources */,
</span><ins>+ BC7D8FF31BD1A47900FFE540 /* CSSRevertValue.cpp in Sources */,
</ins><span class="cx"> A80E6D060A1989CA007FB8C5 /* CSSRule.cpp in Sources */,
</span><span class="cx"> A80E6D090A1989CA007FB8C5 /* CSSRuleList.cpp in Sources */,
</span><span class="cx"> 371F51A20D262FA000ECE0D5 /* CSSSegmentedFontFace.cpp in Sources */,
</span><span class="lines">@@ -29617,7 +29625,9 @@
</span><span class="cx"> BCA169A20BFD55B40019CA76 /* JSHTMLTableCaptionElement.cpp in Sources */,
</span><span class="cx"> BC06EDE30BFD6D0D00856E9D /* JSHTMLTableCellElement.cpp in Sources */,
</span><span class="cx"> BC06ED9D0BFD660600856E9D /* JSHTMLTableColElement.cpp in Sources */,
</span><ins>+ 836CB1F91BD1E41800AF1591 /* JSHTMLTableDataCellElement.cpp in Sources */,
</ins><span class="cx"> BC06EE040BFD71AA00856E9D /* JSHTMLTableElement.cpp in Sources */,
</span><ins>+ 836CB1F71BD1E41800AF1591 /* JSHTMLTableHeaderCellElement.cpp in Sources */,
</ins><span class="cx"> BC06ED9F0BFD660600856E9D /* JSHTMLTableRowElement.cpp in Sources */,
</span><span class="cx"> BC06ED060BFD5BAE00856E9D /* JSHTMLTableSectionElement.cpp in Sources */,
</span><span class="cx"> D6489D25166FFCF1007C031B /* JSHTMLTemplateElement.cpp in Sources */,
</span><span class="lines">@@ -30520,7 +30530,6 @@
</span><span class="cx"> 5824ABAA1AE849C8009074B7 /* RenderTreePosition.cpp in Sources */,
</span><span class="cx"> E44614510CD68A3500FADA75 /* RenderVideo.cpp in Sources */,
</span><span class="cx"> BCEA4867097D93020094C9E4 /* RenderView.cpp in Sources */,
</span><del>- 836CB1F71BD1E41800AF1591 /* JSHTMLTableHeaderCellElement.cpp in Sources */,
</del><span class="cx"> BE20507D18A458BF0080647E /* RenderVTTCue.cpp in Sources */,
</span><span class="cx"> A871DFE50A15376B00B12A68 /* RenderWidget.cpp in Sources */,
</span><span class="cx"> F5528DA61AC1033E000EF7AD /* ReplaceDeleteFromTextNodeCommand.cpp in Sources */,
</span><span class="lines">@@ -31296,7 +31305,6 @@
</span><span class="cx"> A136A00C1134DBD200CC8D50 /* XMLHttpRequestProgressEventThrottle.cpp in Sources */,
</span><span class="cx"> BCDFD48F0E305290009D10AD /* XMLHttpRequestUpload.cpp in Sources */,
</span><span class="cx"> A833C80C0A2CF25600D57664 /* XMLNames.cpp in Sources */,
</span><del>- 836CB1F91BD1E41800AF1591 /* JSHTMLTableDataCellElement.cpp in Sources */,
</del><span class="cx"> E15A36D91104572700B7B639 /* XMLNSNames.cpp in Sources */,
</span><span class="cx"> 1ACE53EA0A8D18E70022947D /* XMLSerializer.cpp in Sources */,
</span><span class="cx"> 5905ADBF1302F3CE00F116DF /* XMLTreeViewer.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcDOMCSSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/DOMCSS.mm (191251 => 191252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/objc/DOMCSS.mm 2015-10-17 22:40:41 UTC (rev 191251)
+++ trunk/Source/WebCore/bindings/objc/DOMCSS.mm 2015-10-17 23:13:43 UTC (rev 191252)
</span><span class="lines">@@ -125,6 +125,7 @@
</span><span class="cx"> case WebCore::CSSValue::CSS_INHERIT:
</span><span class="cx"> case WebCore::CSSValue::CSS_INITIAL:
</span><span class="cx"> case WebCore::CSSValue::CSS_UNSET:
</span><ins>+ case WebCore::CSSValue::CSS_REVERT:
</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="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (191251 => 191252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2015-10-17 22:40:41 UTC (rev 191251)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2015-10-17 23:13:43 UTC (rev 191252)
</span><span class="lines">@@ -57,6 +57,7 @@
</span><span class="cx"> #include "CSSPrimitiveValueMappings.h"
</span><span class="cx"> #include "CSSPropertySourceData.h"
</span><span class="cx"> #include "CSSReflectValue.h"
</span><ins>+#include "CSSRevertValue.h"
</ins><span class="cx"> #include "CSSSelector.h"
</span><span class="cx"> #include "CSSShadowValue.h"
</span><span class="cx"> #include "CSSStyleSheet.h"
</span><span class="lines">@@ -1197,10 +1198,10 @@
</span><span class="cx"> if (!isKeywordPropertyID(propertyId)) {
</span><span class="cx"> // All properties accept the values of "initial" and "inherit".
</span><span class="cx"> String lowerCaseString = string.lower();
</span><del>- if (lowerCaseString != "initial" && lowerCaseString != "inherit" && lowerCaseString != "unset")
</del><ins>+ if (lowerCaseString != "initial" && lowerCaseString != "inherit" && lowerCaseString != "unset" && lowerCaseString != "revert")
</ins><span class="cx"> return CSSParser::ParseResult::Error;
</span><span class="cx">
</span><del>- // Parse initial/inherit/unset shorthands using the CSSParser.
</del><ins>+ // Parse initial/inherit/unset/revert shorthands using the CSSParser.
</ins><span class="cx"> if (shorthandForProperty(propertyId).length())
</span><span class="cx"> return CSSParser::ParseResult::Error;
</span><span class="cx"> }
</span><span class="lines">@@ -1219,6 +1220,8 @@
</span><span class="cx"> value = CSSValuePool::singleton().createExplicitInitialValue();
</span><span class="cx"> else if (valueID == CSSValueUnset)
</span><span class="cx"> value = CSSValuePool::singleton().createUnsetValue();
</span><ins>+ else if (valueID == CSSValueRevert)
+ value = CSSValuePool::singleton().createRevertValue();
</ins><span class="cx"> else if (isValidKeywordPropertyAndValue(propertyId, valueID, parserContext, styleSheetContents))
</span><span class="cx"> value = CSSValuePool::singleton().createIdentifierValue(valueID);
</span><span class="cx"> else
</span><span class="lines">@@ -1965,6 +1968,11 @@
</span><span class="cx"> return false;
</span><span class="cx"> addExpandedPropertyForValue(propId, cssValuePool.createUnsetValue(), important);
</span><span class="cx"> return true;
</span><ins>+ } else if (id == CSSValueRevert) {
+ if (num != 1)
+ return false;
+ addExpandedPropertyForValue(propId, cssValuePool.createRevertValue(), important);
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (propId == CSSPropertyAll)
</span><span class="lines">@@ -4213,6 +4221,8 @@
</span><span class="cx"> value = cssValuePool.createExplicitInitialValue();
</span><span class="cx"> else if (id == CSSValueUnset)
</span><span class="cx"> value = cssValuePool.createUnsetValue();
</span><ins>+ else if (id == CSSValueRevert)
+ value = cssValuePool.createRevertValue();
</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="trunkSourceWebCorecssCSSRevertValuecpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/css/CSSRevertValue.cpp (0 => 191252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSRevertValue.cpp (rev 0)
+++ trunk/Source/WebCore/css/CSSRevertValue.cpp 2015-10-17 23:13:43 UTC (rev 191252)
</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 "CSSRevertValue.h"
+
+#include <wtf/text/WTFString.h>
+
+namespace WebCore {
+
+String CSSRevertValue::customCSSText() const
+{
+ return ASCIILiteral("Revert");
+}
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCorecssCSSRevertValueh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/css/CSSRevertValue.h (0 => 191252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSRevertValue.h (rev 0)
+++ trunk/Source/WebCore/css/CSSRevertValue.h 2015-10-17 23:13:43 UTC (rev 191252)
</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 CSSRevertValue_h
+#define CSSRevertValue_h
+
+#include "CSSValue.h"
+#include <wtf/PassRefPtr.h>
+
+namespace WebCore {
+
+class CSSRevertValue : public CSSValue {
+public:
+ static Ref<CSSRevertValue> create()
+ {
+ return adoptRef(*new CSSRevertValue);
+ }
+
+ String customCSSText() const;
+
+ bool equals(const CSSRevertValue&) const { return true; }
+
+private:
+ CSSRevertValue()
+ : CSSValue(RevertClass)
+ {
+ }
+};
+
+} // namespace WebCore
+
+SPECIALIZE_TYPE_TRAITS_CSS_VALUE(CSSRevertValue, isRevertValue())
+
+#endif // CSSRevertValue_h
</ins></span></pre></div>
<a id="trunkSourceWebCorecssCSSValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValue.cpp (191251 => 191252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValue.cpp 2015-10-17 22:40:41 UTC (rev 191251)
+++ trunk/Source/WebCore/css/CSSValue.cpp 2015-10-17 23:13:43 UTC (rev 191252)
</span><span class="lines">@@ -114,6 +114,8 @@
</span><span class="cx"> return CSS_INITIAL;
</span><span class="cx"> if (isUnsetValue())
</span><span class="cx"> return CSS_UNSET;
</span><ins>+ if (isRevertValue())
+ return CSS_REVERT;
</ins><span class="cx"> return CSS_CUSTOM;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -203,6 +205,8 @@
</span><span class="cx"> return compareCSSValues<CSSInitialValue>(*this, other);
</span><span class="cx"> case UnsetClass:
</span><span class="cx"> return compareCSSValues<CSSUnsetValue>(*this, other);
</span><ins>+ case RevertClass:
+ return compareCSSValues<CSSRevertValue>(*this, other);
</ins><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> case GridLineNamesClass:
</span><span class="cx"> return compareCSSValues<CSSGridLineNamesValue>(*this, other);
</span><span class="lines">@@ -305,6 +309,8 @@
</span><span class="cx"> return downcast<CSSInitialValue>(*this).customCSSText();
</span><span class="cx"> case UnsetClass:
</span><span class="cx"> return downcast<CSSUnsetValue>(*this).customCSSText();
</span><ins>+ case RevertClass:
+ return downcast<CSSRevertValue>(*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">@@ -417,6 +423,9 @@
</span><span class="cx"> case UnsetClass:
</span><span class="cx"> delete downcast<CSSUnsetValue>(this);
</span><span class="cx"> return;
</span><ins>+ case RevertClass:
+ delete downcast<CSSRevertValue>(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></pre></div>
<a id="trunkSourceWebCorecssCSSValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValue.h (191251 => 191252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValue.h 2015-10-17 22:40:41 UTC (rev 191251)
+++ trunk/Source/WebCore/css/CSSValue.h 2015-10-17 23:13:43 UTC (rev 191252)
</span><span class="lines">@@ -47,7 +47,8 @@
</span><span class="cx"> CSS_VALUE_LIST = 2,
</span><span class="cx"> CSS_CUSTOM = 3,
</span><span class="cx"> CSS_INITIAL = 4,
</span><del>- CSS_UNSET = 5
</del><ins>+ CSS_UNSET = 5,
+ CSS_REVERT = 6
</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">@@ -94,6 +95,7 @@
</span><span class="cx"> bool isInheritedValue() const { return m_classType == InheritedClass; }
</span><span class="cx"> bool isInitialValue() const { return m_classType == InitialClass; }
</span><span class="cx"> bool isUnsetValue() const { return m_classType == UnsetClass; }
</span><ins>+ bool isRevertValue() const { return m_classType == RevertClass; }
</ins><span class="cx"> bool treatAsInitialValue(CSSPropertyID) const;
</span><span class="cx"> bool treatAsInheritedValue(CSSPropertyID) const;
</span><span class="cx"> bool isLinearGradientValue() const { return m_classType == LinearGradientClass; }
</span><span class="lines">@@ -169,6 +171,7 @@
</span><span class="cx"> InheritedClass,
</span><span class="cx"> InitialClass,
</span><span class="cx"> UnsetClass,
</span><ins>+ RevertClass,
</ins><span class="cx">
</span><span class="cx"> ReflectClass,
</span><span class="cx"> ShadowClass,
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueKeywordsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (191251 => 191252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValueKeywords.in 2015-10-17 22:40:41 UTC (rev 191251)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2015-10-17 23:13:43 UTC (rev 191252)
</span><span class="lines">@@ -4,6 +4,7 @@
</span><span class="cx"> inherit
</span><span class="cx"> initial
</span><span class="cx"> unset
</span><ins>+revert
</ins><span class="cx">
</span><span class="cx"> //
</span><span class="cx"> // CSS_PROP_OUTLINE_STYLE
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValuePoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValuePool.cpp (191251 => 191252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValuePool.cpp 2015-10-17 22:40:41 UTC (rev 191251)
+++ trunk/Source/WebCore/css/CSSValuePool.cpp 2015-10-17 23:13:43 UTC (rev 191252)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> , m_implicitInitialValue(CSSInitialValue::createImplicit())
</span><span class="cx"> , m_explicitInitialValue(CSSInitialValue::createExplicit())
</span><span class="cx"> , m_unsetValue(CSSUnsetValue::create())
</span><ins>+ , m_revertValue(CSSRevertValue::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="trunkSourceWebCorecssCSSValuePoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValuePool.h (191251 => 191252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValuePool.h 2015-10-17 22:40:41 UTC (rev 191251)
+++ trunk/Source/WebCore/css/CSSValuePool.h 2015-10-17 23:13:43 UTC (rev 191252)
</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 "CSSRevertValue.h"
</ins><span class="cx"> #include "CSSUnsetValue.h"
</span><span class="cx"> #include "CSSValueKeywords.h"
</span><span class="cx"> #include <utility>
</span><span class="lines">@@ -56,6 +57,7 @@
</span><span class="cx"> Ref<CSSInitialValue> createImplicitInitialValue() { return m_implicitInitialValue.copyRef(); }
</span><span class="cx"> Ref<CSSInitialValue> createExplicitInitialValue() { return m_explicitInitialValue.copyRef(); }
</span><span class="cx"> Ref<CSSUnsetValue> createUnsetValue() { return m_unsetValue.copyRef(); }
</span><ins>+ Ref<CSSRevertValue> createRevertValue() { return m_revertValue.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">@@ -74,6 +76,7 @@
</span><span class="cx"> Ref<CSSInitialValue> m_implicitInitialValue;
</span><span class="cx"> Ref<CSSInitialValue> m_explicitInitialValue;
</span><span class="cx"> Ref<CSSUnsetValue> m_unsetValue;
</span><ins>+ Ref<CSSRevertValue> m_revertValue;
</ins><span class="cx">
</span><span class="cx"> RefPtr<CSSPrimitiveValue> m_identifierValueCache[numCSSValueKeywords];
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssFontLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/FontLoader.cpp (191251 => 191252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/FontLoader.cpp 2015-10-17 22:40:41 UTC (rev 191251)
+++ trunk/Source/WebCore/css/FontLoader.cpp 2015-10-17 23:13:43 UTC (rev 191252)
</span><span class="lines">@@ -300,7 +300,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> String fontValue = parsedStyle->getPropertyValue(CSSPropertyFont);
</span><del>- if (fontValue == "inherit" || fontValue == "initial")
</del><ins>+ if (fontValue == "inherit" || fontValue == "initial" || fontValue == "unset" || fontValue == "revert")
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> RefPtr<RenderStyle> style = RenderStyle::create();
</span></span></pre></div>
<a id="trunkSourceWebCorecssSelectorCheckerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/SelectorChecker.h (191251 => 191252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/SelectorChecker.h 2015-10-17 22:40:41 UTC (rev 191251)
+++ trunk/Source/WebCore/css/SelectorChecker.h 2015-10-17 23:13:43 UTC (rev 191252)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> static bool matchesFocusPseudoClass(const Element*);
</span><span class="cx"> static bool checkExactAttribute(const Element*, const CSSSelector*, const QualifiedName& selectorAttributeName, const AtomicStringImpl* value);
</span><span class="cx">
</span><del>- enum LinkMatchMask { MatchLink = 1, MatchVisited = 2, MatchAll = MatchLink | MatchVisited };
</del><ins>+ enum LinkMatchMask { MatchDefault = 0, MatchLink = 1, MatchVisited = 2, MatchAll = MatchLink | MatchVisited };
</ins><span class="cx"> static unsigned determineLinkMatchType(const CSSSelector*);
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (191251 => 191252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2015-10-17 22:40:41 UTC (rev 191251)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2015-10-17 23:13:43 UTC (rev 191252)
</span><span class="lines">@@ -173,42 +173,6 @@
</span><span class="cx"> static const CSSPropertyID lastHighPriorityProperty = CSSPropertyFontSynthesis;
</span><span class="cx"> static const CSSPropertyID firstLowPriorityProperty = static_cast<CSSPropertyID>(lastHighPriorityProperty + 1);
</span><span class="cx">
</span><del>-class StyleResolver::CascadedProperties {
-public:
- CascadedProperties(TextDirection, WritingMode);
-
- struct Property {
- void apply(StyleResolver&);
-
- CSSPropertyID id;
- CSSValue* cssValue[3];
- };
-
- bool hasProperty(CSSPropertyID id) const;
- Property& property(CSSPropertyID);
- void addMatches(const MatchResult&, bool important, int startIndex, int endIndex, bool inheritedOnly = false);
-
- void set(CSSPropertyID, CSSValue&, unsigned linkMatchType);
- void setDeferred(CSSPropertyID, CSSValue&, unsigned linkMatchType);
-
- void applyDeferredProperties(StyleResolver&);
-
- HashMap<AtomicString, Property>& customProperties() { return m_customProperties; }
-
-private:
- void addStyleProperties(const StyleProperties&, StyleRule&, bool isImportant, bool inheritedOnly, PropertyWhitelistType, unsigned linkMatchType);
- static void setPropertyInternal(Property&, CSSPropertyID, CSSValue&, unsigned linkMatchType);
-
- Property m_properties[numCSSProperties + 2];
- std::bitset<numCSSProperties + 2> m_propertyIsPresent;
-
- Vector<Property, 8> m_deferredProperties;
- HashMap<AtomicString, Property> m_customProperties;
-
- TextDirection m_direction;
- WritingMode m_writingMode;
-};
-
</del><span class="cx"> static void extractDirectionAndWritingMode(const RenderStyle&, const StyleResolver::MatchResult&, TextDirection&, WritingMode&);
</span><span class="cx">
</span><span class="cx"> RenderStyle* StyleResolver::s_styleNotYetAvailable;
</span><span class="lines">@@ -440,6 +404,9 @@
</span><span class="cx"> m_style = nullptr;
</span><span class="cx"> m_pendingImageProperties.clear();
</span><span class="cx"> m_fontDirty = false;
</span><ins>+
+ m_authorRollback = nullptr;
+ m_userRollback = nullptr;
</ins><span class="cx">
</span><span class="cx"> updateConversionData();
</span><span class="cx"> }
</span><span class="lines">@@ -854,20 +821,20 @@
</span><span class="cx"> cascade.addMatches(result, false, 0, result.matchedProperties().size() - 1);
</span><span class="cx">
</span><span class="cx"> // Resolve custom properties first.
</span><del>- applyCascadedProperties(cascade, CSSPropertyCustom, CSSPropertyCustom);
</del><ins>+ applyCascadedProperties(cascade, CSSPropertyCustom, CSSPropertyCustom, &result);
</ins><span class="cx">
</span><del>- applyCascadedProperties(cascade, firstCSSProperty, lastHighPriorityProperty);
</del><ins>+ applyCascadedProperties(cascade, firstCSSProperty, lastHighPriorityProperty, &result);
</ins><span class="cx">
</span><span class="cx"> // If our font got dirtied, update it now.
</span><span class="cx"> updateFont();
</span><span class="cx">
</span><span class="cx"> // Now do rest of the properties.
</span><del>- applyCascadedProperties(cascade, firstLowPriorityProperty, lastCSSProperty);
</del><ins>+ applyCascadedProperties(cascade, firstLowPriorityProperty, lastCSSProperty, &result);
</ins><span class="cx">
</span><span class="cx"> // If our font got dirtied by one of the non-essential font props, update it a second time.
</span><span class="cx"> updateFont();
</span><span class="cx">
</span><del>- cascade.applyDeferredProperties(*this);
</del><ins>+ cascade.applyDeferredProperties(*this, &result);
</ins><span class="cx">
</span><span class="cx"> // Start loading resources referenced by this style.
</span><span class="cx"> loadPendingResources();
</span><span class="lines">@@ -1022,16 +989,16 @@
</span><span class="cx"> cascade.addMatches(result, false, 0, result.matchedProperties().size() - 1);
</span><span class="cx">
</span><span class="cx"> // Resolve custom properties first.
</span><del>- applyCascadedProperties(cascade, CSSPropertyCustom, CSSPropertyCustom);
</del><ins>+ applyCascadedProperties(cascade, CSSPropertyCustom, CSSPropertyCustom, &result);
</ins><span class="cx">
</span><del>- applyCascadedProperties(cascade, firstCSSProperty, lastHighPriorityProperty);
</del><ins>+ applyCascadedProperties(cascade, firstCSSProperty, lastHighPriorityProperty, &result);
</ins><span class="cx">
</span><span class="cx"> // If our font got dirtied, update it now.
</span><span class="cx"> updateFont();
</span><span class="cx">
</span><del>- applyCascadedProperties(cascade, firstLowPriorityProperty, lastCSSProperty);
</del><ins>+ applyCascadedProperties(cascade, firstLowPriorityProperty, lastCSSProperty, &result);
</ins><span class="cx">
</span><del>- cascade.applyDeferredProperties(*this);
</del><ins>+ cascade.applyDeferredProperties(*this, &result);
</ins><span class="cx">
</span><span class="cx"> // Start loading resources referenced by this style.
</span><span class="cx"> loadPendingResources();
</span><span class="lines">@@ -1697,17 +1664,17 @@
</span><span class="cx"> cascade.addMatches(matchResult, false, matchResult.ranges.firstUARule, matchResult.ranges.lastUARule, applyInheritedOnly);
</span><span class="cx"> cascade.addMatches(matchResult, true, matchResult.ranges.firstUARule, matchResult.ranges.lastUARule, applyInheritedOnly);
</span><span class="cx">
</span><del>- applyCascadedProperties(cascade, CSSPropertyWebkitRubyPosition, CSSPropertyWebkitRubyPosition);
</del><ins>+ applyCascadedProperties(cascade, CSSPropertyWebkitRubyPosition, CSSPropertyWebkitRubyPosition, &matchResult);
</ins><span class="cx"> adjustStyleForInterCharacterRuby();
</span><span class="cx">
</span><span class="cx"> // Resolve custom variables first.
</span><del>- applyCascadedProperties(cascade, CSSPropertyCustom, CSSPropertyCustom);
</del><ins>+ applyCascadedProperties(cascade, CSSPropertyCustom, CSSPropertyCustom, &matchResult);
</ins><span class="cx">
</span><span class="cx"> // Start by applying properties that other properties may depend on.
</span><del>- applyCascadedProperties(cascade, firstCSSProperty, lastHighPriorityProperty);
</del><ins>+ applyCascadedProperties(cascade, firstCSSProperty, lastHighPriorityProperty, &matchResult);
</ins><span class="cx">
</span><span class="cx"> updateFont();
</span><del>- applyCascadedProperties(cascade, firstLowPriorityProperty, lastCSSProperty);
</del><ins>+ applyCascadedProperties(cascade, firstLowPriorityProperty, lastCSSProperty, &matchResult);
</ins><span class="cx">
</span><span class="cx"> state.cacheBorderAndBackground();
</span><span class="cx"> }
</span><span class="lines">@@ -1719,15 +1686,15 @@
</span><span class="cx"> cascade.addMatches(matchResult, true, matchResult.ranges.firstUARule, matchResult.ranges.lastUARule, applyInheritedOnly);
</span><span class="cx">
</span><span class="cx"> // Resolve custom properties first.
</span><del>- applyCascadedProperties(cascade, CSSPropertyCustom, CSSPropertyCustom);
</del><ins>+ applyCascadedProperties(cascade, CSSPropertyCustom, CSSPropertyCustom, &matchResult);
</ins><span class="cx">
</span><del>- applyCascadedProperties(cascade, CSSPropertyWebkitRubyPosition, CSSPropertyWebkitRubyPosition);
</del><ins>+ applyCascadedProperties(cascade, CSSPropertyWebkitRubyPosition, CSSPropertyWebkitRubyPosition, &matchResult);
</ins><span class="cx">
</span><span class="cx"> // Adjust the font size to be smaller if ruby-position is inter-character.
</span><span class="cx"> adjustStyleForInterCharacterRuby();
</span><span class="cx">
</span><span class="cx"> // Start by applying properties that other properties may depend on.
</span><del>- applyCascadedProperties(cascade, firstCSSProperty, lastHighPriorityProperty);
</del><ins>+ applyCascadedProperties(cascade, firstCSSProperty, lastHighPriorityProperty, &matchResult);
</ins><span class="cx">
</span><span class="cx"> // If the effective zoom value changes, we can't use the matched properties cache. Start over.
</span><span class="cx"> if (cacheItem && cacheItem->renderStyle->effectiveZoom() != state.style()->effectiveZoom())
</span><span class="lines">@@ -1741,12 +1708,12 @@
</span><span class="cx"> return applyMatchedProperties(matchResult, element, DoNotUseMatchedPropertiesCache);
</span><span class="cx">
</span><span class="cx"> // Apply properties that no other properties depend on.
</span><del>- applyCascadedProperties(cascade, firstLowPriorityProperty, lastCSSProperty);
</del><ins>+ applyCascadedProperties(cascade, firstLowPriorityProperty, lastCSSProperty, &matchResult);
</ins><span class="cx">
</span><span class="cx"> // Finally, some properties must be applied in the order they were parsed.
</span><span class="cx"> // There are some CSS properties that affect the same RenderStyle values,
</span><span class="cx"> // so to preserve behavior, we queue them up during cascade and flush here.
</span><del>- cascade.applyDeferredProperties(*this);
</del><ins>+ cascade.applyDeferredProperties(*this, &matchResult);
</ins><span class="cx">
</span><span class="cx"> // Start loading resources referenced by this style.
</span><span class="cx"> loadPendingResources();
</span><span class="lines">@@ -1876,8 +1843,51 @@
</span><span class="cx"> return is<SVGElement>(m_state.element()) && !(is<SVGSVGElement>(*m_state.element()) && m_state.element()->parentNode());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StyleResolver::applyProperty(CSSPropertyID id, CSSValue* value)
</del><ins>+StyleResolver::CascadedProperties* StyleResolver::cascadedPropertiesForRollback(const MatchResult& matchResult)
</ins><span class="cx"> {
</span><ins>+ ASSERT(cascadeLevel() != UserAgentLevel);
+
+ TextDirection direction;
+ WritingMode writingMode;
+ extractDirectionAndWritingMode(*state().style(), matchResult, direction, writingMode);
+
+ if (cascadeLevel() == AuthorLevel) {
+ CascadedProperties* authorRollback = state().authorRollback();
+ if (authorRollback)
+ return authorRollback;
+
+ auto newAuthorRollback(std::make_unique<CascadedProperties>(direction, writingMode));
+
+ // This special rollback cascade contains UA rules and user rules but no author rules.
+ newAuthorRollback->addMatches(matchResult, false, matchResult.ranges.firstUARule, matchResult.ranges.lastUARule, false);
+ newAuthorRollback->addMatches(matchResult, false, matchResult.ranges.firstUserRule, matchResult.ranges.lastUserRule, false);
+ newAuthorRollback->addMatches(matchResult, true, matchResult.ranges.firstUserRule, matchResult.ranges.lastUserRule, false);
+ newAuthorRollback->addMatches(matchResult, true, matchResult.ranges.firstUARule, matchResult.ranges.lastUARule, false);
+
+ state().setAuthorRollback(newAuthorRollback);
+ return state().authorRollback();
+ }
+
+ if (cascadeLevel() == UserLevel) {
+ CascadedProperties* userRollback = state().userRollback();
+ if (userRollback)
+ return userRollback;
+
+ auto newUserRollback(std::make_unique<CascadedProperties>(direction, writingMode));
+
+ // This special rollback cascade contains only UA rules.
+ newUserRollback->addMatches(matchResult, false, matchResult.ranges.firstUARule, matchResult.ranges.lastUARule, false);
+ newUserRollback->addMatches(matchResult, true, matchResult.ranges.firstUARule, matchResult.ranges.lastUARule, false);
+
+ state().setUserRollback(newUserRollback);
+ return state().userRollback();
+ }
+
+ return nullptr;
+}
+
+void StyleResolver::applyProperty(CSSPropertyID id, CSSValue* value, SelectorChecker::LinkMatchMask linkMatchMask, const MatchResult* matchResult)
+{
</ins><span class="cx"> ASSERT_WITH_MESSAGE(!isShorthandCSSProperty(id), "Shorthand property id = %d wasn't expanded at parsing time", id);
</span><span class="cx">
</span><span class="cx"> State& state = m_state;
</span><span class="lines">@@ -1896,25 +1906,60 @@
</span><span class="cx"> if (CSSProperty::isDirectionAwareProperty(id)) {
</span><span class="cx"> CSSPropertyID newId = CSSProperty::resolveDirectionAwareProperty(id, state.style()->direction(), state.style()->writingMode());
</span><span class="cx"> ASSERT(newId != id);
</span><del>- return applyProperty(newId, valueToApply.get());
</del><ins>+ return applyProperty(newId, valueToApply.get(), linkMatchMask, matchResult);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CSSValue* valueToCheckForInheritInitial = valueToApply.get();
</span><ins>+ CSSCustomPropertyValue* customPropertyValue = nullptr;
+
</ins><span class="cx"> if (id == CSSPropertyCustom) {
</span><del>- CSSCustomPropertyValue* customProperty = &downcast<CSSCustomPropertyValue>(*valueToApply);
- valueToCheckForInheritInitial = customProperty->value().get();
</del><ins>+ customPropertyValue = &downcast<CSSCustomPropertyValue>(*valueToApply);
+ valueToCheckForInheritInitial = customPropertyValue->value().get();
</ins><span class="cx"> }
</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><span class="cx">
</span><del>- if (valueToCheckForInheritInitial->isUnsetValue()) {
</del><ins>+ bool isUnset = valueToCheckForInheritInitial->isUnsetValue();
+ bool isRevert = valueToCheckForInheritInitial->isRevertValue();
+
+ if (isRevert) {
+ if (cascadeLevel() == UserAgentLevel || !matchResult)
+ isUnset = true;
+ else {
+ // Fetch the correct rollback object from the state, building it if necessary.
+ // This requires having the original MatchResult available.
+ auto* rollback = cascadedPropertiesForRollback(*matchResult);
+ ASSERT(rollback);
+
+ // With the cascade built, we need to obtain the property and apply it. If the property is
+ // not present, then we behave like "unset." Otherwise we apply the property instead of
+ // our own.
+ if (customPropertyValue) {
+ if (rollback->hasCustomProperty(customPropertyValue->name())) {
+ auto property = rollback->customProperty(customPropertyValue->name());
+ if (property.cssValue[linkMatchMask])
+ applyProperty(property.id, property.cssValue[linkMatchMask], linkMatchMask, matchResult);
+ return;
+ }
+ } else if (rollback->hasProperty(id)) {
+ auto& property = rollback->property(id);
+ if (property.cssValue[linkMatchMask])
+ applyProperty(property.id, property.cssValue[linkMatchMask], linkMatchMask, matchResult);
+ return;
+ }
+
+ isUnset = true;
+ }
+ }
+
+ if (isUnset) {
</ins><span class="cx"> if (CSSProperty::isInheritedProperty(id))
</span><span class="cx"> isInherit = true;
</span><span class="cx"> else
</span><span class="cx"> isInitial = true;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</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 class="lines">@@ -2568,10 +2613,21 @@
</span><span class="cx"> return m_properties[id];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StyleResolver::CascadedProperties::setPropertyInternal(Property& property, CSSPropertyID id, CSSValue& cssValue, unsigned linkMatchType)
</del><ins>+inline bool StyleResolver::CascadedProperties::hasCustomProperty(const String& name) const
</ins><span class="cx"> {
</span><ins>+ return m_customProperties.contains(name);
+}
+
+inline StyleResolver::CascadedProperties::Property StyleResolver::CascadedProperties::customProperty(const String& name) const
+{
+ return m_customProperties.get(name);
+}
+
+void StyleResolver::CascadedProperties::setPropertyInternal(Property& property, CSSPropertyID id, CSSValue& cssValue, unsigned linkMatchType, CascadeLevel cascadeLevel)
+{
</ins><span class="cx"> ASSERT(linkMatchType <= SelectorChecker::MatchAll);
</span><span class="cx"> property.id = id;
</span><ins>+ property.level = cascadeLevel;
</ins><span class="cx"> if (linkMatchType == SelectorChecker::MatchAll) {
</span><span class="cx"> property.cssValue[0] = &cssValue;
</span><span class="cx"> property.cssValue[SelectorChecker::MatchLink] = &cssValue;
</span><span class="lines">@@ -2580,7 +2636,7 @@
</span><span class="cx"> property.cssValue[linkMatchType] = &cssValue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StyleResolver::CascadedProperties::set(CSSPropertyID id, CSSValue& cssValue, unsigned linkMatchType)
</del><ins>+void StyleResolver::CascadedProperties::set(CSSPropertyID id, CSSValue& cssValue, unsigned linkMatchType, CascadeLevel cascadeLevel)
</ins><span class="cx"> {
</span><span class="cx"> if (CSSProperty::isDirectionAwareProperty(id))
</span><span class="cx"> id = CSSProperty::resolveDirectionAwareProperty(id, m_direction, m_writingMode);
</span><span class="lines">@@ -2597,11 +2653,11 @@
</span><span class="cx"> Property property;
</span><span class="cx"> property.id = id;
</span><span class="cx"> memset(property.cssValue, 0, sizeof(property.cssValue));
</span><del>- setPropertyInternal(property, id, cssValue, linkMatchType);
</del><ins>+ setPropertyInternal(property, id, cssValue, linkMatchType, cascadeLevel);
</ins><span class="cx"> customProperties().set(customValue.name(), property);
</span><span class="cx"> } else {
</span><span class="cx"> Property property = customProperties().get(customValue.name());
</span><del>- setPropertyInternal(property, id, cssValue, linkMatchType);
</del><ins>+ setPropertyInternal(property, id, cssValue, linkMatchType, cascadeLevel);
</ins><span class="cx"> customProperties().set(customValue.name(), property);
</span><span class="cx"> }
</span><span class="cx"> return;
</span><span class="lines">@@ -2610,21 +2666,21 @@
</span><span class="cx"> if (!m_propertyIsPresent[id])
</span><span class="cx"> memset(property.cssValue, 0, sizeof(property.cssValue));
</span><span class="cx"> m_propertyIsPresent.set(id);
</span><del>- setPropertyInternal(property, id, cssValue, linkMatchType);
</del><ins>+ setPropertyInternal(property, id, cssValue, linkMatchType, cascadeLevel);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void StyleResolver::CascadedProperties::setDeferred(CSSPropertyID id, CSSValue& cssValue, unsigned linkMatchType)
</del><ins>+void StyleResolver::CascadedProperties::setDeferred(CSSPropertyID id, CSSValue& cssValue, unsigned linkMatchType, CascadeLevel cascadeLevel)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!CSSProperty::isDirectionAwareProperty(id));
</span><span class="cx"> ASSERT(shouldApplyPropertyInParseOrder(id));
</span><span class="cx">
</span><span class="cx"> Property property;
</span><span class="cx"> memset(property.cssValue, 0, sizeof(property.cssValue));
</span><del>- setPropertyInternal(property, id, cssValue, linkMatchType);
</del><ins>+ setPropertyInternal(property, id, cssValue, linkMatchType, cascadeLevel);
</ins><span class="cx"> m_deferredProperties.append(property);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StyleResolver::CascadedProperties::addStyleProperties(const StyleProperties& properties, StyleRule&, bool isImportant, bool inheritedOnly, PropertyWhitelistType propertyWhitelistType, unsigned linkMatchType)
</del><ins>+void StyleResolver::CascadedProperties::addStyleProperties(const StyleProperties& properties, StyleRule&, bool isImportant, bool inheritedOnly, PropertyWhitelistType propertyWhitelistType, unsigned linkMatchType, CascadeLevel cascadeLevel)
</ins><span class="cx"> {
</span><span class="cx"> for (unsigned i = 0, count = properties.propertyCount(); i < count; ++i) {
</span><span class="cx"> auto current = properties.propertyAt(i);
</span><span class="lines">@@ -2646,12 +2702,21 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (shouldApplyPropertyInParseOrder(propertyID))
</span><del>- setDeferred(propertyID, *current.value(), linkMatchType);
</del><ins>+ setDeferred(propertyID, *current.value(), linkMatchType, cascadeLevel);
</ins><span class="cx"> else
</span><del>- set(propertyID, *current.value(), linkMatchType);
</del><ins>+ set(propertyID, *current.value(), linkMatchType, cascadeLevel);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static CascadeLevel cascadeLevelForIndex(const StyleResolver::MatchResult& matchResult, int index)
+{
+ if (index >= matchResult.ranges.firstUARule && index <= matchResult.ranges.lastUARule)
+ return UserAgentLevel;
+ if (index >= matchResult.ranges.firstUserRule && index <= matchResult.ranges.lastUserRule)
+ return UserLevel;
+ return AuthorLevel;
+}
+
</ins><span class="cx"> void StyleResolver::CascadedProperties::addMatches(const MatchResult& matchResult, bool important, int startIndex, int endIndex, bool inheritedOnly)
</span><span class="cx"> {
</span><span class="cx"> if (startIndex == -1)
</span><span class="lines">@@ -2659,24 +2724,26 @@
</span><span class="cx">
</span><span class="cx"> for (int i = startIndex; i <= endIndex; ++i) {
</span><span class="cx"> const MatchedProperties& matchedProperties = matchResult.matchedProperties()[i];
</span><del>- addStyleProperties(*matchedProperties.properties, *matchResult.matchedRules[i], important, inheritedOnly, static_cast<PropertyWhitelistType>(matchedProperties.whitelistType), matchedProperties.linkMatchType);
</del><ins>+ addStyleProperties(*matchedProperties.properties, *matchResult.matchedRules[i], important, inheritedOnly, static_cast<PropertyWhitelistType>(matchedProperties.whitelistType), matchedProperties.linkMatchType,
+ cascadeLevelForIndex(matchResult, i));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StyleResolver::CascadedProperties::applyDeferredProperties(StyleResolver& resolver)
</del><ins>+void StyleResolver::CascadedProperties::applyDeferredProperties(StyleResolver& resolver, const MatchResult* matchResult)
</ins><span class="cx"> {
</span><span class="cx"> for (auto& property : m_deferredProperties)
</span><del>- property.apply(resolver);
</del><ins>+ property.apply(resolver, matchResult);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void StyleResolver::CascadedProperties::Property::apply(StyleResolver& resolver)
</del><ins>+void StyleResolver::CascadedProperties::Property::apply(StyleResolver& resolver, const MatchResult* matchResult)
</ins><span class="cx"> {
</span><span class="cx"> State& state = resolver.state();
</span><ins>+ state.setCascadeLevel(level);
</ins><span class="cx">
</span><del>- if (cssValue[0]) {
</del><ins>+ if (cssValue[SelectorChecker::MatchDefault]) {
</ins><span class="cx"> state.setApplyPropertyToRegularStyle(true);
</span><span class="cx"> state.setApplyPropertyToVisitedLinkStyle(false);
</span><del>- resolver.applyProperty(id, cssValue[0]);
</del><ins>+ resolver.applyProperty(id, cssValue[SelectorChecker::MatchDefault], SelectorChecker::MatchDefault, matchResult);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (state.style()->insideLink() == NotInsideLink)
</span><span class="lines">@@ -2685,20 +2752,20 @@
</span><span class="cx"> if (cssValue[SelectorChecker::MatchLink]) {
</span><span class="cx"> state.setApplyPropertyToRegularStyle(true);
</span><span class="cx"> state.setApplyPropertyToVisitedLinkStyle(false);
</span><del>- resolver.applyProperty(id, cssValue[SelectorChecker::MatchLink]);
</del><ins>+ resolver.applyProperty(id, cssValue[SelectorChecker::MatchLink], SelectorChecker::MatchLink, matchResult);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (cssValue[SelectorChecker::MatchVisited]) {
</span><span class="cx"> state.setApplyPropertyToRegularStyle(false);
</span><span class="cx"> state.setApplyPropertyToVisitedLinkStyle(true);
</span><del>- resolver.applyProperty(id, cssValue[SelectorChecker::MatchVisited]);
</del><ins>+ resolver.applyProperty(id, cssValue[SelectorChecker::MatchVisited], SelectorChecker::MatchVisited, matchResult);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> state.setApplyPropertyToRegularStyle(true);
</span><span class="cx"> state.setApplyPropertyToVisitedLinkStyle(false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StyleResolver::applyCascadedProperties(CascadedProperties& cascade, int firstProperty, int lastProperty)
</del><ins>+void StyleResolver::applyCascadedProperties(CascadedProperties& cascade, int firstProperty, int lastProperty, const MatchResult* matchResult)
</ins><span class="cx"> {
</span><span class="cx"> for (int id = firstProperty; id <= lastProperty; ++id) {
</span><span class="cx"> CSSPropertyID propertyID = static_cast<CSSPropertyID>(id);
</span><span class="lines">@@ -2707,12 +2774,12 @@
</span><span class="cx"> if (propertyID == CSSPropertyCustom) {
</span><span class="cx"> HashMap<AtomicString, CascadedProperties::Property>::iterator end = cascade.customProperties().end();
</span><span class="cx"> for (HashMap<AtomicString, CascadedProperties::Property>::iterator it = cascade.customProperties().begin(); it != end; ++it)
</span><del>- it->value.apply(*this);
</del><ins>+ it->value.apply(*this, matchResult);
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> auto& property = cascade.property(propertyID);
</span><span class="cx"> ASSERT(!shouldApplyPropertyInParseOrder(propertyID));
</span><del>- property.apply(*this);
</del><ins>+ property.apply(*this, matchResult);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (firstProperty == CSSPropertyCustom)
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.h (191251 => 191252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.h 2015-10-17 22:40:41 UTC (rev 191251)
+++ trunk/Source/WebCore/css/StyleResolver.h 2015-10-17 23:13:43 UTC (rev 191252)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> #include "SelectorFilter.h"
</span><span class="cx"> #include "StyleInheritedData.h"
</span><span class="cx"> #include "ViewportStyleResolver.h"
</span><ins>+#include <bitset>
</ins><span class="cx"> #include <memory>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="lines">@@ -120,6 +121,12 @@
</span><span class="cx"> MatchOnlyUserAgentRules,
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+enum CascadeLevel {
+ UserAgentLevel,
+ AuthorLevel,
+ UserLevel
+};
+
</ins><span class="cx"> class PseudoStyleRequest {
</span><span class="cx"> public:
</span><span class="cx"> PseudoStyleRequest(PseudoId pseudoId, RenderScrollbar* scrollbar = nullptr, ScrollbarPart scrollbarPart = NoPart)
</span><span class="lines">@@ -194,6 +201,8 @@
</span><span class="cx"> Vector<RefPtr<StyleRule>> pseudoStyleRulesForElement(Element*, PseudoId, unsigned rulesToInclude = AllButEmptyCSSRules);
</span><span class="cx">
</span><span class="cx"> public:
</span><ins>+ struct MatchResult;
+
</ins><span class="cx"> void applyPropertyToStyle(CSSPropertyID, CSSValue*, RenderStyle*);
</span><span class="cx">
</span><span class="cx"> void applyPropertyToCurrentStyle(CSSPropertyID, CSSValue*);
</span><span class="lines">@@ -284,7 +293,46 @@
</span><span class="cx"> private:
</span><span class="cx"> Vector<MatchedProperties, 64> m_matchedProperties;
</span><span class="cx"> };
</span><ins>+
+ class CascadedProperties {
+ public:
+ CascadedProperties(TextDirection, WritingMode);
</ins><span class="cx">
</span><ins>+ struct Property {
+ void apply(StyleResolver&, const MatchResult*);
+
+ CSSPropertyID id;
+ CascadeLevel level;
+ CSSValue* cssValue[3];
+ };
+
+ bool hasProperty(CSSPropertyID) const;
+ Property& property(CSSPropertyID);
+ void addMatches(const MatchResult&, bool important, int startIndex, int endIndex, bool inheritedOnly = false);
+
+ void set(CSSPropertyID, CSSValue&, unsigned linkMatchType, CascadeLevel);
+ void setDeferred(CSSPropertyID, CSSValue&, unsigned linkMatchType, CascadeLevel);
+
+ void applyDeferredProperties(StyleResolver&, const MatchResult*);
+
+ HashMap<AtomicString, Property>& customProperties() { return m_customProperties; }
+ bool hasCustomProperty(const String&) const;
+ Property customProperty(const String&) const;
+
+ private:
+ void addStyleProperties(const StyleProperties&, StyleRule&, bool isImportant, bool inheritedOnly, PropertyWhitelistType, unsigned linkMatchType, CascadeLevel);
+ static void setPropertyInternal(Property&, CSSPropertyID, CSSValue&, unsigned linkMatchType, CascadeLevel);
+
+ Property m_properties[numCSSProperties + 2];
+ std::bitset<numCSSProperties + 2> m_propertyIsPresent;
+
+ Vector<Property, 8> m_deferredProperties;
+ HashMap<AtomicString, Property> m_customProperties;
+
+ TextDirection m_direction;
+ WritingMode m_writingMode;
+ };
+
</ins><span class="cx"> private:
</span><span class="cx"> // This function fixes up the default font size if it detects that the current generic font family has changed. -dwh
</span><span class="cx"> void checkForGenericFamilyChange(RenderStyle*, RenderStyle* parentStyle);
</span><span class="lines">@@ -305,9 +353,7 @@
</span><span class="cx"> enum ShouldUseMatchedPropertiesCache { DoNotUseMatchedPropertiesCache = 0, UseMatchedPropertiesCache };
</span><span class="cx"> void applyMatchedProperties(const MatchResult&, const Element*, ShouldUseMatchedPropertiesCache = UseMatchedPropertiesCache);
</span><span class="cx">
</span><del>- class CascadedProperties;
-
- void applyCascadedProperties(CascadedProperties&, int firstProperty, int lastProperty);
</del><ins>+ void applyCascadedProperties(CascadedProperties&, int firstProperty, int lastProperty, const MatchResult*);
</ins><span class="cx"> void cascadeMatches(CascadedProperties&, const MatchResult&, bool important, int startIndex, int endIndex, bool inheritedOnly);
</span><span class="cx">
</span><span class="cx"> static bool isValidRegionStyleProperty(CSSPropertyID);
</span><span class="lines">@@ -376,7 +422,7 @@
</span><span class="cx"> bool applyPropertyToRegularStyle() const { return m_applyPropertyToRegularStyle; }
</span><span class="cx"> bool applyPropertyToVisitedLinkStyle() const { return m_applyPropertyToVisitedLinkStyle; }
</span><span class="cx"> PendingImagePropertyMap& pendingImageProperties() { return m_pendingImageProperties; }
</span><del>-
</del><ins>+
</ins><span class="cx"> Vector<RefPtr<ReferenceFilterOperation>>& filtersWithPendingSVGDocuments() { return m_filtersWithPendingSVGDocuments; }
</span><span class="cx">
</span><span class="cx"> void setFontDirty(bool isDirty) { m_fontDirty = isDirty; }
</span><span class="lines">@@ -402,6 +448,15 @@
</span><span class="cx">
</span><span class="cx"> CSSToLengthConversionData cssToLengthConversionData() const { return m_cssToLengthConversionData; }
</span><span class="cx">
</span><ins>+ CascadeLevel cascadeLevel() const { return m_cascadeLevel; }
+ void setCascadeLevel(CascadeLevel level) { m_cascadeLevel = level; }
+
+ CascadedProperties* authorRollback() const { return m_authorRollback.get(); }
+ CascadedProperties* userRollback() const { return m_userRollback.get(); }
+
+ void setAuthorRollback(std::unique_ptr<CascadedProperties>& rollback) { m_authorRollback = WTF::move(rollback); }
+ void setUserRollback(std::unique_ptr<CascadedProperties>& rollback) { m_userRollback = WTF::move(rollback); }
+
</ins><span class="cx"> private:
</span><span class="cx"> void updateConversionData();
</span><span class="cx">
</span><span class="lines">@@ -434,6 +489,10 @@
</span><span class="cx"> Color m_backgroundColor;
</span><span class="cx">
</span><span class="cx"> CSSToLengthConversionData m_cssToLengthConversionData;
</span><ins>+
+ CascadeLevel m_cascadeLevel { UserAgentLevel };
+ std::unique_ptr<CascadedProperties> m_authorRollback;
+ std::unique_ptr<CascadedProperties> m_userRollback;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> State& state() { return m_state; }
</span><span class="lines">@@ -451,6 +510,11 @@
</span><span class="cx"> bool applyPropertyToRegularStyle() const { return m_state.applyPropertyToRegularStyle(); }
</span><span class="cx"> bool applyPropertyToVisitedLinkStyle() const { return m_state.applyPropertyToVisitedLinkStyle(); }
</span><span class="cx">
</span><ins>+ CascadeLevel cascadeLevel() const { return m_state.cascadeLevel(); }
+ void setCascadeLevel(CascadeLevel level) { m_state.setCascadeLevel(level); }
+
+ CascadedProperties* cascadedPropertiesForRollback(const MatchResult&);
+
</ins><span class="cx"> CSSToStyleMap* styleMap() { return &m_styleMap; }
</span><span class="cx"> InspectorCSSOMWrappers& inspectorCSSOMWrappers() { return m_inspectorCSSOMWrappers; }
</span><span class="cx"> const FontCascadeDescription& fontDescription() { return m_state.fontDescription(); }
</span><span class="lines">@@ -468,7 +532,7 @@
</span><span class="cx">
</span><span class="cx"> bool canShareStyleWithControl(StyledElement*) const;
</span><span class="cx">
</span><del>- void applyProperty(CSSPropertyID, CSSValue*);
</del><ins>+ void applyProperty(CSSPropertyID, CSSValue*, SelectorChecker::LinkMatchMask = SelectorChecker::MatchDefault, const MatchResult* = nullptr);
</ins><span class="cx"> RefPtr<CSSValue> resolvedVariableValue(CSSPropertyID, const CSSVariableDependentValue&);
</span><span class="cx">
</span><span class="cx"> void applySVGProperty(CSSPropertyID, CSSValue*);
</span></span></pre>
</div>
</div>
</body>
</html>