Changeset 245448 in webkit

Timestamp:

May 17, 2019, 4:24:57 AM (7 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r245056 - Correct delayed load event handling
​https://bugs.webkit.org/show_bug.cgi?id=197679
<rdar://problem/50423334>

Reviewed by Alex Christensen.

We need to properly account for the fact that JavaScript might run
while performing loads.

• dom/Document.cpp:

(WebCore::Document::loadEventDelayTimerFired):

Location:

releases/WebKitGTK/webkit-2.24/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog

@@ +1 @@
+2019-05-08  Brent Fulgham  <bfulgham@apple.com>
+
+        Correct delayed load event handling
+        https://bugs.webkit.org/show_bug.cgi?id=197679
+        <rdar://problem/50423334>
+
+        Reviewed by Alex Christensen.
+
+        We need to properly account for the fact that JavaScript might run
+        while performing loads.
+
+        * dom/Document.cpp:
+        (WebCore::Document::loadEventDelayTimerFired):
+
 2019-05-02  Chris Dumez  <cdumez@apple.com>
 

releases/WebKitGTK/webkit-2.24/Source/WebCore/dom/Document.cpp

@@ -6896 +6896 @@
     // FIXME: Not obvious why checkCompleted needs to go first. The order these are called is
     // visible to WebKit clients, but it's more like a race than a well-defined relationship.
+    auto weakThis = makeWeakPtr(this);
     checkCompleted();
-    if (auto* frame = this->frame())
-        frame->loader().checkLoadComplete();
+    if (weakThis) {
+        if (auto* frame = this->frame())
+            frame->loader().checkLoadComplete();
+    }
 }