Changeset 260423 in webkit

Timestamp:

Apr 21, 2020 3:31:08 AM (4 years ago)

Author:

commit-queue@webkit.org

Message:

Exit early in FrameLoader::loadURL when redirecting to another frame
​https://bugs.webkit.org/show_bug.cgi?id=210751

Patch by Rob Buis <​rbuis@igalia.com> on 2020-04-21
Reviewed by Geoffrey Garen.

Exit early in FrameLoader::loadURL when redirecting to another frame, previously we were preparing
request needlessly, doing it twice in case of frame redirecting. Also move some variables to
where they are actually used.

• loader/FrameLoader.cpp:

(WebCore::FrameLoader::loadURL):

• loader/FrameLoader.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-21  Rob Buis  <rbuis@igalia.com>
+
+        Exit early in FrameLoader::loadURL when redirecting to another frame
+        https://bugs.webkit.org/show_bug.cgi?id=210751
+
+        Reviewed by Geoffrey Garen.
+
+        Exit early in FrameLoader::loadURL when redirecting to another frame, previously we were preparing
+        request needlessly, doing it twice in case of frame redirecting. Also move some variables to
+        where they are actually used.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::loadURL):
+        * loader/FrameLoader.h:
+
 2020-04-21  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -1353 +1353 @@
     // Anchor target is ignored when the download attribute is set since it will download the hyperlink rather than follow it.
     String effectiveFrameName = frameLoadRequest.downloadAttribute().isNull() ? frameLoadRequest.frameName() : String();
-    AllowNavigationToInvalidURL allowNavigationToInvalidURL = frameLoadRequest.allowNavigationToInvalidURL();
-    NewFrameOpenerPolicy openerPolicy = frameLoadRequest.newFrameOpenerPolicy();
-    LockHistory lockHistory = frameLoadRequest.lockHistory();
     bool isFormSubmission = formState;
+
+    // The search for a target frame is done earlier in the case of form submission.
+    auto targetFrame = isFormSubmission ? nullptr : makeRefPtr(findFrameForNavigation(effectiveFrameName));
+    if (targetFrame && targetFrame != &m_frame) {
+        frameLoadRequest.setFrameName("_self");
+        targetFrame->loader().loadURL(WTFMove(frameLoadRequest), referrer, newLoadType, event, WTFMove(formState), WTFMove(adClickAttribution), completionHandlerCaller.release());
+        return;
+    }
 
     const URL& newURL = frameLoadRequest.resourceRequest().url();
@@ -1367 +1372 @@
     ASSERT(newLoadType != FrameLoadType::Same);
 
-    // The search for a target frame is done earlier in the case of form submission.
-    Frame* targetFrame = isFormSubmission ? nullptr : findFrameForNavigation(effectiveFrameName);
-    if (targetFrame && targetFrame != &m_frame) {
-        frameLoadRequest.setFrameName("_self");
-        targetFrame->loader().loadURL(WTFMove(frameLoadRequest), referrer, newLoadType, event, WTFMove(formState), WTFMove(adClickAttribution), completionHandlerCaller.release());
-        return;
-    }
-
     if (!isNavigationAllowed())
         return;
 
     NavigationAction action { frameLoadRequest.requester(), request, frameLoadRequest.initiatedByMainFrame(), newLoadType, isFormSubmission, event, frameLoadRequest.shouldOpenExternalURLsPolicy(), frameLoadRequest.downloadAttribute() };
-    action.setLockHistory(lockHistory);
+    action.setLockHistory(frameLoadRequest.lockHistory());
     action.setLockBackForwardList(frameLoadRequest.lockBackForwardList());
     if (adClickAttribution && m_frame.isMainFrame())
         action.setAdClickAttribution(WTFMove(*adClickAttribution));
 
+    NewFrameOpenerPolicy openerPolicy = frameLoadRequest.newFrameOpenerPolicy();
+    AllowNavigationToInvalidURL allowNavigationToInvalidURL = frameLoadRequest.allowNavigationToInvalidURL();
     if (!targetFrame && !effectiveFrameName.isEmpty()) {
         action = action.copyWithShouldOpenExternalURLsPolicy(shouldOpenExternalURLsPolicyToApply(m_frame, frameLoadRequest));

trunk/Source/WebCore/loader/FrameLoader.h

@@ -282 +282 @@
     FrameLoaderStateMachine& stateMachine() { return m_stateMachine; }
 
+    // FIXME: should return RefPtr.
     WEBCORE_EXPORT Frame* findFrameForNavigation(const AtomString& name, Document* activeDocument = nullptr);