Changeset 241018 in webkit

Timestamp:

Feb 6, 2019 7:44:28 AM (5 years ago)

Author:

Antti Koivisto

Message:

RELEASE_ASSERT(!m_document.isResolvingTreeStyle()) in com.apple.WebKit.WebContent at WebCore: WebCore::StyleResolver::~StyleResolver
​https://bugs.webkit.org/show_bug.cgi?id=194333
<rdar://problem/47822929>

Reviewed by Zalan Bujtas.

Source/WebCore:

Content extensions may mutate the extension stylesheet in the middle of a style resolution as a result of
the legacy animation code triggering a resource load.

Test: http/tests/contentextensions/css-display-none-keyframe.html

• style/StyleScope.cpp:

(WebCore::Style::Scope::scheduleUpdate):

Avoid clearing the style resolver if we are in the middle of a style resolution.
A better fix that avoid doing this in the first place is tracked by ​https://bugs.webkit.org/show_bug.cgi?id=194335.

LayoutTests:

• http/tests/contentextensions/css-display-none-keyframe-expected.txt: Added.
• http/tests/contentextensions/css-display-none-keyframe.html: Added.
• http/tests/contentextensions/css-display-none-keyframe.html.json: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/contentextensions/css-display-none-keyframe-expected.txt (added)
• LayoutTests/http/tests/contentextensions/css-display-none-keyframe.html (added)
• LayoutTests/http/tests/contentextensions/css-display-none-keyframe.html.json (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/style/StyleScope.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-02-06  Antti Koivisto  <antti@apple.com>
+
+        RELEASE_ASSERT(!m_document.isResolvingTreeStyle()) in com.apple.WebKit.WebContent at WebCore: WebCore::StyleResolver::~StyleResolver
+        https://bugs.webkit.org/show_bug.cgi?id=194333
+        <rdar://problem/47822929>
+
+        Reviewed by Zalan Bujtas.
+
+        * http/tests/contentextensions/css-display-none-keyframe-expected.txt: Added.
+        * http/tests/contentextensions/css-display-none-keyframe.html: Added.
+        * http/tests/contentextensions/css-display-none-keyframe.html.json: Added.
+
 2019-02-05  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-02-06  Antti Koivisto  <antti@apple.com>
+
+        RELEASE_ASSERT(!m_document.isResolvingTreeStyle()) in com.apple.WebKit.WebContent at WebCore: WebCore::StyleResolver::~StyleResolver
+        https://bugs.webkit.org/show_bug.cgi?id=194333
+        <rdar://problem/47822929>
+
+        Reviewed by Zalan Bujtas.
+
+        Content extensions may mutate the extension stylesheet in the middle of a style resolution as a result of
+        the legacy animation code triggering a resource load.
+
+        Test: http/tests/contentextensions/css-display-none-keyframe.html
+
+        * style/StyleScope.cpp:
+        (WebCore::Style::Scope::scheduleUpdate):
+
+        Avoid clearing the style resolver if we are in the middle of a style resolution.
+        A better fix that avoid doing this in the first place is tracked by https://bugs.webkit.org/show_bug.cgi?id=194335.
+
 2019-02-06  Pablo Saavedra  <psaavedra@igalia.com>
 

trunk/Source/WebCore/style/StyleScope.cpp

@@ -603 +603 @@
         if (m_shadowRoot && m_resolver)
             invalidateHostAndSlottedStyleIfNeeded(*m_shadowRoot, *m_resolver);
+        // FIXME: Animation code may trigger resource load in middle of style recalc and that can add a rule to a content extension stylesheet.
+        //        Fix and remove isResolvingTreeStyle() test below, see https://bugs.webkit.org/show_bug.cgi?id=194335
         // FIXME: The m_isUpdatingStyleResolver test is here because extension stylesheets can get us here from StyleResolver::appendAuthorStyleSheets.
-        if (!m_isUpdatingStyleResolver)
+        if (!m_isUpdatingStyleResolver && !m_document.isResolvingTreeStyle())
             clearResolver();
     }