Changeset 263662 in webkit

Timestamp:

Jun 29, 2020 9:32:33 AM (4 years ago)

Author:

Chris Dumez

Message:

On load from back/forward cache, call checkCompleted() for ALL frames inside FrameLoader::commitProvisionalLoad()
​https://bugs.webkit.org/show_bug.cgi?id=213657

Reviewed by Youenn Fablet.

On load from back/forward cache, call checkCompleted() for ALL frames inside FrameLoader::commitProvisionalLoad().
Previously, we were doing it for the main frame in FrameLoader::commitProvisionalLoad() and for subframes in
FrameLoader::open(). Doing it all in one place results in more understandable code and is less error-prone.

Note that calling checkCompleted() for subframes was new in r262221 and is covered by:
fast/history/multiple-back-forward-navigations.html

• loader/FrameLoader.cpp:

(WebCore::FrameLoader::commitProvisionalLoad):
(WebCore::FrameLoader::open):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-06-29  Chris Dumez  <cdumez@apple.com>
+
+        On load from back/forward cache, call checkCompleted() for ALL frames inside FrameLoader::commitProvisionalLoad()
+        https://bugs.webkit.org/show_bug.cgi?id=213657
+
+        Reviewed by Youenn Fablet.
+
+        On load from back/forward cache, call checkCompleted() for ALL frames inside FrameLoader::commitProvisionalLoad().
+        Previously, we were doing it for the main frame in FrameLoader::commitProvisionalLoad() and for subframes in
+        FrameLoader::open(). Doing it all in one place results in more understandable code and is less error-prone.
+
+        Note that calling checkCompleted() for subframes was new in r262221 and is covered by:
+        fast/history/multiple-back-forward-navigations.html
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::commitProvisionalLoad):
+        (WebCore::FrameLoader::open):
+
 2020-06-09  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -2078 +2078 @@
             nullptr, static_cast<int>(m_documentLoader->response().expectedContentLength()), 0, mainResouceError);
 
-        checkCompleted();
+        Vector<Ref<Frame>> targetFrames;
+        targetFrames.append(m_frame);
+        for (auto* child = m_frame.tree().firstChild(); child; child = child->tree().traverseNext(&m_frame))
+            targetFrames.append(*child);
+
+        for (auto& frame : targetFrames)
+            frame->loader().checkCompleted();
     } else
         didOpenURL();
@@ -2351 +2357 @@
 
     cachedFrame.restore();
-
-    // For the main frame, this gets called in FrameLoader::commitProvisionalLoad().
-    if (!m_frame.isMainFrame())
-        checkCompleted();
 }