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

Timestamp:

May 10, 2022, 9:48:31 AM (3 years ago)

Author:

Brent Fulgham

Message:

Remove abandoned CSSDeferredParser implementation and feature flag
​https://bugs.webkit.org/show_bug.cgi?id=240244

Reviewed by Antti Koivisto.

This patch rolls out the abandoned CSSDeferredParser implementation added in Bug 165743.

Source/WebCore:

• Sources.txt:
• WebCore.xcodeproj/project.pbxproj:
• css/CSSKeyframesRule.cpp:

(WebCore::StyleRuleKeyframes::keyframes const):
(WebCore::StyleRuleKeyframes::wrapperAppendKeyframe):
(WebCore::StyleRuleKeyframes::wrapperRemoveKeyframe):
(WebCore::StyleRuleKeyframes::findKeyframeIndex const):
(WebCore::StyleRuleKeyframes::parseDeferredRulesIfNeeded const): Deleted.

• css/CSSKeyframesRule.h:
• css/StyleProperties.cpp:

(WebCore::MutableStyleProperties::MutableStyleProperties):
(WebCore::StyleProperties::PropertyReference::cssText const):
(WebCore::DeferredStyleProperties::create): Deleted.
(WebCore::DeferredStyleProperties::DeferredStyleProperties): Deleted.
(WebCore::DeferredStyleProperties::parseDeferredProperties): Deleted.

• css/StyleProperties.h:

(WebCore::StylePropertiesBase::deref const):
(isType):

• css/StyleRule.cpp:

(WebCore::StyleRule::properties const):
(WebCore::StyleRuleGroup::childRules const):
(WebCore::StyleRuleGroup::wrapperInsertRule):
(WebCore::StyleRuleGroup::wrapperRemoveRule):
(WebCore::DeferredStyleGroupRuleList::DeferredStyleGroupRuleList): Deleted.
(WebCore::DeferredStyleGroupRuleList::parseDeferredRules): Deleted.
(WebCore::DeferredStyleGroupRuleList::parseDeferredKeyframes): Deleted.
(WebCore::StyleRuleGroup::parseDeferredRulesIfNeeded const): Deleted.

• css/StyleRule.h:

(WebCore::StyleRule::propertiesWithoutDeferredParsing const): Deleted.
(WebCore::StyleRuleGroup::childRulesWithoutDeferredParsing const): Deleted.

• css/StyleSheetContents.cpp:

(WebCore::StyleSheetContents::parseAuthorStyleSheet):
(WebCore::StyleSheetContents::parseString):
(WebCore::traverseRulesInVector):
(WebCore::StyleSheetContents::traverseSubresources const):

• css/parser/CSSDeferredParser.cpp: Removed.
• css/parser/CSSDeferredParser.h: Removed.
• css/parser/CSSParser.cpp:

(WebCore::CSSParser::parseSheet):

• css/parser/CSSParser.h:
• css/parser/CSSParserContext.cpp:

(WebCore::operator==):
(WebCore::add):

• css/parser/CSSParserContext.h:
• css/parser/CSSParserImpl.cpp:

(WebCore::CSSParserImpl::CSSParserImpl):
(WebCore::CSSParserImpl::parseStyleSheet):
(WebCore::CSSParserImpl::consumeMediaRule):
(WebCore::CSSParserImpl::consumeSupportsRule):
(WebCore::CSSParserImpl::consumeKeyframesRule):
(WebCore::CSSParserImpl::consumeLayerRule):
(WebCore::CSSParserImpl::consumeContainerRule):
(WebCore::CSSParserImpl::consumeStyleRule):
(WebCore::CSSParserImpl::createDeferredStyleProperties): Deleted.
(WebCore::CSSParserImpl::parseDeferredDeclaration): Deleted.
(WebCore::CSSParserImpl::parseDeferredRuleList): Deleted.
(WebCore::CSSParserImpl::parseDeferredKeyframeList): Deleted.
(WebCore::CSSParserImpl::adoptTokenizerEscapedStrings): Deleted.

• css/parser/CSSParserImpl.h:

(WebCore::CSSParserImpl::tokenizer const):
(WebCore::CSSParserImpl::deferredParser const): Deleted.

• style/ElementRuleCollector.cpp:

(WebCore::Style::ElementRuleCollector::collectMatchingRulesForList):

• style/StyleInvalidator.cpp:

(WebCore::Style::shouldDirtyAllStyle):

• testing/Internals.cpp:

(WebCore::deferredStyleRulesCountForList): Deleted.
(WebCore::Internals::deferredStyleRulesCount): Deleted.
(WebCore::deferredGroupRulesCountForList): Deleted.
(WebCore::Internals::deferredGroupRulesCount): Deleted.
(WebCore::deferredKeyframesRulesCountForList): Deleted.
(WebCore::Internals::deferredKeyframesRulesCount): Deleted.

