Changeset 260317 in webkit


Ignore:
Timestamp:
Apr 18, 2020 10:04:07 AM (4 years ago)
Author:
commit-queue@webkit.org
Message:

Reduce parameter list of the FrameLoadRequest constructor
​https://bugs.webkit.org/show_bug.cgi?id=210668

Patch by Rob Buis <​rbuis@igalia.com> on 2020-04-18
Reviewed by Darin Adler.

Source/WebCore:

Reduce parameter list of the FrameLoadRequest constructor by
instead using various setters. By choosing the most common
defaults the actual number of setters to call are minimized.

  • inspector/InspectorFrontendClientLocal.cpp:

(WebCore::InspectorFrontendClientLocal::openInNewTab):

  • inspector/agents/InspectorPageAgent.cpp:

(WebCore::InspectorPageAgent::navigate):

  • loader/DocumentLoader.cpp:

(WebCore::DocumentLoader::handleProvisionalLoadFailureFromContentFilter):

  • loader/FrameLoadRequest.cpp:

(WebCore::FrameLoadRequest::FrameLoadRequest):

  • loader/FrameLoadRequest.h:

(WebCore::FrameLoadRequest::FrameLoadRequest):
(WebCore::FrameLoadRequest::disableShouldReplaceDocumentIfJavaScriptURL):

  • loader/FrameLoader.cpp:

(WebCore::FrameLoader::changeLocation):
(WebCore::FrameLoader::loadURLIntoChildFrame):

  • loader/NavigationScheduler.cpp:

(WebCore::NavigationScheduler::scheduleLocationChange):

  • page/ContextMenuController.cpp:

(WebCore::openNewWindow):
(WebCore::ContextMenuController::contextMenuItemSelected):

  • page/DOMWindow.cpp:

(WebCore::DOMWindow::createWindow):

  • page/DragController.cpp:

(WebCore::DragController::performDragOperation):

Source/WebKit:

Adapt to API change.

  • WebProcess/Inspector/WebInspector.cpp:

(WebKit::WebInspector::openInNewTab):

  • WebProcess/Plugins/PluginView.cpp:

(WebKit::PluginView::performFrameLoadURLRequest):
(WebKit::PluginView::loadURL):

  • WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::loadURLInFrame):
(WebKit::WebPage::loadDataInFrame):
(WebKit::WebPage::loadRequest):
(WebKit::WebPage::loadDataImpl):

Source/WebKitLegacy/ios:

Adapt to API change.

  • WebView/WebPDFViewPlaceholder.mm:

(-[WebPDFViewPlaceholder simulateClickOnLinkToURL:]):

Source/WebKitLegacy/mac:

Adapt to API change.

  • Plugins/WebPluginController.mm:

(-[WebPluginController webPlugInContainerLoadRequest:inFrame:]):

  • WebView/WebFrame.mm:

(-[WebFrame loadRequest:]):
(-[WebFrame _loadData:MIMEType:textEncodingName:baseURL:unreachableURL:]):

  • WebView/WebPDFView.mm:

(-[WebPDFView PDFViewWillClickOnLink:withURL:]):

Source/WebKitLegacy/win:

Adapt to API change.

  • Plugins/PluginView.cpp:

(WebCore::PluginView::start):
(WebCore::PluginView::performRequest):
(WebCore::PluginView::getURLNotify):
(WebCore::PluginView::getURL):
(WebCore::PluginView::handlePost):

  • WebFrame.cpp:

(WebFrame::loadRequest):
(WebFrame::loadData):

