Title: [284672] trunk/Source/WebCore
Revision
284672
Author
an...@apple.com
Date
2021-10-22 01:19:07 -0700 (Fri, 22 Oct 2021)

Log 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:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (284671 => 284672)


--- trunk/Source/WebCore/ChangeLog	2021-10-22 08:18:15 UTC (rev 284671)
+++ trunk/Source/WebCore/ChangeLog	2021-10-22 08:19:07 UTC (rev 284672)
@@ -1,3 +1,19 @@
+2021-10-22  Antti Koivisto  <an...@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  <pgrif...@igalia.com>
 
         [GTK] Rewrite LowPowerModeNotifier to use GPowerProfileMonitor

Modified: trunk/Source/WebCore/style/StyleResolver.cpp (284671 => 284672)


--- trunk/Source/WebCore/style/StyleResolver.cpp	2021-10-22 08:18:15 UTC (rev 284671)
+++ trunk/Source/WebCore/style/StyleResolver.cpp	2021-10-22 08:19:07 UTC (rev 284672)
@@ -201,8 +201,6 @@
 Resolver::~Resolver()
 {
     RELEASE_ASSERT(!m_document.isResolvingTreeStyle());
-    RELEASE_ASSERT(!m_isDeleted);
-    m_isDeleted = true;
 }
 
 static inline bool isAtShadowBoundary(const Element& element)
@@ -222,8 +220,6 @@
 
 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);
 
     if (state.parentStyle()) {
@@ -279,8 +275,6 @@
 
 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()) });
 
@@ -428,8 +422,6 @@
 
 std::unique_ptr<RenderStyle> Resolver::styleForPage(int pageIndex)
 {
-    RELEASE_ASSERT(!m_isDeleted);
-
     auto* documentElement = m_document.documentElement();
     if (!documentElement)
         return RenderStyle::createPtr();

Modified: trunk/Source/WebCore/style/StyleResolver.h (284671 => 284672)


--- trunk/Source/WebCore/style/StyleResolver.h	2021-10-22 08:18:15 UTC (rev 284671)
+++ trunk/Source/WebCore/style/StyleResolver.h	2021-10-22 08:19:07 UTC (rev 284672)
@@ -172,9 +172,6 @@
 
     bool m_matchAuthorAndUserStyles { true };
     bool m_isSharedBetweenShadowTrees { false };
-
-    // See if we still have crashes where Resolver gets deleted early.
-    bool m_isDeleted { false };
 };
 
 inline bool Resolver::hasSelectorForAttribute(const Element& element, const AtomString &attributeName) const
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to