• testing/Internals.h:
• testing/Internals.idl:

Source/WebKit:

• UIProcess/API/C/WKPreferences.cpp:

(WKPreferencesSetDeferredCSSParserEnabled): Deleted.
(WKPreferencesGetDeferredCSSParserEnabled): Deleted.

• UIProcess/API/C/WKPreferencesRefPrivate.h:

Source/WTF:

• Scripts/Preferences/WebPreferences.yaml:

LayoutTests:

• fast/css/deferred-parsing/dynamic-external-style-expected.txt: Removed.
• fast/css/deferred-parsing/dynamic-external-style.html: Removed.
• fast/css/deferred-parsing/dynamic-style-in-document-expected.txt: Removed.
• fast/css/deferred-parsing/dynamic-style-in-document.html: Removed.
• fast/css/deferred-parsing/hover-test-expected.txt: Removed.
• fast/css/deferred-parsing/hover-test.html: Removed.
• fast/css/deferred-parsing/keyframes-rule-expected.txt: Removed.
• fast/css/deferred-parsing/keyframes-rule.html: Removed.
• fast/css/deferred-parsing/media-print-expected.txt: Removed.
• fast/css/deferred-parsing/media-print.html: Removed.
• fast/css/deferred-parsing/nth-of-type-expected.txt: Removed.
• fast/css/deferred-parsing/nth-of-type.html: Removed.
• fast/css/deferred-parsing/resources/basic-sheet.css: Removed.
• fast/css/deferred-parsing/simple-external-style-expected.txt: Removed.
• fast/css/deferred-parsing/simple-external-style.html: Removed.
• fast/css/deferred-parsing/simple-style-in-document-expected.txt: Removed.
• fast/css/deferred-parsing/simple-style-in-document.html: Removed.
• fast/css/deferred-parsing/supports-rule-expected.txt: Removed.
• fast/css/deferred-parsing/supports-rule.html: Removed.
• platform/ios-wk2/TestExpectations:
• platform/ios/TestExpectations:

File:

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

trunk/Source/WebCore/css/CSSKeyframesRule.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2007, 2008, 2012, 2013, 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2022 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27 +27 @@
 #include "CSSKeyframesRule.h"
 
-#include "CSSDeferredParser.h"
 #include "CSSKeyframeRule.h"
 #include "CSSParser.h"
@@ -43 +42 @@
 }
 
-StyleRuleKeyframes::StyleRuleKeyframes(const AtomString& name, std::unique_ptr<DeferredStyleGroupRuleList>&& deferredRules)
-    : StyleRuleBase(StyleRuleType::Keyframes)
-    , m_name(name)
-    , m_deferredRules(WTFMove(deferredRules))
-{
-    
-}
-
 StyleRuleKeyframes::StyleRuleKeyframes(const StyleRuleKeyframes& o)
     : StyleRuleBase(o)
@@ -63 +54 @@
 }
 
-Ref<StyleRuleKeyframes> StyleRuleKeyframes::create(const AtomString& name, std::unique_ptr<DeferredStyleGroupRuleList>&& deferredRules)
-{
-    return adoptRef(*new StyleRuleKeyframes(name, WTFMove(deferredRules)));
-}
-
 StyleRuleKeyframes::~StyleRuleKeyframes() = default;
 
-void StyleRuleKeyframes::parseDeferredRulesIfNeeded() const
-{
-    if (!m_deferredRules)
-        return;
-
-    m_deferredRules->parseDeferredKeyframes(const_cast<StyleRuleKeyframes&>(*this));
-    m_deferredRules = nullptr;
-}
-
 const Vector<Ref<StyleRuleKeyframe>>& StyleRuleKeyframes::keyframes() const
 {
-    parseDeferredRulesIfNeeded();
     return m_keyframes;
 }
@@ -94 +70 @@
 void StyleRuleKeyframes::wrapperAppendKeyframe(Ref<StyleRuleKeyframe>&& keyframe)
 {
-    parseDeferredRulesIfNeeded();
     m_keyframes.append(WTFMove(keyframe));
 }
@@ -100 +75 @@
 void StyleRuleKeyframes::wrapperRemoveKeyframe(unsigned index)
 {
-    parseDeferredRulesIfNeeded();
     m_keyframes.remove(index);
 }
@@ -106 +80 @@
 std::optional<size_t> StyleRuleKeyframes::findKeyframeIndex(const String& key) const
 {
-    parseDeferredRulesIfNeeded();
     auto keys = CSSParser::parseKeyframeKeyList(key);
     if (keys.isEmpty())