diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-30 12:48:17 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-30 12:48:17 +0200 |
| commit | 881da28418d380042aa95a97f0cbd42560a64f7c (patch) | |
| tree | a794dff3274695e99c651902dde93d934ea7a5af /Source/WebCore/loader/FrameLoadRequest.cpp | |
| parent | 7e104c57a70fdf551bb3d22a5d637cdcbc69dbea (diff) | |
| parent | 0fcedcd17cc00d3dd44c718b3cb36c1033319671 (diff) | |
| download | qtwebkit-881da28418d380042aa95a97f0cbd42560a64f7c.tar.gz | |
Merge 'wip/next' into dev
Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9
Diffstat (limited to 'Source/WebCore/loader/FrameLoadRequest.cpp')
| -rw-r--r-- | Source/WebCore/loader/FrameLoadRequest.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Source/WebCore/loader/FrameLoadRequest.cpp b/Source/WebCore/loader/FrameLoadRequest.cpp index 014678823..5d9926fd0 100644 --- a/Source/WebCore/loader/FrameLoadRequest.cpp +++ b/Source/WebCore/loader/FrameLoadRequest.cpp @@ -36,12 +36,18 @@ namespace WebCore { -FrameLoadRequest::FrameLoadRequest(Frame* frame, const ResourceRequest& resourceRequest, const SubstituteData& substituteData) +FrameLoadRequest::FrameLoadRequest(Frame* frame, const ResourceRequest& resourceRequest, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, const SubstituteData& substituteData) : m_requester(frame->document()->securityOrigin()) , m_resourceRequest(resourceRequest) - , m_lockHistory(false) , m_shouldCheckNewWindowPolicy(false) , m_substituteData(substituteData) + , m_lockHistory(LockHistory::No) + , m_lockBackForwardList(LockBackForwardList::No) + , m_shouldSendReferrer(MaybeSendReferrer) + , m_allowNavigationToInvalidURL(AllowNavigationToInvalidURL::Yes) + , m_newFrameOpenerPolicy(NewFrameOpenerPolicy::Allow) + , m_shouldReplaceDocumentIfJavaScriptURL(ReplaceDocumentIfJavaScriptURL) + , m_shouldOpenExternalURLsPolicy(shouldOpenExternalURLsPolicy) { } |