Attachment 343856 Details for Bug 187156 – patch

[patch] patch

memory-cache-client-call-post-resume-3.patch (text/plain), 2.52 KB, created by Antti Koivisto on 2018-06-28 14:59:41 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Antti Koivisto

Created: 2018-06-28 14:59:41 PDT

Size: 2.52 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 233328)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,20 @@
>+2018-06-28  Antti Koivisto  <antti@apple.com>
>+
>+        REGRESSION (233281): fast/dom/location-new-window-no-crash.html and some other tests are timing out
>+        https://bugs.webkit.org/show_bug.cgi?id=187156
>+
>+        Reviewed by Zalan Bujtas.
>+
>+        We need still need to re-enable memory cache client calls even when not doing other post-resolution callbacks.
>+
>+        * style/StyleTreeResolver.cpp:
>+        (WebCore::Style::memoryCacheClientCallsResumeQueue):
>+
>+        Add a separate queue for this.
>+
>+        (WebCore::Style::suspendMemoryCacheClientCalls):
>+        (WebCore::Style::PostResolutionCallbackDisabler::~PostResolutionCallbackDisabler):
>+
> 2018-06-28  Antoine Quint  <graouts@apple.com>
> 
>         [Web Animations] Make imported/mozilla/css-animations/test_animation-starttime.html pass reliably
>Index: Source/WebCore/style/StyleTreeResolver.cpp
>===================================================================
>--- Source/WebCore/style/StyleTreeResolver.cpp	(revision 233307)
>+++ Source/WebCore/style/StyleTreeResolver.cpp	(working copy)
>@@ -579,6 +579,12 @@ static Vector<Function<void ()>>& postRe
>     return vector;
> }
> 
>+static Vector<RefPtr<Frame>>& memoryCacheClientCallsResumeQueue()
>+{
>+    static NeverDestroyed<Vector<RefPtr<Frame>>> vector;
>+    return vector;
>+}
>+
> void queuePostResolutionCallback(Function<void ()>&& callback)
> {
>     postResolutionCallbackQueue().append(WTFMove(callback));
>@@ -592,10 +598,7 @@ static void suspendMemoryCacheClientCall
> 
>     page->setMemoryCacheClientCallsEnabled(false);
> 
>-    postResolutionCallbackQueue().append([protectedMainFrame = makeRef(page->mainFrame())] {
>-        if (Page* page = protectedMainFrame->page())
>-            page->setMemoryCacheClientCallsEnabled(true);
>-    });
>+    memoryCacheClientCallsResumeQueue().append(&page->mainFrame());
> }
> 
> static unsigned resolutionNestingDepth;
>@@ -622,6 +625,14 @@ PostResolutionCallbackDisabler::~PostRes
>                 queue[i]();
>             queue.clear();
>         }
>+
>+        auto& queue = memoryCacheClientCallsResumeQueue();
>+        for (size_t i = 0; i < queue.size(); ++i) {
>+            if (auto* page = queue[i]->page())
>+                page->setMemoryCacheClientCallsEnabled(true);
>+        }
>+        queue.clear();
>+
>         platformStrategies()->loaderStrategy()->resumePendingRequests();
>     }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 187156: 343852 | 343854 | 343856 | 343870