Changeset 274357 in webkit

Timestamp:

Mar 12, 2021 8:14:59 AM (17 months ago)

Author:

commit-queue@webkit.org

Message:

Cancel image loader events after first dispatch
​https://bugs.webkit.org/show_bug.cgi?id=218556

Patch by Rob Buis <​rbuis@igalia.com> on 2021-03-12
Reviewed by Ryosuke Niwa.

Cancel image loader events after first dispatch.
Also change EventSender to use WeakPtr.

• dom/EventSender.h:

(WebCore::EventSender<T>::dispatchEventSoon):
(WebCore::EventSender<T>::dispatchPendingEvents):

• loader/ImageLoader.cpp:

(WebCore::ImageLoader::dispatchPendingErrorEvent):

• loader/ImageLoader.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/EventSender.h (modified) (4 diffs)
• loader/ImageLoader.cpp (modified) (1 diff)
• loader/ImageLoader.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-03-12  Rob Buis  <rbuis@igalia.com>
+
+        Cancel image loader events after first dispatch
+        https://bugs.webkit.org/show_bug.cgi?id=218556
+
+        Reviewed by Ryosuke Niwa.
+
+        Cancel image loader events after first dispatch.
+        Also change EventSender to use WeakPtr.
+
+        * dom/EventSender.h:
+        (WebCore::EventSender<T>::dispatchEventSoon):
+        (WebCore::EventSender<T>::dispatchPendingEvents):
+        * loader/ImageLoader.cpp:
+        (WebCore::ImageLoader::dispatchPendingErrorEvent):
+        * loader/ImageLoader.h:
+
 2021-03-12  Antoine Quint  <graouts@webkit.org>
 

trunk/Source/WebCore/dom/EventSender.h

@@ -28 +28 @@
 #include "Timer.h"
 #include <wtf/Vector.h>
+#include <wtf/WeakPtr.h>
 
 namespace WebCore {
@@ -55 +56 @@
     AtomString m_eventType;
     Timer m_timer;
-    Vector<T*> m_dispatchSoonList;
-    Vector<T*> m_dispatchingList;
+    Vector<WeakPtr<T>> m_dispatchSoonList;
+    Vector<WeakPtr<T>> m_dispatchingList;
 };
 
@@ -67 +68 @@
 template<typename T> void EventSender<T>::dispatchEventSoon(T& sender)
 {
-    m_dispatchSoonList.append(&sender);
+    m_dispatchSoonList.append(makeWeakPtr(sender));
     if (!m_timer.isActive())
         m_timer.startOneShot(0_s);
@@ -100 +101 @@
     m_dispatchingList.swap(m_dispatchSoonList);
     for (auto& event : m_dispatchingList) {
-        if (T* sender = event) {
+        if (WeakPtr<T> sender = event) {
             event = nullptr;
             if (!page || sender->document().page() == page)

trunk/Source/WebCore/loader/ImageLoader.cpp

@@ -554 +554 @@
         return;
     m_hasPendingErrorEvent = false;
+    errorEventSender().cancelEvent(*this);
     if (element().document().hasLivingRenderTree())
         element().dispatchEvent(Event::create(eventNames().errorEvent, Event::CanBubble::No, Event::IsCancelable::No));

trunk/Source/WebCore/loader/ImageLoader.h

@@ -43 +43 @@
 enum class RelevantMutation : bool { Yes, No };
 
-class ImageLoader : public CachedImageClient {
+class ImageLoader : public CachedImageClient, public CanMakeWeakPtr<ImageLoader> {
     WTF_MAKE_FAST_ALLOCATED;
 public: