Changeset 209794 in webkit for trunk/Source/WebCore/css/CSSKeyframesRule.cpp

Timestamp:

Dec 14, 2016, 12:23:23 AM (8 years ago)

Author:

[email protected]

Message:

Source/WebCore:
Unreviewed, rolling out r209792.
​https://bugs.webkit.org/show_bug.cgi?id=165841

Cause build failures (Requested by yusukesuzuki on #webkit).

Reverted changeset:

"Use JSValue::toWTFString instead of calling toString(exec)
and value(exec)"
​https://bugs.webkit.org/show_bug.cgi?id=165795
​http://trac.webkit.org/changeset/209792

Patch by Commit Queue <​[email protected]> on 2016-12-13

LayoutTests:
ASSERTION FAILED: hasParserBlockingScript() seen with js/dom/modules/module-will-fire-beforeload.html
​https://bugs.webkit.org/show_bug.cgi?id=164883

Patch by Yusuke Suzuki <Yusuke Suzuki> on 2016-12-13
Reviewed by Ryosuke Niwa.

• platform/mac-wk2/TestExpectations:

File:

• trunk/Source/WebCore/css/CSSKeyframesRule.cpp (modified) (6 diffs)

trunk/Source/WebCore/css/CSSKeyframesRule.cpp

@@ -27 +27 @@
 #include "CSSKeyframesRule.h"
 
-#include "CSSDeferredParser.h"
 #include "CSSKeyframeRule.h"
 #include "CSSParser.h"
@@ -39 +38 @@
 namespace WebCore {
 
-StyleRuleKeyframes::StyleRuleKeyframes(const AtomicString& name)
+StyleRuleKeyframes::StyleRuleKeyframes()
     : StyleRuleBase(Keyframes)
-    , m_name(name)
-{
-}
-
-StyleRuleKeyframes::StyleRuleKeyframes(const AtomicString& name, std::unique_ptr<DeferredStyleGroupRuleList>&& deferredRules)
-    : StyleRuleBase(Keyframes)
-    , m_name(name)
-    , m_deferredRules(WTFMove(deferredRules))
-{
-    
+{
 }
 
@@ -66 +56 @@
 }
 
-void StyleRuleKeyframes::parseDeferredRulesIfNeeded() const
-{
-    if (!m_deferredRules)
-        return;
-    
-    m_deferredRules->parseDeferredKeyframes(const_cast<StyleRuleKeyframes&>(*this));
-    m_deferredRules = nullptr;
-}
-
-const Vector<Ref<StyleKeyframe>>& StyleRuleKeyframes::keyframes() const
-{
-    parseDeferredRulesIfNeeded();
-    return m_keyframes;
-}
-
 void StyleRuleKeyframes::parserAppendKeyframe(RefPtr<StyleKeyframe>&& keyframe)
 {
@@ -90 +65 @@
 void StyleRuleKeyframes::wrapperAppendKeyframe(Ref<StyleKeyframe>&& keyframe)
 {
-    parseDeferredRulesIfNeeded();
     m_keyframes.append(WTFMove(keyframe));
 }
@@ -96 +70 @@
 void StyleRuleKeyframes::wrapperRemoveKeyframe(unsigned index)
 {
-    parseDeferredRulesIfNeeded();
     m_keyframes.remove(index);
 }
@@ -102 +75 @@
 size_t StyleRuleKeyframes::findKeyframeIndex(const String& key) const
 {
-    parseDeferredRulesIfNeeded();
-
     auto keys = CSSParser::parseKeyframeKeyList(key);