<!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>[209838] trunk/Source/WebCore</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/209838">209838</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2016-12-14 15:15:24 -0800 (Wed, 14 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Parser] Rename StyleKeyframe to StyleRuleKeyframe
https://bugs.webkit.org/show_bug.cgi?id=165876
Reviewed by Simon Fraser.
* css/CSSKeyframeRule.cpp:
(WebCore::StyleRuleKeyframe::StyleRuleKeyframe):
(WebCore::StyleRuleKeyframe::~StyleRuleKeyframe):
(WebCore::StyleRuleKeyframe::mutableProperties):
(WebCore::StyleRuleKeyframe::keyText):
(WebCore::StyleRuleKeyframe::setKeyText):
(WebCore::StyleRuleKeyframe::cssText):
(WebCore::CSSKeyframeRule::CSSKeyframeRule):
(WebCore::StyleKeyframe::StyleKeyframe): Deleted.
(WebCore::StyleKeyframe::~StyleKeyframe): Deleted.
(WebCore::StyleKeyframe::mutableProperties): Deleted.
(WebCore::StyleKeyframe::keyText): Deleted.
(WebCore::StyleKeyframe::setKeyText): Deleted.
(WebCore::StyleKeyframe::cssText): Deleted.
* css/CSSKeyframeRule.h:
* css/CSSKeyframesRule.cpp:
(WebCore::StyleRuleKeyframes::keyframes):
(WebCore::StyleRuleKeyframes::parserAppendKeyframe):
(WebCore::StyleRuleKeyframes::wrapperAppendKeyframe):
(WebCore::CSSKeyframesRule::appendRule):
(WebCore::CSSKeyframesRule::item):
* css/CSSKeyframesRule.h:
* css/StyleResolver.cpp:
(WebCore::StyleResolver::styleForKeyframe):
(WebCore::StyleResolver::keyframeStylesForAnimation):
* css/StyleResolver.h:
* css/StyleRule.cpp:
(WebCore::StyleRuleBase::destroy):
* css/StyleRule.h:
* css/parser/CSSParser.cpp:
(WebCore::CSSParser::parseKeyframeRule):
* css/parser/CSSParser.h:
* css/parser/CSSParserImpl.cpp:
(WebCore::CSSParserImpl::parseDeferredKeyframeList):
(WebCore::CSSParserImpl::consumeKeyframesRule):
(WebCore::CSSParserImpl::consumeKeyframeStyleRule):
* css/parser/CSSParserImpl.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSKeyframeRulecpp">trunk/Source/WebCore/css/CSSKeyframeRule.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSKeyframeRuleh">trunk/Source/WebCore/css/CSSKeyframeRule.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSKeyframesRulecpp">trunk/Source/WebCore/css/CSSKeyframesRule.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSKeyframesRuleh">trunk/Source/WebCore/css/CSSKeyframesRule.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>
<li><a href="#trunkSourceWebCorecssStyleRulecpp">trunk/Source/WebCore/css/StyleRule.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleRuleh">trunk/Source/WebCore/css/StyleRule.h</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParsercpp">trunk/Source/WebCore/css/parser/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParserh">trunk/Source/WebCore/css/parser/CSSParser.h</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParserImplcpp">trunk/Source/WebCore/css/parser/CSSParserImpl.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParserImplh">trunk/Source/WebCore/css/parser/CSSParserImpl.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209837 => 209838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-14 23:01:17 UTC (rev 209837)
+++ trunk/Source/WebCore/ChangeLog 2016-12-14 23:15:24 UTC (rev 209838)
</span><span class="lines">@@ -1,5 +1,50 @@
</span><span class="cx"> 2016-12-14 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><ins>+ [CSS Parser] Rename StyleKeyframe to StyleRuleKeyframe
+ https://bugs.webkit.org/show_bug.cgi?id=165876
+
+ Reviewed by Simon Fraser.
+
+ * css/CSSKeyframeRule.cpp:
+ (WebCore::StyleRuleKeyframe::StyleRuleKeyframe):
+ (WebCore::StyleRuleKeyframe::~StyleRuleKeyframe):
+ (WebCore::StyleRuleKeyframe::mutableProperties):
+ (WebCore::StyleRuleKeyframe::keyText):
+ (WebCore::StyleRuleKeyframe::setKeyText):
+ (WebCore::StyleRuleKeyframe::cssText):
+ (WebCore::CSSKeyframeRule::CSSKeyframeRule):
+ (WebCore::StyleKeyframe::StyleKeyframe): Deleted.
+ (WebCore::StyleKeyframe::~StyleKeyframe): Deleted.
+ (WebCore::StyleKeyframe::mutableProperties): Deleted.
+ (WebCore::StyleKeyframe::keyText): Deleted.
+ (WebCore::StyleKeyframe::setKeyText): Deleted.
+ (WebCore::StyleKeyframe::cssText): Deleted.
+ * css/CSSKeyframeRule.h:
+ * css/CSSKeyframesRule.cpp:
+ (WebCore::StyleRuleKeyframes::keyframes):
+ (WebCore::StyleRuleKeyframes::parserAppendKeyframe):
+ (WebCore::StyleRuleKeyframes::wrapperAppendKeyframe):
+ (WebCore::CSSKeyframesRule::appendRule):
+ (WebCore::CSSKeyframesRule::item):
+ * css/CSSKeyframesRule.h:
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::styleForKeyframe):
+ (WebCore::StyleResolver::keyframeStylesForAnimation):
+ * css/StyleResolver.h:
+ * css/StyleRule.cpp:
+ (WebCore::StyleRuleBase::destroy):
+ * css/StyleRule.h:
+ * css/parser/CSSParser.cpp:
+ (WebCore::CSSParser::parseKeyframeRule):
+ * css/parser/CSSParser.h:
+ * css/parser/CSSParserImpl.cpp:
+ (WebCore::CSSParserImpl::parseDeferredKeyframeList):
+ (WebCore::CSSParserImpl::consumeKeyframesRule):
+ (WebCore::CSSParserImpl::consumeKeyframeStyleRule):
+ * css/parser/CSSParserImpl.h:
+
+2016-12-14 Dave Hyatt <hyatt@apple.com>
+
</ins><span class="cx"> [CSS Parser] Make deferred parsing retain the sheet text. Fix invalidation to avoid deferred parsing.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=165868
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSKeyframeRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSKeyframeRule.cpp (209837 => 209838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSKeyframeRule.cpp 2016-12-14 23:01:17 UTC (rev 209837)
+++ trunk/Source/WebCore/css/CSSKeyframeRule.cpp 2016-12-14 23:15:24 UTC (rev 209838)
</span><span class="lines">@@ -33,13 +33,13 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-StyleKeyframe::StyleKeyframe(Ref<StyleProperties>&& properties)
</del><ins>+StyleRuleKeyframe::StyleRuleKeyframe(Ref<StyleProperties>&& properties)
</ins><span class="cx"> : StyleRuleBase(Keyframe)
</span><span class="cx"> , m_properties(WTFMove(properties))
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-StyleKeyframe::StyleKeyframe(std::unique_ptr<Vector<double>> keys, Ref<StyleProperties>&& properties)
</del><ins>+StyleRuleKeyframe::StyleRuleKeyframe(std::unique_ptr<Vector<double>> keys, Ref<StyleProperties>&& properties)
</ins><span class="cx"> : StyleRuleBase(Keyframe)
</span><span class="cx"> , m_properties(WTFMove(properties))
</span><span class="cx"> , m_keys(*keys)
</span><span class="lines">@@ -46,11 +46,11 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-StyleKeyframe::~StyleKeyframe()
</del><ins>+StyleRuleKeyframe::~StyleRuleKeyframe()
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-MutableStyleProperties& StyleKeyframe::mutableProperties()
</del><ins>+MutableStyleProperties& StyleRuleKeyframe::mutableProperties()
</ins><span class="cx"> {
</span><span class="cx"> if (!is<MutableStyleProperties>(m_properties.get()))
</span><span class="cx"> m_properties = m_properties->mutableCopy();
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> return downcast<MutableStyleProperties>(m_properties.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String StyleKeyframe::keyText() const
</del><ins>+String StyleRuleKeyframe::keyText() const
</ins><span class="cx"> {
</span><span class="cx"> StringBuilder keyText;
</span><span class="cx">
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> return keyText.toString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool StyleKeyframe::setKeyText(const String& keyText)
</del><ins>+bool StyleRuleKeyframe::setKeyText(const String& keyText)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!keyText.isNull());
</span><span class="cx"> auto keys = CSSParser::parseKeyframeKeyList(keyText);
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String StyleKeyframe::cssText() const
</del><ins>+String StyleRuleKeyframe::cssText() const
</ins><span class="cx"> {
</span><span class="cx"> StringBuilder result;
</span><span class="cx"> result.append(keyText());
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> return result.toString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CSSKeyframeRule::CSSKeyframeRule(StyleKeyframe& keyframe, CSSKeyframesRule* parent)
</del><ins>+CSSKeyframeRule::CSSKeyframeRule(StyleRuleKeyframe& keyframe, CSSKeyframesRule* parent)
</ins><span class="cx"> : CSSRule(0)
</span><span class="cx"> , m_keyframe(keyframe)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSKeyframeRuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSKeyframeRule.h (209837 => 209838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSKeyframeRule.h 2016-12-14 23:01:17 UTC (rev 209837)
+++ trunk/Source/WebCore/css/CSSKeyframeRule.h 2016-12-14 23:15:24 UTC (rev 209838)
</span><span class="lines">@@ -36,20 +36,18 @@
</span><span class="cx"> class StyleRuleCSSStyleDeclaration;
</span><span class="cx"> class CSSKeyframesRule;
</span><span class="cx">
</span><del>-// FIXME-NEWPARSER: Rename this to StyleRuleKeyframe
-class StyleKeyframe final : public StyleRuleBase {
</del><ins>+class StyleRuleKeyframe final : public StyleRuleBase {
</ins><span class="cx"> public:
</span><del>- // FIXME-NEWPARSER: Remove this create function once we get rid of the old parser.
- static Ref<StyleKeyframe> create(Ref<StyleProperties>&& properties)
</del><ins>+ static Ref<StyleRuleKeyframe> create(Ref<StyleProperties>&& properties)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new StyleKeyframe(WTFMove(properties)));
</del><ins>+ return adoptRef(*new StyleRuleKeyframe(WTFMove(properties)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- static Ref<StyleKeyframe> create(std::unique_ptr<Vector<double>> keys, Ref<StyleProperties>&& properties)
</del><ins>+ static Ref<StyleRuleKeyframe> create(std::unique_ptr<Vector<double>> keys, Ref<StyleProperties>&& properties)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new StyleKeyframe(WTFMove(keys), WTFMove(properties)));
</del><ins>+ return adoptRef(*new StyleRuleKeyframe(WTFMove(keys), WTFMove(properties)));
</ins><span class="cx"> }
</span><del>- ~StyleKeyframe();
</del><ins>+ ~StyleRuleKeyframe();
</ins><span class="cx">
</span><span class="cx"> String keyText() const;
</span><span class="cx"> bool setKeyText(const String&);
</span><span class="lines">@@ -68,8 +66,8 @@
</span><span class="cx"> String cssText() const;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit StyleKeyframe(Ref<StyleProperties>&&);
- StyleKeyframe(std::unique_ptr<Vector<double>>, Ref<StyleProperties>&&);
</del><ins>+ explicit StyleRuleKeyframe(Ref<StyleProperties>&&);
+ StyleRuleKeyframe(std::unique_ptr<Vector<double>>, Ref<StyleProperties>&&);
</ins><span class="cx">
</span><span class="cx"> Ref<StyleProperties> m_properties;
</span><span class="cx"> Vector<double> m_keys;
</span><span class="lines">@@ -88,11 +86,11 @@
</span><span class="cx"> CSSStyleDeclaration& style();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- CSSKeyframeRule(StyleKeyframe&, CSSKeyframesRule* parent);
</del><ins>+ CSSKeyframeRule(StyleRuleKeyframe&, CSSKeyframesRule* parent);
</ins><span class="cx">
</span><span class="cx"> CSSRule::Type type() const final { return KEYFRAME_RULE; }
</span><span class="cx">
</span><del>- Ref<StyleKeyframe> m_keyframe;
</del><ins>+ Ref<StyleRuleKeyframe> m_keyframe;
</ins><span class="cx"> mutable RefPtr<StyleRuleCSSStyleDeclaration> m_propertiesCSSOMWrapper;
</span><span class="cx">
</span><span class="cx"> friend class CSSKeyframesRule;
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSKeyframesRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSKeyframesRule.cpp (209837 => 209838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSKeyframesRule.cpp 2016-12-14 23:01:17 UTC (rev 209837)
+++ trunk/Source/WebCore/css/CSSKeyframesRule.cpp 2016-12-14 23:15:24 UTC (rev 209838)
</span><span class="lines">@@ -74,13 +74,13 @@
</span><span class="cx"> m_deferredRules = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const Vector<Ref<StyleKeyframe>>& StyleRuleKeyframes::keyframes() const
</del><ins>+const Vector<Ref<StyleRuleKeyframe>>& StyleRuleKeyframes::keyframes() const
</ins><span class="cx"> {
</span><span class="cx"> parseDeferredRulesIfNeeded();
</span><span class="cx"> return m_keyframes;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StyleRuleKeyframes::parserAppendKeyframe(RefPtr<StyleKeyframe>&& keyframe)
</del><ins>+void StyleRuleKeyframes::parserAppendKeyframe(RefPtr<StyleRuleKeyframe>&& keyframe)
</ins><span class="cx"> {
</span><span class="cx"> if (!keyframe)
</span><span class="cx"> return;
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> m_keyframes.append(keyframe.releaseNonNull());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StyleRuleKeyframes::wrapperAppendKeyframe(Ref<StyleKeyframe>&& keyframe)
</del><ins>+void StyleRuleKeyframes::wrapperAppendKeyframe(Ref<StyleRuleKeyframe>&& keyframe)
</ins><span class="cx"> {
</span><span class="cx"> parseDeferredRulesIfNeeded();
</span><span class="cx"> m_keyframes.append(WTFMove(keyframe));
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> ASSERT(m_childRuleCSSOMWrappers.size() == m_keyframesRule->keyframes().size());
</span><span class="cx">
</span><span class="cx"> CSSParser parser(parserContext());
</span><del>- RefPtr<StyleKeyframe> keyframe = parser.parseKeyframeRule(ruleText);
</del><ins>+ RefPtr<StyleRuleKeyframe> keyframe = parser.parseKeyframeRule(ruleText);
</ins><span class="cx"> if (!keyframe)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx"> ASSERT(m_childRuleCSSOMWrappers.size() == m_keyframesRule->keyframes().size());
</span><span class="cx"> RefPtr<CSSKeyframeRule>& rule = m_childRuleCSSOMWrappers[index];
</span><span class="cx"> if (!rule)
</span><del>- rule = adoptRef(new CSSKeyframeRule(const_cast<StyleKeyframe&>(m_keyframesRule->keyframes()[index].get()), const_cast<CSSKeyframesRule*>(this)));
</del><ins>+ rule = adoptRef(new CSSKeyframeRule(const_cast<StyleRuleKeyframe&>(m_keyframesRule->keyframes()[index].get()), const_cast<CSSKeyframesRule*>(this)));
</ins><span class="cx">
</span><span class="cx"> return rule.get();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSKeyframesRuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSKeyframesRule.h (209837 => 209838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSKeyframesRule.h 2016-12-14 23:01:17 UTC (rev 209837)
+++ trunk/Source/WebCore/css/CSSKeyframesRule.h 2016-12-14 23:15:24 UTC (rev 209838)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class CSSRuleList;
</span><del>-class StyleKeyframe;
</del><ins>+class StyleRuleKeyframe;
</ins><span class="cx"> class CSSKeyframeRule;
</span><span class="cx">
</span><span class="cx"> class StyleRuleKeyframes final : public StyleRuleBase {
</span><span class="lines">@@ -44,14 +44,14 @@
</span><span class="cx">
</span><span class="cx"> ~StyleRuleKeyframes();
</span><span class="cx">
</span><del>- const Vector<Ref<StyleKeyframe>>& keyframes() const;
- const Vector<Ref<StyleKeyframe>>* keyframesWithoutDeferredParsing() const
</del><ins>+ const Vector<Ref<StyleRuleKeyframe>>& keyframes() const;
+ const Vector<Ref<StyleRuleKeyframe>>* keyframesWithoutDeferredParsing() const
</ins><span class="cx"> {
</span><span class="cx"> return !m_deferredRules ? &m_keyframes : nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void parserAppendKeyframe(RefPtr<StyleKeyframe>&&);
- void wrapperAppendKeyframe(Ref<StyleKeyframe>&&);
</del><ins>+ void parserAppendKeyframe(RefPtr<StyleRuleKeyframe>&&);
+ void wrapperAppendKeyframe(Ref<StyleRuleKeyframe>&&);
</ins><span class="cx"> void wrapperRemoveKeyframe(unsigned);
</span><span class="cx">
</span><span class="cx"> const AtomicString& name() const { return m_name; }
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx">
</span><span class="cx"> void parseDeferredRulesIfNeeded() const;
</span><span class="cx">
</span><del>- mutable Vector<Ref<StyleKeyframe>> m_keyframes;
</del><ins>+ mutable Vector<Ref<StyleRuleKeyframe>> m_keyframes;
</ins><span class="cx"> AtomicString m_name;
</span><span class="cx">
</span><span class="cx"> mutable std::unique_ptr<DeferredStyleGroupRuleList> m_deferredRules;
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (209837 => 209838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2016-12-14 23:01:17 UTC (rev 209837)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2016-12-14 23:15:24 UTC (rev 209838)
</span><span class="lines">@@ -444,7 +444,7 @@
</span><span class="cx"> return { state.takeStyle(), WTFMove(elementStyleRelations) };
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::unique_ptr<RenderStyle> StyleResolver::styleForKeyframe(const RenderStyle* elementStyle, const StyleKeyframe* keyframe, KeyframeValue& keyframeValue)
</del><ins>+std::unique_ptr<RenderStyle> StyleResolver::styleForKeyframe(const RenderStyle* elementStyle, const StyleRuleKeyframe* keyframe, KeyframeValue& keyframeValue)
</ins><span class="cx"> {
</span><span class="cx"> RELEASE_ASSERT(!m_isDeleted);
</span><span class="cx">
</span><span class="lines">@@ -516,7 +516,7 @@
</span><span class="cx"> const StyleRuleKeyframes* keyframesRule = it->value.get();
</span><span class="cx">
</span><span class="cx"> auto* keyframes = &keyframesRule->keyframes();
</span><del>- Vector<Ref<StyleKeyframe>> newKeyframesIfNecessary;
</del><ins>+ Vector<Ref<StyleRuleKeyframe>> newKeyframesIfNecessary;
</ins><span class="cx">
</span><span class="cx"> bool hasDuplicateKeys = false;
</span><span class="cx"> HashSet<double> keyframeKeys;
</span><span class="lines">@@ -535,7 +535,7 @@
</span><span class="cx"> // to copy the HashMap into a Vector.
</span><span class="cx"> if (hasDuplicateKeys) {
</span><span class="cx"> // Merge duplicate key times.
</span><del>- HashMap<double, RefPtr<StyleKeyframe>> keyframesMap;
</del><ins>+ HashMap<double, RefPtr<StyleRuleKeyframe>> keyframesMap;
</ins><span class="cx">
</span><span class="cx"> for (auto& originalKeyframe : keyframesRule->keyframes()) {
</span><span class="cx"> for (auto key : originalKeyframe->keys()) {
</span><span class="lines">@@ -542,10 +542,10 @@
</span><span class="cx"> if (auto keyframe = keyframesMap.get(key))
</span><span class="cx"> keyframe->mutableProperties().mergeAndOverrideOnConflict(originalKeyframe->properties());
</span><span class="cx"> else {
</span><del>- auto styleKeyframe = StyleKeyframe::create(MutableStyleProperties::create());
- styleKeyframe.ptr()->setKey(key);
- styleKeyframe.ptr()->mutableProperties().mergeAndOverrideOnConflict(originalKeyframe->properties());
- keyframesMap.set(key, styleKeyframe.ptr());
</del><ins>+ auto StyleRuleKeyframe = StyleRuleKeyframe::create(MutableStyleProperties::create());
+ StyleRuleKeyframe.ptr()->setKey(key);
+ StyleRuleKeyframe.ptr()->mutableProperties().mergeAndOverrideOnConflict(originalKeyframe->properties());
+ keyframesMap.set(key, StyleRuleKeyframe.ptr());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -573,9 +573,9 @@
</span><span class="cx"> // If the 0% keyframe is missing, create it (but only if there is at least one other keyframe).
</span><span class="cx"> int initialListSize = list.size();
</span><span class="cx"> if (initialListSize > 0 && list[0].key()) {
</span><del>- static StyleKeyframe* zeroPercentKeyframe;
</del><ins>+ static StyleRuleKeyframe* zeroPercentKeyframe;
</ins><span class="cx"> if (!zeroPercentKeyframe) {
</span><del>- zeroPercentKeyframe = &StyleKeyframe::create(MutableStyleProperties::create()).leakRef();
</del><ins>+ zeroPercentKeyframe = &StyleRuleKeyframe::create(MutableStyleProperties::create()).leakRef();
</ins><span class="cx"> zeroPercentKeyframe->setKey(0);
</span><span class="cx"> }
</span><span class="cx"> KeyframeValue keyframeValue(0, nullptr);
</span><span class="lines">@@ -585,9 +585,9 @@
</span><span class="cx">
</span><span class="cx"> // If the 100% keyframe is missing, create it (but only if there is at least one other keyframe).
</span><span class="cx"> if (initialListSize > 0 && (list[list.size() - 1].key() != 1)) {
</span><del>- static StyleKeyframe* hundredPercentKeyframe;
</del><ins>+ static StyleRuleKeyframe* hundredPercentKeyframe;
</ins><span class="cx"> if (!hundredPercentKeyframe) {
</span><del>- hundredPercentKeyframe = &StyleKeyframe::create(MutableStyleProperties::create()).leakRef();
</del><ins>+ hundredPercentKeyframe = &StyleRuleKeyframe::create(MutableStyleProperties::create()).leakRef();
</ins><span class="cx"> hundredPercentKeyframe->setKey(1);
</span><span class="cx"> }
</span><span class="cx"> KeyframeValue keyframeValue(1, nullptr);
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.h (209837 => 209838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.h 2016-12-14 23:01:17 UTC (rev 209837)
+++ trunk/Source/WebCore/css/StyleResolver.h 2016-12-14 23:15:24 UTC (rev 209838)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> class StyleCachedImage;
</span><span class="cx"> class StyleGeneratedImage;
</span><span class="cx"> class StyleImage;
</span><del>-class StyleKeyframe;
</del><ins>+class StyleRuleKeyframe;
</ins><span class="cx"> class StyleProperties;
</span><span class="cx"> class StyleRule;
</span><span class="cx"> class StyleRuleKeyframes;
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx"> void setOverrideDocumentElementStyle(RenderStyle* style) { m_overrideDocumentElementStyle = style; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- std::unique_ptr<RenderStyle> styleForKeyframe(const RenderStyle*, const StyleKeyframe*, KeyframeValue&);
</del><ins>+ std::unique_ptr<RenderStyle> styleForKeyframe(const RenderStyle*, const StyleRuleKeyframe*, KeyframeValue&);
</ins><span class="cx">
</span><span class="cx"> public:
</span><span class="cx"> // These methods will give back the set of rules that matched for a given element (or a pseudo-element).
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleRule.cpp (209837 => 209838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleRule.cpp 2016-12-14 23:01:17 UTC (rev 209837)
+++ trunk/Source/WebCore/css/StyleRule.cpp 2016-12-14 23:15:24 UTC (rev 209838)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> delete downcast<StyleRuleNamespace>(this);
</span><span class="cx"> return;
</span><span class="cx"> case Keyframe:
</span><del>- delete downcast<StyleKeyframe>(this);
</del><ins>+ delete downcast<StyleRuleKeyframe>(this);
</ins><span class="cx"> return;
</span><span class="cx"> case Charset:
</span><span class="cx"> delete downcast<StyleRuleCharset>(this);
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleRuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleRule.h (209837 => 209838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleRule.h 2016-12-14 23:01:17 UTC (rev 209837)
+++ trunk/Source/WebCore/css/StyleRule.h 2016-12-14 23:15:24 UTC (rev 209838)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> class CSSStyleSheet;
</span><span class="cx"> class MediaQuerySet;
</span><span class="cx"> class MutableStyleProperties;
</span><del>-class StyleKeyframe;
</del><ins>+class StyleRuleKeyframe;
</ins><span class="cx"> class StyleProperties;
</span><span class="cx"> class StyleRuleKeyframes;
</span><span class="cx">
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> FontFace,
</span><span class="cx"> Page,
</span><span class="cx"> Keyframes,
</span><del>- Keyframe, // Not used. These are internally non-rule StyleKeyframe objects.
</del><ins>+ Keyframe, // Not used. These are internally non-rule StyleRuleKeyframe objects.
</ins><span class="cx"> Namespace,
</span><span class="cx"> Supports = 12,
</span><span class="cx"> #if ENABLE(CSS_DEVICE_ADAPTATION)
</span><span class="lines">@@ -393,7 +393,7 @@
</span><span class="cx"> static bool isType(const WebCore::StyleRuleBase& rule) { return rule.isNamespaceRule(); }
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_END()
</span><span class="cx">
</span><del>-SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::StyleKeyframe)
</del><ins>+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::StyleRuleKeyframe)
</ins><span class="cx"> static bool isType(const WebCore::StyleRuleBase& rule) { return rule.isKeyframeRule(); }
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_END()
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParser.cpp (209837 => 209838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParser.cpp 2016-12-14 23:01:17 UTC (rev 209837)
+++ trunk/Source/WebCore/css/parser/CSSParser.cpp 2016-12-14 23:15:24 UTC (rev 209838)
</span><span class="lines">@@ -150,10 +150,10 @@
</span><span class="cx"> return CSSParserImpl::parseRule(string, context, sheet, CSSParserImpl::AllowImportRules);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<StyleKeyframe> CSSParser::parseKeyframeRule(const String& string)
</del><ins>+RefPtr<StyleRuleKeyframe> CSSParser::parseKeyframeRule(const String& string)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<StyleRuleBase> keyframe = CSSParserImpl::parseRule(string, m_context, nullptr, CSSParserImpl::KeyframeRules);
</span><del>- return downcast<StyleKeyframe>(keyframe.get());
</del><ins>+ return downcast<StyleRuleKeyframe>(keyframe.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSSParser::parseSupportsCondition(const String& condition)
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParser.h (209837 => 209838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParser.h 2016-12-14 23:01:17 UTC (rev 209837)
+++ trunk/Source/WebCore/css/parser/CSSParser.h 2016-12-14 23:15:24 UTC (rev 209838)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> class ImmutableStyleProperties;
</span><span class="cx"> class MutableStyleProperties;
</span><span class="cx"> class StyleRuleBase;
</span><del>-class StyleKeyframe;
</del><ins>+class StyleRuleKeyframe;
</ins><span class="cx"> class StyleSheetContents;
</span><span class="cx">
</span><span class="cx"> class CSSParser {
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx">
</span><span class="cx"> static RefPtr<StyleRuleBase> parseRule(const CSSParserContext&, StyleSheetContents*, const String&);
</span><span class="cx">
</span><del>- RefPtr<StyleKeyframe> parseKeyframeRule(const String&);
</del><ins>+ RefPtr<StyleRuleKeyframe> parseKeyframeRule(const String&);
</ins><span class="cx"> static std::unique_ptr<Vector<double>> parseKeyframeKeyList(const String&);
</span><span class="cx">
</span><span class="cx"> bool parseSupportsCondition(const String&);
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParserImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParserImpl.cpp (209837 => 209838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParserImpl.cpp 2016-12-14 23:01:17 UTC (rev 209837)
+++ trunk/Source/WebCore/css/parser/CSSParserImpl.cpp 2016-12-14 23:15:24 UTC (rev 209838)
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> return;
</span><span class="cx"> CSSParserImpl parser(deferredParser);
</span><span class="cx"> parser.consumeRuleList(tokenRange, KeyframesRuleList, [&keyframeRule](const RefPtr<StyleRuleBase>& keyframe) {
</span><del>- keyframeRule.parserAppendKeyframe(downcast<const StyleKeyframe>(keyframe.get()));
</del><ins>+ keyframeRule.parserAppendKeyframe(downcast<const StyleRuleKeyframe>(keyframe.get()));
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -649,7 +649,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<StyleRuleKeyframes> keyframeRule = StyleRuleKeyframes::create(name);
</span><span class="cx"> consumeRuleList(block, KeyframesRuleList, [keyframeRule](const RefPtr<StyleRuleBase>& keyframe) {
</span><del>- keyframeRule->parserAppendKeyframe(downcast<const StyleKeyframe>(keyframe.get()));
</del><ins>+ keyframeRule->parserAppendKeyframe(downcast<const StyleRuleKeyframe>(keyframe.get()));
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> // FIXME-NEWPARSER: Find out why this is done. Behavior difference when prefixed?
</span><span class="lines">@@ -714,7 +714,7 @@
</span><span class="cx"> }
</span><span class="cx"> */
</span><span class="cx">
</span><del>-RefPtr<StyleKeyframe> CSSParserImpl::consumeKeyframeStyleRule(CSSParserTokenRange prelude, CSSParserTokenRange block)
</del><ins>+RefPtr<StyleRuleKeyframe> CSSParserImpl::consumeKeyframeStyleRule(CSSParserTokenRange prelude, CSSParserTokenRange block)
</ins><span class="cx"> {
</span><span class="cx"> std::unique_ptr<Vector<double>> keyList = consumeKeyframeKeyList(prelude);
</span><span class="cx"> if (!keyList)
</span><span class="lines">@@ -726,7 +726,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> consumeDeclarationList(block, StyleRule::Keyframe);
</span><del>- return StyleKeyframe::create(WTFMove(keyList), createStyleProperties(m_parsedProperties, m_context.mode));
</del><ins>+ return StyleRuleKeyframe::create(WTFMove(keyList), createStyleProperties(m_parsedProperties, m_context.mode));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void observeSelectors(CSSParserObserverWrapper& wrapper, CSSParserTokenRange selectors)
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParserImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParserImpl.h (209837 => 209838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParserImpl.h 2016-12-14 23:01:17 UTC (rev 209837)
+++ trunk/Source/WebCore/css/parser/CSSParserImpl.h 2016-12-14 23:15:24 UTC (rev 209838)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> class CSSParserObserverWrapper;
</span><span class="cx"> class CSSSelectorList;
</span><span class="cx"> class CSSTokenizer;
</span><del>-class StyleKeyframe;
</del><ins>+class StyleRuleKeyframe;
</ins><span class="cx"> class StyleRule;
</span><span class="cx"> class StyleRuleBase;
</span><span class="cx"> class StyleRuleCharset;
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> // FIXME-NEWPARSER: Support "apply"
</span><span class="cx"> // void consumeApplyRule(CSSParserTokenRange prelude);
</span><span class="cx">
</span><del>- RefPtr<StyleKeyframe> consumeKeyframeStyleRule(CSSParserTokenRange prelude, CSSParserTokenRange block);
</del><ins>+ RefPtr<StyleRuleKeyframe> consumeKeyframeStyleRule(CSSParserTokenRange prelude, CSSParserTokenRange block);
</ins><span class="cx"> RefPtr<StyleRule> consumeStyleRule(CSSParserTokenRange prelude, CSSParserTokenRange block);
</span><span class="cx">
</span><span class="cx"> void consumeDeclarationList(CSSParserTokenRange, StyleRule::Type);
</span></span></pre>
</div>
</div>
</body>
</html>