Location:
trunk/Source
Files:
24 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r260313 r260317  
     12020-04-18  Rob Buis  <rbuis@igalia.com>
     2
     3        Reduce parameter list of the FrameLoadRequest constructor
     4        https://bugs.webkit.org/show_bug.cgi?id=210668
     5
     6        Reviewed by Darin Adler.
     7
     8        Reduce parameter list of the FrameLoadRequest constructor by
     9        instead using various setters. By choosing the most common
     10        defaults the actual number of setters to call are minimized.
     11
     12        * inspector/InspectorFrontendClientLocal.cpp:
     13        (WebCore::InspectorFrontendClientLocal::openInNewTab):
     14        * inspector/agents/InspectorPageAgent.cpp:
     15        (WebCore::InspectorPageAgent::navigate):
     16        * loader/DocumentLoader.cpp:
     17        (WebCore::DocumentLoader::handleProvisionalLoadFailureFromContentFilter):
     18        * loader/FrameLoadRequest.cpp:
     19        (WebCore::FrameLoadRequest::FrameLoadRequest):
     20        * loader/FrameLoadRequest.h:
     21        (WebCore::FrameLoadRequest::FrameLoadRequest):
     22        (WebCore::FrameLoadRequest::disableShouldReplaceDocumentIfJavaScriptURL):
     23        * loader/FrameLoader.cpp:
     24        (WebCore::FrameLoader::changeLocation):
     25        (WebCore::FrameLoader::loadURLIntoChildFrame):
     26        * loader/NavigationScheduler.cpp:
     27        (WebCore::NavigationScheduler::scheduleLocationChange):
     28        * page/ContextMenuController.cpp:
     29        (WebCore::openNewWindow):
     30        (WebCore::ContextMenuController::contextMenuItemSelected):
     31        * page/DOMWindow.cpp:
     32        (WebCore::DOMWindow::createWindow):
     33        * page/DragController.cpp:
     34        (WebCore::DragController::performDragOperation):
     35
    1362020-04-18  David Kilzer  <ddkilzer@apple.com>
    237

  • trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp

    r257835 r260317  
    255255    UserGestureIndicator indicator { ProcessingUserGesture };
    256256    Frame& mainFrame = m_inspectedPageController->inspectedPage().mainFrame();
    257     FrameLoadRequest frameLoadRequest { *mainFrame.document(), mainFrame.document()->securityOrigin(), { }, "_blank"_s, LockHistory::No, LockBackForwardList::No, ReferrerPolicy::EmptyString, AllowNavigationToInvalidURL::Yes, NewFrameOpenerPolicy::Allow, ShouldOpenExternalURLsPolicy::ShouldNotAllow, InitiatedByMainFrame::Unknown };
     257    FrameLoadRequest frameLoadRequest { *mainFrame.document(), mainFrame.document()->securityOrigin(), { }, "_blank"_s, InitiatedByMainFrame::Unknown };
    258258
    259259    bool created;
    … …  
    267267    // FIXME: Why do we compute the absolute URL with respect to |frame| instead of |mainFrame|?
    268268    ResourceRequest resourceRequest { frame->document()->completeURL(url) };
    269     FrameLoadRequest frameLoadRequest2 { *mainFrame.document(), mainFrame.document()->securityOrigin(), WTFMove(resourceRequest), "_self"_s, LockHistory::No, LockBackForwardList::No, ReferrerPolicy::EmptyString, AllowNavigationToInvalidURL::Yes, NewFrameOpenerPolicy::Allow, ShouldOpenExternalURLsPolicy::ShouldNotAllow, InitiatedByMainFrame::Unknown };
     269    FrameLoadRequest frameLoadRequest2 { *mainFrame.document(), mainFrame.document()->securityOrigin(), WTFMove(resourceRequest), "_self"_s, InitiatedByMainFrame::Unknown };
    270270    frame->loader().changeLocation(WTFMove(frameLoadRequest2));
    271271}

  • trunk/Source/WebCore/inspector/agents/InspectorPageAgent.cpp

    r259649 r260317  
    422422
    423423    ResourceRequest resourceRequest { frame.document()->completeURL(url) };
    424     FrameLoadRequest frameLoadRequest { *frame.document(), frame.document()->securityOrigin(), WTFMove(resourceRequest), "_self"_s, LockHistory::No, LockBackForwardList::No, ReferrerPolicy::EmptyString, AllowNavigationToInvalidURL::No, NewFrameOpenerPolicy::Allow, ShouldOpenExternalURLsPolicy::ShouldNotAllow, InitiatedByMainFrame::Unknown };
     424    FrameLoadRequest frameLoadRequest { *frame.document(), frame.document()->securityOrigin(), WTFMove(resourceRequest), "_self"_s, InitiatedByMainFrame::Unknown };
     425    frameLoadRequest.disableNavigationToInvalidURL();
    425426    frame.loader().changeLocation(WTFMove(frameLoadRequest));
    426427}

  • trunk/Source/WebCore/loader/DocumentLoader.cpp

    r259379 r260317  
    22342234void DocumentLoader::handleProvisionalLoadFailureFromContentFilter(const URL& blockedPageURL, SubstituteData& substituteData)
    22352235{
    2236     frameLoader()->load(FrameLoadRequest(*frame(), blockedPageURL, ShouldOpenExternalURLsPolicy::ShouldNotAllow, substituteData));
     2236    frameLoader()->load(FrameLoadRequest(*frame(), blockedPageURL, substituteData));
    22372237}
    22382238

  • trunk/Source/WebCore/loader/FrameLoadRequest.cpp

    r257767 r260317  
    3838namespace WebCore {
    3939
    40 FrameLoadRequest::FrameLoadRequest(Document& requester, SecurityOrigin& requesterSecurityOrigin, ResourceRequest&& resourceRequest, const String& frameName, LockHistory lockHistory, LockBackForwardList lockBackForwardList, const ReferrerPolicy& referrerPolicy, AllowNavigationToInvalidURL allowNavigationToInvalidURL, NewFrameOpenerPolicy newFrameOpenerPolicy, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, InitiatedByMainFrame initiatedByMainFrame, ShouldReplaceDocumentIfJavaScriptURL shouldReplaceDocumentIfJavaScriptURL, const AtomString& downloadAttribute, const SystemPreviewInfo& systemPreviewInfo)
     40FrameLoadRequest::FrameLoadRequest(Document& requester, SecurityOrigin& requesterSecurityOrigin, ResourceRequest&& resourceRequest, const String& frameName, InitiatedByMainFrame initiatedByMainFrame, const AtomString& downloadAttribute, const SystemPreviewInfo& systemPreviewInfo)
    4141    : m_requester { makeRef(requester) }
    4242    , m_requesterSecurityOrigin { makeRef(requesterSecurityOrigin) }
    4343    , m_resourceRequest { WTFMove(resourceRequest) }
    4444    , m_frameName { frameName }
    45     , m_lockHistory { lockHistory }
    46     , m_lockBackForwardList { lockBackForwardList }
    47     , m_referrerPolicy { referrerPolicy }
    48     , m_allowNavigationToInvalidURL { allowNavigationToInvalidURL }
    49     , m_newFrameOpenerPolicy { newFrameOpenerPolicy }
    50     , m_shouldReplaceDocumentIfJavaScriptURL { shouldReplaceDocumentIfJavaScriptURL }
    51     , m_shouldOpenExternalURLsPolicy { shouldOpenExternalURLsPolicy }
    5245    , m_downloadAttribute { downloadAttribute }
    5346    , m_initiatedByMainFrame { initiatedByMainFrame }
    … …  
    5649}
    5750
    58 FrameLoadRequest::FrameLoadRequest(Frame& frame, const ResourceRequest& resourceRequest, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, const SubstituteData& substituteData)
     51FrameLoadRequest::FrameLoadRequest(Frame& frame, const ResourceRequest& resourceRequest, const SubstituteData& substituteData)
    5952    : m_requester { makeRef(*frame.document()) }
    6053    , m_requesterSecurityOrigin { makeRef(frame.document()->securityOrigin()) }
    6154    , m_resourceRequest { resourceRequest }
    6255    , m_substituteData { substituteData }
    63     , m_lockHistory { LockHistory::No }
    64     , m_lockBackForwardList { LockBackForwardList::No }
    65     , m_allowNavigationToInvalidURL { AllowNavigationToInvalidURL::Yes }
    66     , m_newFrameOpenerPolicy { NewFrameOpenerPolicy::Allow }
    67     , m_shouldReplaceDocumentIfJavaScriptURL { ReplaceDocumentIfJavaScriptURL }
    68     , m_shouldOpenExternalURLsPolicy { shouldOpenExternalURLsPolicy }
    6956{
    7057}

  • trunk/Source/WebCore/loader/FrameLoadRequest.h

    r257767 r260317  
    4040class FrameLoadRequest {
    4141public:
    42     WEBCORE_EXPORT FrameLoadRequest(Document&, SecurityOrigin&, ResourceRequest&&, const String& frameName, LockHistory, LockBackForwardList, const ReferrerPolicy&, AllowNavigationToInvalidURL, NewFrameOpenerPolicy, ShouldOpenExternalURLsPolicy, InitiatedByMainFrame, ShouldReplaceDocumentIfJavaScriptURL = ReplaceDocumentIfJavaScriptURL, const AtomString& downloadAttribute = { }, const SystemPreviewInfo& = { });
    43     WEBCORE_EXPORT FrameLoadRequest(Frame&, const ResourceRequest&, ShouldOpenExternalURLsPolicy, const SubstituteData& = SubstituteData());
     42    WEBCORE_EXPORT FrameLoadRequest(Document&, SecurityOrigin&, ResourceRequest&&, const String& frameName, InitiatedByMainFrame, const AtomString& downloadAttribute = { }, const SystemPreviewInfo& = { });
     43    WEBCORE_EXPORT FrameLoadRequest(Frame&, const ResourceRequest&, const SubstituteData& = SubstituteData());
    4444
    4545    WEBCORE_EXPORT ~FrameLoadRequest();
    … …  
    7373
    7474    LockBackForwardList lockBackForwardList() const { return m_lockBackForwardList; }
    75     void setlockBackForwardList(LockBackForwardList value) { m_lockBackForwardList = value; }
     75    void setLockBackForwardList(LockBackForwardList value) { m_lockBackForwardList = value; }
    7676
    7777    const String& clientRedirectSourceForHistory() const { return m_clientRedirectSourceForHistory; }
    … …  
    7979
    8080    ReferrerPolicy referrerPolicy() const { return m_referrerPolicy; }
     81    void setReferrerPolicy(const ReferrerPolicy& referrerPolicy) { m_referrerPolicy = referrerPolicy; }
     82
    8183    AllowNavigationToInvalidURL allowNavigationToInvalidURL() const { return m_allowNavigationToInvalidURL; }
     84    void disableNavigationToInvalidURL() { m_allowNavigationToInvalidURL = AllowNavigationToInvalidURL::No; }
     85
    8286    NewFrameOpenerPolicy newFrameOpenerPolicy() const { return m_newFrameOpenerPolicy; }
     87    void setNewFrameOpenerPolicy(NewFrameOpenerPolicy newFrameOpenerPolicy) { m_newFrameOpenerPolicy = newFrameOpenerPolicy; }
    8388
    8489    // The shouldReplaceDocumentIfJavaScriptURL parameter will go away when the FIXME to eliminate the
    8590    // corresponding parameter from ScriptController::executeIfJavaScriptURL() is addressed.
    8691    ShouldReplaceDocumentIfJavaScriptURL shouldReplaceDocumentIfJavaScriptURL() const { return m_shouldReplaceDocumentIfJavaScriptURL; }
     92    void disableShouldReplaceDocumentIfJavaScriptURL() { m_shouldReplaceDocumentIfJavaScriptURL = DoNotReplaceDocumentIfJavaScriptURL; }
    8793
    8894    void setShouldOpenExternalURLsPolicy(ShouldOpenExternalURLsPolicy policy) { m_shouldOpenExternalURLsPolicy = policy; }
    … …  
    109115    bool m_shouldCheckNewWindowPolicy { false };
    110116    bool m_shouldTreatAsContinuingLoad { false };
    111     LockHistory m_lockHistory;
    112     LockBackForwardList m_lockBackForwardList;
     117    LockHistory m_lockHistory { LockHistory::No };
     118    LockBackForwardList m_lockBackForwardList { LockBackForwardList::No };
    113119    ReferrerPolicy m_referrerPolicy { ReferrerPolicy::EmptyString };
    114     AllowNavigationToInvalidURL m_allowNavigationToInvalidURL;
    115     NewFrameOpenerPolicy m_newFrameOpenerPolicy;
    116     ShouldReplaceDocumentIfJavaScriptURL m_shouldReplaceDocumentIfJavaScriptURL;
     120    AllowNavigationToInvalidURL m_allowNavigationToInvalidURL { AllowNavigationToInvalidURL::Yes };
     121    NewFrameOpenerPolicy m_newFrameOpenerPolicy { NewFrameOpenerPolicy::Allow };
     122    ShouldReplaceDocumentIfJavaScriptURL m_shouldReplaceDocumentIfJavaScriptURL { ReplaceDocumentIfJavaScriptURL };
    117123    ShouldOpenExternalURLsPolicy m_shouldOpenExternalURLsPolicy { ShouldOpenExternalURLsPolicy::ShouldNotAllow };
    118124    AtomString m_downloadAttribute;

  • trunk/Source/WebCore/loader/FrameLoader.cpp

    r260239 r260317  
    421421
    422422    NewFrameOpenerPolicy newFrameOpenerPolicy = openerPolicy.valueOr(referrerPolicy == ReferrerPolicy::NoReferrer ? NewFrameOpenerPolicy::Suppress : NewFrameOpenerPolicy::Allow);
    423     changeLocation(FrameLoadRequest(*m_frame.document(), m_frame.document()->securityOrigin(), { url }, passedTarget, lockHistory, lockBackForwardList, referrerPolicy, AllowNavigationToInvalidURL::Yes, newFrameOpenerPolicy, shouldOpenExternalURLsPolicy, initiatedByMainFrame, DoNotReplaceDocumentIfJavaScriptURL, downloadAttribute, systemPreviewInfo), triggeringEvent, WTFMove(adClickAttribution));
     423    FrameLoadRequest frameLoadRequest(*m_frame.document(), m_frame.document()->securityOrigin(), { url }, passedTarget, initiatedByMainFrame, downloadAttribute, systemPreviewInfo);
     424    frameLoadRequest.setLockHistory(lockHistory);
     425    frameLoadRequest.setLockBackForwardList(lockBackForwardList);
     426    frameLoadRequest.setNewFrameOpenerPolicy(newFrameOpenerPolicy);
     427    frameLoadRequest.setReferrerPolicy(referrerPolicy);
     428    frameLoadRequest.setShouldOpenExternalURLsPolicy(shouldOpenExternalURLsPolicy);
     429    frameLoadRequest.disableShouldReplaceDocumentIfJavaScriptURL();
     430    changeLocation(WTFMove(frameLoadRequest), triggeringEvent, WTFMove(adClickAttribution));
    424431}
    425432
    … …  
    988995    auto initiatedByMainFrame = lexicalFrame && lexicalFrame->isMainFrame() ? InitiatedByMainFrame::Yes : InitiatedByMainFrame::Unknown;
    989996
    990     FrameLoadRequest frameLoadRequest { *m_frame.document(), m_frame.document()->securityOrigin(), { url }, "_self"_s, LockHistory::No, LockBackForwardList::Yes, ReferrerPolicy::EmptyString, AllowNavigationToInvalidURL::Yes, NewFrameOpenerPolicy::Suppress, ShouldOpenExternalURLsPolicy::ShouldNotAllow, initiatedByMainFrame };
     997    FrameLoadRequest frameLoadRequest { *m_frame.document(), m_frame.document()->securityOrigin(), { url }, "_self"_s, initiatedByMainFrame };
     998    frameLoadRequest.setNewFrameOpenerPolicy(NewFrameOpenerPolicy::Suppress);
     999    frameLoadRequest.setLockBackForwardList(LockBackForwardList::Yes);
    9911000    childFrame->loader().loadURL(WTFMove(frameLoadRequest), referer, FrameLoadType::RedirectWithLockedBackForwardList, nullptr, { }, WTF::nullopt, [] { });
    9921001}

  • trunk/Source/WebCore/loader/NavigationScheduler.cpp

    r259036 r260317  
    186186        if (initiatedByMainFrame() == InitiatedByMainFrame::Yes)
    187187            resourceRequest.setRequester(ResourceRequest::Requester::Main);
    188         FrameLoadRequest frameLoadRequest { initiatingDocument(), *securityOrigin(), WTFMove(resourceRequest), "_self", lockHistory(), lockBackForwardList(), ReferrerPolicy::EmptyString, AllowNavigationToInvalidURL::No, NewFrameOpenerPolicy::Allow, shouldOpenExternalURLs(), initiatedByMainFrame() };
     188        FrameLoadRequest frameLoadRequest { initiatingDocument(), *securityOrigin(), WTFMove(resourceRequest), "_self", initiatedByMainFrame() };
     189        frameLoadRequest.setLockHistory(lockHistory());
     190        frameLoadRequest.setLockBackForwardList(lockBackForwardList());
     191        frameLoadRequest.disableNavigationToInvalidURL();
     192        frameLoadRequest.setShouldOpenExternalURLsPolicy(shouldOpenExternalURLs());
    189193
    190194        frame.loader().changeLocation(WTFMove(frameLoadRequest));
    … …  
    211215
    212216        ResourceRequest resourceRequest { url(), referrer(), ResourceRequestCachePolicy::UseProtocolCachePolicy };
    213         FrameLoadRequest frameLoadRequest { initiatingDocument(), *securityOrigin(), WTFMove(resourceRequest), "_self", lockHistory(), lockBackForwardList(), ReferrerPolicy::EmptyString, AllowNavigationToInvalidURL::No, NewFrameOpenerPolicy::Allow, shouldOpenExternalURLs(), initiatedByMainFrame() };
     217        FrameLoadRequest frameLoadRequest { initiatingDocument(), *securityOrigin(), WTFMove(resourceRequest), "_self", initiatedByMainFrame() };
     218        frameLoadRequest.setLockHistory(lockHistory());
     219        frameLoadRequest.setLockBackForwardList(lockBackForwardList());
     220        frameLoadRequest.disableNavigationToInvalidURL();
     221        frameLoadRequest.setShouldOpenExternalURLsPolicy(shouldOpenExternalURLs());
    214222
    215223        auto completionHandler = WTFMove(m_completionHandler);
    … …  
    234242
    235243        ResourceRequest resourceRequest { url(), referrer(), ResourceRequestCachePolicy::ReloadIgnoringCacheData };
    236         FrameLoadRequest frameLoadRequest { initiatingDocument(), *securityOrigin(), WTFMove(resourceRequest), "_self", lockHistory(), lockBackForwardList(), ReferrerPolicy::EmptyString, AllowNavigationToInvalidURL::Yes, NewFrameOpenerPolicy::Allow, shouldOpenExternalURLs(), initiatedByMainFrame() };
     244        FrameLoadRequest frameLoadRequest { initiatingDocument(), *securityOrigin(), WTFMove(resourceRequest), "_self", initiatedByMainFrame() };
     245        frameLoadRequest.setLockHistory(lockHistory());
     246        frameLoadRequest.setLockBackForwardList(lockBackForwardList());
     247        frameLoadRequest.setShouldOpenExternalURLsPolicy(shouldOpenExternalURLs());
    237248
    238249        frame.loader().changeLocation(WTFMove(frameLoadRequest));
    … …  
    290301        if (!requestingDocument.canNavigate(&frame))
    291302            return;
    292         FrameLoadRequest frameLoadRequest { requestingDocument, requestingDocument.securityOrigin(), { }, { }, lockHistory(), lockBackForwardList(), requestingDocument.referrerPolicy(), AllowNavigationToInvalidURL::Yes, NewFrameOpenerPolicy::Allow, shouldOpenExternalURLs(), initiatedByMainFrame() };
     303        FrameLoadRequest frameLoadRequest { requestingDocument, requestingDocument.securityOrigin(), { }, { }, initiatedByMainFrame() };
     304        frameLoadRequest.setLockHistory(lockHistory());
     305        frameLoadRequest.setLockBackForwardList(lockBackForwardList());
     306        frameLoadRequest.setReferrerPolicy(requestingDocument.referrerPolicy());
     307        frameLoadRequest.setShouldOpenExternalURLsPolicy(shouldOpenExternalURLs());
    293308        m_submission->populateFrameLoadRequest(frameLoadRequest);
    294309        frame.loader().loadFrameRequest(WTFMove(frameLoadRequest), m_submission->event(), m_submission->takeState());
    … …  
    340355
    341356        ResourceRequest resourceRequest { m_originDocument.url(), emptyString(), ResourceRequestCachePolicy::ReloadIgnoringCacheData };
    342         FrameLoadRequest frameLoadRequest { m_originDocument, m_originDocument.securityOrigin(), WTFMove(resourceRequest), { }, lockHistory(), lockBackForwardList(), ReferrerPolicy::EmptyString, AllowNavigationToInvalidURL::Yes, NewFrameOpenerPolicy::Allow, shouldOpenExternalURLs(), initiatedByMainFrame() };
     357        FrameLoadRequest frameLoadRequest { m_originDocument, m_originDocument.securityOrigin(), WTFMove(resourceRequest), { }, initiatedByMainFrame() };
     358        frameLoadRequest.setLockHistory(lockHistory());
     359        frameLoadRequest.setLockBackForwardList(lockBackForwardList());
    343360        frameLoadRequest.setSubstituteData(replacementData);
     361        frameLoadRequest.setShouldOpenExternalURLsPolicy(shouldOpenExternalURLs());
    344362        frame.loader().load(WTFMove(frameLoadRequest));
    345363    }
    … …  
    440458        auto initiatedByMainFrame = frame && frame->isMainFrame() ? InitiatedByMainFrame::Yes : InitiatedByMainFrame::Unknown;
    441459       
    442         FrameLoadRequest frameLoadRequest { initiatingDocument, securityOrigin, WTFMove(resourceRequest), "_self"_s, lockHistory, lockBackForwardList, ReferrerPolicy::EmptyString, AllowNavigationToInvalidURL::No, NewFrameOpenerPolicy::Allow, initiatingDocument.shouldOpenExternalURLsPolicyToPropagate(), initiatedByMainFrame };
     460        FrameLoadRequest frameLoadRequest { initiatingDocument, securityOrigin, WTFMove(resourceRequest), "_self"_s, initiatedByMainFrame };
     461        frameLoadRequest.setLockHistory(lockHistory);
     462        frameLoadRequest.setLockBackForwardList(lockBackForwardList);
     463        frameLoadRequest.disableNavigationToInvalidURL();
     464        frameLoadRequest.setShouldOpenExternalURLsPolicy(initiatingDocument.shouldOpenExternalURLsPolicyToPropagate());
    443465        loader.changeLocation(WTFMove(frameLoadRequest));
    444466        return completionHandler();

  • trunk/Source/WebCore/page/ContextMenuController.cpp

    r259401 r260317  
    199199        return;
    200200
    201     FrameLoadRequest frameLoadRequest { *frame.document(), frame.document()->securityOrigin(), ResourceRequest(urlToLoad, frame.loader().outgoingReferrer()), { }, LockHistory::No, LockBackForwardList::No, ReferrerPolicy::EmptyString, AllowNavigationToInvalidURL::Yes, NewFrameOpenerPolicy::Suppress, shouldOpenExternalURLsPolicy, InitiatedByMainFrame::Unknown };
     201    FrameLoadRequest frameLoadRequest { *frame.document(), frame.document()->securityOrigin(), ResourceRequest(urlToLoad, frame.loader().outgoingReferrer()), { }, InitiatedByMainFrame::Unknown };
     202    frameLoadRequest.setShouldOpenExternalURLsPolicy(shouldOpenExternalURLsPolicy);
     203    frameLoadRequest.setNewFrameOpenerPolicy(NewFrameOpenerPolicy::Suppress);
    202204
    203205    Page* newPage = oldPage->chrome().createWindow(frame, { }, { *frame.document(), frameLoadRequest.resourceRequest(), frameLoadRequest.initiatedByMainFrame() });
    … …  
    406408        if (Frame* targetFrame = m_context.hitTestResult().targetFrame()) {
    407409            ResourceRequest resourceRequest { m_context.hitTestResult().absoluteLinkURL(), frame->loader().outgoingReferrer() };
    408             FrameLoadRequest frameLoadRequest { *frame->document(), frame->document()->securityOrigin(), WTFMove(resourceRequest), { }, LockHistory::No, LockBackForwardList::No, ReferrerPolicy::EmptyString, AllowNavigationToInvalidURL::Yes, NewFrameOpenerPolicy::Suppress, targetFrame->isMainFrame() ? ShouldOpenExternalURLsPolicy::ShouldAllow : ShouldOpenExternalURLsPolicy::ShouldNotAllow, InitiatedByMainFrame::Unknown };
     410            FrameLoadRequest frameLoadRequest { *frame->document(), frame->document()->securityOrigin(), WTFMove(resourceRequest), { }, InitiatedByMainFrame::Unknown };
     411            frameLoadRequest.setNewFrameOpenerPolicy(NewFrameOpenerPolicy::Suppress);
     412            if (targetFrame->isMainFrame())
     413                frameLoadRequest.setShouldOpenExternalURLsPolicy(ShouldOpenExternalURLsPolicy::ShouldAllow);
    409414            targetFrame->loader().loadFrameRequest(WTFMove(frameLoadRequest), nullptr,  { });
    410415        } else

  • trunk/Source/WebCore/page/DOMWindow.cpp

    r259846 r260317  
    24412441
    24422442    ResourceRequest resourceRequest { completedURL, referrer };
    2443     FrameLoadRequest frameLoadRequest { *activeDocument, activeDocument->securityOrigin(), WTFMove(resourceRequest), frameName, LockHistory::No, LockBackForwardList::No, ReferrerPolicy::EmptyString, AllowNavigationToInvalidURL::Yes, NewFrameOpenerPolicy::Allow, activeDocument->shouldOpenExternalURLsPolicyToPropagate(), initiatedByMainFrame };
     2443    FrameLoadRequest frameLoadRequest { *activeDocument, activeDocument->securityOrigin(), WTFMove(resourceRequest), frameName, initiatedByMainFrame };
     2444    frameLoadRequest.setShouldOpenExternalURLsPolicy(activeDocument->shouldOpenExternalURLsPolicyToPropagate());
    24442445
    24452446    // We pass the opener frame for the lookupFrame in case the active frame is different from
    … …  
    24662467        ResourceRequest resourceRequest { completedURL, referrer, ResourceRequestCachePolicy::UseProtocolCachePolicy };
    24672468        FrameLoader::addSameSiteInfoToRequestIfNeeded(resourceRequest, openerFrame.document());
    2468         FrameLoadRequest frameLoadRequest { *activeWindow.document(), activeWindow.document()->securityOrigin(), WTFMove(resourceRequest), "_self"_s, LockHistory::No, LockBackForwardList::No, ReferrerPolicy::EmptyString, AllowNavigationToInvalidURL::Yes, NewFrameOpenerPolicy::Allow, activeDocument->shouldOpenExternalURLsPolicyToPropagate(), initiatedByMainFrame };
     2469        FrameLoadRequest frameLoadRequest { *activeWindow.document(), activeWindow.document()->securityOrigin(), WTFMove(resourceRequest), "_self"_s, initiatedByMainFrame };
     2470        frameLoadRequest.setShouldOpenExternalURLsPolicy(activeDocument->shouldOpenExternalURLsPolicyToPropagate());
    24692471        newFrame->loader().changeLocation(WTFMove(frameLoadRequest));
    24702472    } else if (!urlString.isEmpty()) {

  • trunk/Source/WebCore/page/DragController.cpp

    r259938 r260317  
    290290
    291291    client().willPerformDragDestinationAction(DragDestinationActionLoad, dragData);
    292     FrameLoadRequest frameLoadRequest { m_page.mainFrame(), ResourceRequest { urlString }, shouldOpenExternalURLsPolicy };
     292    FrameLoadRequest frameLoadRequest { m_page.mainFrame(), ResourceRequest { urlString } };
     293    frameLoadRequest.setShouldOpenExternalURLsPolicy(shouldOpenExternalURLsPolicy);
    293294    frameLoadRequest.setIsRequestFromClientOrUserInput();
    294295    m_page.mainFrame().loader().load(WTFMove(frameLoadRequest));

  • trunk/Source/WebKit/ChangeLog

    r260316 r260317  
     12020-04-18  Rob Buis  <rbuis@igalia.com>
     2
     3        Reduce parameter list of the FrameLoadRequest constructor
     4        https://bugs.webkit.org/show_bug.cgi?id=210668
     5
     6        Reviewed by Darin Adler.
     7
     8        Adapt to API change.
     9
     10        * WebProcess/Inspector/WebInspector.cpp:
     11        (WebKit::WebInspector::openInNewTab):
     12        * WebProcess/Plugins/PluginView.cpp:
     13        (WebKit::PluginView::performFrameLoadURLRequest):
     14        (WebKit::PluginView::loadURL):
     15        * WebProcess/WebPage/WebPage.cpp:
     16        (WebKit::WebPage::loadURLInFrame):
     17        (WebKit::WebPage::loadDataInFrame):
     18        (WebKit::WebPage::loadRequest):
     19        (WebKit::WebPage::loadDataImpl):
     20
    1212020-04-18  David Kilzer  <ddkilzer@apple.com>
    222

  • trunk/Source/WebKit/WebProcess/Inspector/WebInspector.cpp

    r258487 r260317  
    168168
    169169    Frame& inspectedMainFrame = inspectedPage->mainFrame();
    170     FrameLoadRequest frameLoadRequest { *inspectedMainFrame.document(), inspectedMainFrame.document()->securityOrigin(), ResourceRequest { urlString }, "_blank"_s, LockHistory::No, LockBackForwardList::No, ReferrerPolicy::EmptyString, AllowNavigationToInvalidURL::Yes, NewFrameOpenerPolicy::Allow, ShouldOpenExternalURLsPolicy::ShouldNotAllow, InitiatedByMainFrame::Unknown };
     170    FrameLoadRequest frameLoadRequest { *inspectedMainFrame.document(), inspectedMainFrame.document()->securityOrigin(), ResourceRequest { urlString }, "_blank"_s, InitiatedByMainFrame::Unknown };
    171171
    172172    NavigationAction action { *inspectedMainFrame.document(), frameLoadRequest.resourceRequest(), frameLoadRequest.initiatedByMainFrame(), NavigationType::LinkClicked };

  • trunk/Source/WebKit/WebProcess/Plugins/PluginView.cpp

    r259761 r260317  
    12051205    if (!targetFrame) {
    12061206        // We did not find a target frame. Ask our frame to load the page. This may or may not create a popup window.
    1207         FrameLoadRequest frameLoadRequest { *frame, request->request(), ShouldOpenExternalURLsPolicy::ShouldNotAllow };
     1207        FrameLoadRequest frameLoadRequest { *frame, request->request() };
    12081208        frameLoadRequest.setFrameName(request->target());
    12091209        frameLoadRequest.setShouldCheckNewWindowPolicy(true);
    … …  
    12171217
    12181218    // Now ask the frame to load the request.
    1219     targetFrame->loader().load(FrameLoadRequest(*targetFrame, request->request(), ShouldOpenExternalURLsPolicy::ShouldNotAllow));
     1219    targetFrame->loader().load(FrameLoadRequest(*targetFrame, request->request() ));
    12201220
    12211221    auto* targetWebFrame = WebFrame::fromCoreFrame(*targetFrame);
    … …  
    13911391void PluginView::loadURL(uint64_t requestID, const String& method, const String& urlString, const String& target, const HTTPHeaderMap& headerFields, const Vector<uint8_t>& httpBody, bool allowPopups)
    13921392{
    1393     FrameLoadRequest frameLoadRequest { m_pluginElement->document(), m_pluginElement->document().securityOrigin(), { }, target, LockHistory::No, LockBackForwardList::No, ReferrerPolicy::EmptyString, AllowNavigationToInvalidURL::Yes, NewFrameOpenerPolicy::Allow, ShouldOpenExternalURLsPolicy::ShouldNotAllow, InitiatedByMainFrame::Unknown };
     1393    FrameLoadRequest frameLoadRequest { m_pluginElement->document(), m_pluginElement->document().securityOrigin(), { }, target, InitiatedByMainFrame::Unknown };
    13941394    frameLoadRequest.resourceRequest().setHTTPMethod(method);
    13951395    frameLoadRequest.resourceRequest().setURL(m_pluginElement->document().completeURL(urlString));

  • trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp

    r260303 r260317  
    14991499        return;
    15001500
    1501     frame->coreFrame()->loader().load(FrameLoadRequest(*frame->coreFrame(), ResourceRequest(url, referrer), ShouldOpenExternalURLsPolicy::ShouldNotAllow));
     1501    frame->coreFrame()->loader().load(FrameLoadRequest(*frame->coreFrame(), ResourceRequest(url, referrer)));
    15021502}
    15031503
    … …  
    15121512    ResourceResponse response(baseURL, MIMEType, sharedBuffer->size(), encodingName);
    15131513    SubstituteData substituteData(WTFMove(sharedBuffer), baseURL, WTFMove(response), SubstituteData::SessionHistoryVisibility::Hidden);
    1514     frame->coreFrame()->loader().load(FrameLoadRequest(*frame->coreFrame(), ResourceRequest(baseURL), ShouldOpenExternalURLsPolicy::ShouldNotAllow, WTFMove(substituteData)));
     1514    frame->coreFrame()->loader().load(FrameLoadRequest(*frame->coreFrame(), ResourceRequest(baseURL), WTFMove(substituteData)));
    15151515}
    15161516
    … …  
    15401540
    15411541    // Initate the load in WebCore.
    1542     FrameLoadRequest frameLoadRequest { *m_mainFrame->coreFrame(), loadParameters.request, ShouldOpenExternalURLsPolicy::ShouldNotAllow };
     1542    FrameLoadRequest frameLoadRequest { *m_mainFrame->coreFrame(), loadParameters.request };
    15431543    frameLoadRequest.setShouldOpenExternalURLsPolicy(loadParameters.shouldOpenExternalURLsPolicy);
    15441544    frameLoadRequest.setShouldTreatAsContinuingLoad(loadParameters.shouldTreatAsContinuingLoad);
    15451545    frameLoadRequest.setLockHistory(loadParameters.lockHistory);
    1546     frameLoadRequest.setlockBackForwardList(loadParameters.lockBackForwardList);
     1546    frameLoadRequest.setLockBackForwardList(loadParameters.lockBackForwardList);
    15471547    frameLoadRequest.setClientRedirectSourceForHistory(loadParameters.clientRedirectSourceForHistory);
    15481548    frameLoadRequest.setIsRequestFromClientOrUserInput();
    … …  
    15791579
    15801580    // Initate the load in WebCore.
    1581     FrameLoadRequest frameLoadRequest(*m_mainFrame->coreFrame(), request, shouldOpenExternalURLsPolicy, substituteData);
     1581    FrameLoadRequest frameLoadRequest(*m_mainFrame->coreFrame(), request, substituteData);
     1582    frameLoadRequest.setShouldOpenExternalURLsPolicy(shouldOpenExternalURLsPolicy);
    15821583    frameLoadRequest.setShouldTreatAsContinuingLoad(shouldTreatAsContinuingLoad);
    15831584    frameLoadRequest.setIsRequestFromClientOrUserInput();

  • trunk/Source/WebKitLegacy/ios/ChangeLog

    r259987 r260317  
     12020-04-18  Rob Buis  <rbuis@igalia.com>
     2
     3        Reduce parameter list of the FrameLoadRequest constructor
     4        https://bugs.webkit.org/show_bug.cgi?id=210668
     5
     6        Reviewed by Darin Adler.
     7
     8        Adapt to API change.
     9
     10        * WebView/WebPDFViewPlaceholder.mm:
     11        (-[WebPDFViewPlaceholder simulateClickOnLinkToURL:]):
     12
    1132020-04-12  Darin Adler  <darin@apple.com>
    214

  • trunk/Source/WebKitLegacy/ios/WebView/WebPDFViewPlaceholder.mm

    r257707 r260317  
    472472    // Call to the frame loader because this is where our security checks are made.
    473473    Frame* frame = core([_dataSource webFrame]);
    474     FrameLoadRequest frameLoadRequest { *frame->document(), frame->document()->securityOrigin(), { URL }, { }, LockHistory::No, LockBackForwardList::No, ReferrerPolicy::NoReferrer, AllowNavigationToInvalidURL::Yes, NewFrameOpenerPolicy::Allow, ShouldOpenExternalURLsPolicy::ShouldNotAllow,  InitiatedByMainFrame::Unknown };
     474    FrameLoadRequest frameLoadRequest { *frame->document(), frame->document()->securityOrigin(), { URL }, { }, InitiatedByMainFrame::Unknown };
     475frameLoadRequest.setReferrerPolicy(ReferrerPolicy::NoReferrer);
    475476    frame->loader().loadFrameRequest(WTFMove(frameLoadRequest), event.ptr(), nullptr);
    476477}

  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r260315 r260317  
     12020-04-18  Rob Buis  <rbuis@igalia.com>
     2
     3        Reduce parameter list of the FrameLoadRequest constructor
     4        https://bugs.webkit.org/show_bug.cgi?id=210668
     5
     6        Reviewed by Darin Adler.
     7
     8        Adapt to API change.
     9
     10        * Plugins/WebPluginController.mm:
     11        (-[WebPluginController webPlugInContainerLoadRequest:inFrame:]):
     12        * WebView/WebFrame.mm:
     13        (-[WebFrame loadRequest:]):
     14        (-[WebFrame _loadData:MIMEType:textEncodingName:baseURL:unreachableURL:]):
     15        * WebView/WebPDFView.mm:
     16        (-[WebPDFView PDFViewWillClickOnLink:withURL:]):
     17
    1182020-04-18  David Kilzer  <ddkilzer@apple.com>
    219

  • trunk/Source/WebKitLegacy/mac/Plugins/WebPluginController.mm

    r252435 r260317  
    497497            return;
    498498        }
    499         WebCore::FrameLoadRequest frameLoadRequest { *core(frame), request, WebCore::ShouldOpenExternalURLsPolicy::ShouldNotAllow };
     499        WebCore::FrameLoadRequest frameLoadRequest { *core(frame), request };
    500500        frameLoadRequest.setFrameName(target);
    501501        frameLoadRequest.setShouldCheckNewWindowPolicy(true);

  • trunk/Source/WebKitLegacy/mac/WebView/WebFrame.mm

    r260239 r260317  
    24852485        resourceRequest.setURL([NSURL URLWithString:[@"file:" stringByAppendingString:[[request URL] absoluteString]]]);
    24862486
    2487     coreFrame->loader().load(WebCore::FrameLoadRequest(*coreFrame, resourceRequest, WebCore::ShouldOpenExternalURLsPolicy::ShouldNotAllow));
     2487    coreFrame->loader().load(WebCore::FrameLoadRequest(*coreFrame, resourceRequest));
    24882488}
    24892489
    … …  
    25172517        NSURL *quickLookURL = responseURL ? responseURL : baseURL;
    25182518        if (auto request = WebCore::registerQLPreviewConverterIfNeeded(quickLookURL, MIMEType, data)) {
    2519             _private->coreFrame->loader().load(WebCore::FrameLoadRequest(*_private->coreFrame, request.get(), WebCore::ShouldOpenExternalURLsPolicy::ShouldNotAllow));
     2519            _private->coreFrame->loader().load(WebCore::FrameLoadRequest(*_private->coreFrame, request.get()));
    25202520            return;
    25212521        }
    … …  
    25282528    WebCore::SubstituteData substituteData(WebCore::SharedBuffer::create(data), [unreachableURL absoluteURL], response, WebCore::SubstituteData::SessionHistoryVisibility::Hidden);
    25292529
    2530     _private->coreFrame->loader().load(WebCore::FrameLoadRequest(*_private->coreFrame, request, WebCore::ShouldOpenExternalURLsPolicy::ShouldNotAllow, substituteData));
     2530    _private->coreFrame->loader().load(WebCore::FrameLoadRequest(*_private->coreFrame, request, substituteData));
    25312531}
    25322532

  • trunk/Source/WebKitLegacy/mac/WebView/WebPDFView.mm

    r259843 r260317  
    988988    // Call to the frame loader because this is where our security checks are made.
    989989    auto* frame = core([dataSource webFrame]);
    990     WebCore::FrameLoadRequest frameLoadRequest { *frame->document(), frame->document()->securityOrigin(), { URL }, { }, WebCore::LockHistory::No, WebCore::LockBackForwardList::No, WebCore::ReferrerPolicy::NoReferrer, WebCore::AllowNavigationToInvalidURL::Yes, WebCore::NewFrameOpenerPolicy::Allow, WebCore::ShouldOpenExternalURLsPolicy::ShouldNotAllow, WebCore::InitiatedByMainFrame::Unknown };
     990    WebCore::FrameLoadRequest frameLoadRequest { *frame->document(), frame->document()->securityOrigin(), { URL }, { }, WebCore::InitiatedByMainFrame::Unknown };
     991    frameLoadRequest.setReferrerPolicy(WebCore::ReferrerPolicy::NoReferrer);
    991992    frame->loader().loadFrameRequest(WTFMove(frameLoadRequest), event.get(), nullptr);
    992993}

  • trunk/Source/WebKitLegacy/win/ChangeLog

    r260239 r260317  
     12020-04-18  Rob Buis  <rbuis@igalia.com>
     2
     3        Reduce parameter list of the FrameLoadRequest constructor
     4        https://bugs.webkit.org/show_bug.cgi?id=210668
     5
     6        Reviewed by Darin Adler.
     7
     8        Adapt to API change.
     9
     10        * Plugins/PluginView.cpp:
     11        (WebCore::PluginView::start):
     12        (WebCore::PluginView::performRequest):
     13        (WebCore::PluginView::getURLNotify):
     14        (WebCore::PluginView::getURL):
     15        (WebCore::PluginView::handlePost):
     16        * WebFrame.cpp:
     17        (WebFrame::loadRequest):
     18        (WebFrame::loadData):
     19
    1202020-04-17  Rob Buis  <rbuis@igalia.com>
    221

  • trunk/Source/WebKitLegacy/win/Plugins/PluginView.cpp

    r257707 r260317  
    249249
    250250    if (!m_url.isEmpty() && !m_loadManually) {
    251         FrameLoadRequest frameLoadRequest { *m_parentFrame->document(), m_parentFrame->document()->securityOrigin(), { }, { }, LockHistory::No, LockBackForwardList::No, ReferrerPolicy::EmptyString, AllowNavigationToInvalidURL::Yes, NewFrameOpenerPolicy::Allow, ShouldOpenExternalURLsPolicy::ShouldNotAllow, InitiatedByMainFrame::Unknown };
     251        FrameLoadRequest frameLoadRequest { *m_parentFrame->document(), m_parentFrame->document()->securityOrigin(), { }, { }, InitiatedByMainFrame::Unknown };
    252252        frameLoadRequest.resourceRequest().setHTTPMethod("GET");
    253253        frameLoadRequest.resourceRequest().setURL(m_url);
    … …  
    416416            RefPtr<PluginView> protect(this);
    417417
    418             FrameLoadRequest frameLoadRequest { *m_parentFrame.get(), request->frameLoadRequest().resourceRequest(), ShouldOpenExternalURLsPolicy::ShouldNotAllow };
     418            FrameLoadRequest frameLoadRequest { *m_parentFrame.get(), request->frameLoadRequest().resourceRequest() };
    419419            frameLoadRequest.setFrameName(targetFrameName);
    420420            frameLoadRequest.setShouldCheckNewWindowPolicy(true);
    … …  
    528528NPError PluginView::getURLNotify(const char* url, const char* target, void* notifyData)
    529529{
    530     FrameLoadRequest frameLoadRequest { *m_parentFrame->document(), m_parentFrame->document()->securityOrigin(), { }, target, LockHistory::No, LockBackForwardList::No, ReferrerPolicy::EmptyString, AllowNavigationToInvalidURL::Yes, NewFrameOpenerPolicy::Allow, ShouldOpenExternalURLsPolicy::ShouldNotAllow, InitiatedByMainFrame::Unknown };
     530    FrameLoadRequest frameLoadRequest { *m_parentFrame->document(), m_parentFrame->document()->securityOrigin(), { }, target, InitiatedByMainFrame::Unknown };
    531531
    532532    frameLoadRequest.resourceRequest().setHTTPMethod("GET");
    … …  
    538538NPError PluginView::getURL(const char* url, const char* target)
    539539{
    540     FrameLoadRequest frameLoadRequest { *m_parentFrame->document(), m_parentFrame->document()->securityOrigin(), { }, target, LockHistory::No, LockBackForwardList::No, ReferrerPolicy::EmptyString, AllowNavigationToInvalidURL::Yes, NewFrameOpenerPolicy::Allow, ShouldOpenExternalURLsPolicy::ShouldNotAllow, InitiatedByMainFrame::Unknown };
     540    FrameLoadRequest frameLoadRequest { *m_parentFrame->document(), m_parentFrame->document()->securityOrigin(), { }, target, InitiatedByMainFrame::Unknown };
    541541
    542542    frameLoadRequest.resourceRequest().setHTTPMethod("GET");
    … …  
    10811081    }
    10821082
    1083     FrameLoadRequest frameLoadRequest { *m_parentFrame->document(), m_parentFrame->document()->securityOrigin(), { }, target, LockHistory::No, LockBackForwardList::No, ReferrerPolicy::EmptyString, AllowNavigationToInvalidURL::Yes, NewFrameOpenerPolicy::Allow, ShouldOpenExternalURLsPolicy::ShouldNotAllow, InitiatedByMainFrame::Unknown };
     1083    FrameLoadRequest frameLoadRequest { *m_parentFrame->document(), m_parentFrame->document()->securityOrigin(), { }, target, InitiatedByMainFrame::Unknown };
    10841084    frameLoadRequest.resourceRequest().setHTTPMethod("POST");
    10851085    frameLoadRequest.resourceRequest().setURL(makeURL(m_parentFrame->document()->baseURL(), url));

  • trunk/Source/WebKitLegacy/win/WebFrame.cpp

    r259401 r260317  
    560560        return E_UNEXPECTED;
    561561
    562     coreFrame->loader().load(FrameLoadRequest(*coreFrame, requestImpl->resourceRequest(), ShouldOpenExternalURLsPolicy::ShouldNotAllow));
     562    coreFrame->loader().load(FrameLoadRequest(*coreFrame, requestImpl->resourceRequest()));
    563563    return S_OK;
    564564}
    … …  
    585585    // This method is only called from IWebFrame methods, so don't ASSERT that the Frame pointer isn't null.
    586586    if (Frame* coreFrame = core(this))
    587         coreFrame->loader().load(FrameLoadRequest(*coreFrame, request, ShouldOpenExternalURLsPolicy::ShouldNotAllow, substituteData));
     587        coreFrame->loader().load(FrameLoadRequest(*coreFrame, request, substituteData));
    588588}
    589589
Note: See TracChangeset for help on using the changeset viewer.