Changeset 273300 in webkit

Timestamp:

Feb 23, 2021, 12:20:01 AM (5 years ago)

Author:

rniwa@webkit.org

Message:

Handle Page::didFinishLoadingImageForElement asynchronously
​https://bugs.webkit.org/show_bug.cgi?id=221390

Reviewed by Antti Koivisto.

Use EventLoop instead of RunLoop::main() to be thread safe in iOS WebKit1.

• page/Page.cpp:

(WebCore::Page::didFinishLoadingImageForElement):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/Page.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-02-23  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Handle Page::didFinishLoadingImageForElement asynchronously
+        https://bugs.webkit.org/show_bug.cgi?id=221390
+
+        Reviewed by Antti Koivisto.
+
+        Use EventLoop instead of RunLoop::main() to be thread safe in iOS WebKit1.
+
+        * page/Page.cpp:
+        (WebCore::Page::didFinishLoadingImageForElement):
+
 2021-02-22  Don Olmstead  <don.olmstead@sony.com>
 

trunk/Source/WebCore/page/Page.cpp

@@ -55 +55 @@
 #include "Event.h"
 #include "EventHandler.h"
+#include "EventLoop.h"
 #include "EventNames.h"
 #include "ExtensionStyleSheets.h"
@@ -3337 +3338 @@
 void Page::didFinishLoadingImageForElement(HTMLImageElement& element)
 {
-    RunLoop::main().dispatch([this, weakThis = makeWeakPtr(*this), element = makeRef(element)]() {
-        if (!weakThis)
+    element.document().eventLoop().queueTask(TaskSource::Networking, [element = makeRef(element)]() {
+        auto frame = makeRefPtr(element->document().frame());
+        if (!frame)
             return;
 
-        if (auto frame = makeRefPtr(element->document().frame()))
-            frame->editor().revealSelectionIfNeededAfterLoadingImageForElement(element);
-        chrome().client().didFinishLoadingImageForElement(element);
+        frame->editor().revealSelectionIfNeededAfterLoadingImageForElement(element);
+        if (auto* page = frame->page(); element->document().frame() == frame)
+            page->chrome().client().didFinishLoadingImageForElement(element);
     });
 }