Changeset 284672 in webkit

Timestamp:

Oct 22, 2021, 1:19:07 AM (5 years ago)

Author:

Antti Koivisto

Message:

Remove Style::Resolver::m_isDeleted
​https://bugs.webkit.org/show_bug.cgi?id=232089

Reviewed by Kimmo Kinnunen.

Not useful anymore.

• style/StyleResolver.cpp:

(WebCore::Style::Resolver::~Resolver):
(WebCore::Style::Resolver::styleForElement):
(WebCore::Style::Resolver::styleForKeyframe):
(WebCore::Style::Resolver::styleForPage):

• style/StyleResolver.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• style/StyleResolver.cpp (modified) (4 diffs)
• style/StyleResolver.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-10-22  Antti Koivisto  <antti@apple.com>
+
+        Remove Style::Resolver::m_isDeleted
+        https://bugs.webkit.org/show_bug.cgi?id=232089
+
+        Reviewed by Kimmo Kinnunen.
+
+        Not useful anymore.
+
+        * style/StyleResolver.cpp:
+        (WebCore::Style::Resolver::~Resolver):
+        (WebCore::Style::Resolver::styleForElement):
+        (WebCore::Style::Resolver::styleForKeyframe):
+        (WebCore::Style::Resolver::styleForPage):
+        * style/StyleResolver.h:
+
 2021-10-22  Patrick Griffis  <pgriffis@igalia.com>
 

trunk/Source/WebCore/style/StyleResolver.cpp

@@ -202 +202 @@
 {
     RELEASE_ASSERT(!m_document.isResolvingTreeStyle());
-    RELEASE_ASSERT(!m_isDeleted);
-    m_isDeleted = true;
 }
 
@@ -223 +221 @@
 ElementStyle Resolver::styleForElement(const Element& element, const RenderStyle* parentStyle, const RenderStyle* parentBoxStyle, RuleMatchingBehavior matchingBehavior, const SelectorFilter* selectorFilter)
 {
-    RELEASE_ASSERT(!m_isDeleted);
-
     auto state = State(element, parentStyle, m_overrideDocumentElementStyle);
 
@@ -280 +276 @@
 std::unique_ptr<RenderStyle> Resolver::styleForKeyframe(const Element& element, const RenderStyle* elementStyle, const RenderStyle* parentElementStyle, const StyleRuleKeyframe* keyframe, KeyframeValue& keyframeValue)
 {
-    RELEASE_ASSERT(!m_isDeleted);
-
     MatchResult result;
     result.authorDeclarations.append({ &keyframe->properties(), SelectorChecker::MatchAll, propertyAllowlistForPseudoId(elementStyle->styleType()) });
@@ -429 +423 @@
 std::unique_ptr<RenderStyle> Resolver::styleForPage(int pageIndex)
 {
-    RELEASE_ASSERT(!m_isDeleted);
-
     auto* documentElement = m_document.documentElement();
     if (!documentElement)

trunk/Source/WebCore/style/StyleResolver.h

@@ -173 +173 @@
     bool m_matchAuthorAndUserStyles { true };
     bool m_isSharedBetweenShadowTrees { false };
-
-    // See if we still have crashes where Resolver gets deleted early.
-    bool m_isDeleted { false };
 };