diff options
Diffstat (limited to 'Source/WebCore/loader/FrameLoadRequest.h')
| -rw-r--r-- | Source/WebCore/loader/FrameLoadRequest.h | 114 |
1 files changed, 88 insertions, 26 deletions
diff --git a/Source/WebCore/loader/FrameLoadRequest.h b/Source/WebCore/loader/FrameLoadRequest.h index 1b7789986..1cbebbb82 100644 --- a/Source/WebCore/loader/FrameLoadRequest.h +++ b/Source/WebCore/loader/FrameLoadRequest.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003, 2006, 2010 Apple Inc. All rights reserved. + * Copyright (C) 2003-2016 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,10 +10,10 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR @@ -23,9 +23,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef FrameLoadRequest_h -#define FrameLoadRequest_h +#pragma once +#include "FrameLoaderTypes.h" #include "ResourceRequest.h" #include "SecurityOrigin.h" #include "SubstituteData.h" @@ -35,31 +35,75 @@ class Frame; struct FrameLoadRequest { public: - explicit FrameLoadRequest(SecurityOrigin* requester) - : m_requester(requester) - , m_lockHistory(false) - , m_shouldCheckNewWindowPolicy(false) + FrameLoadRequest(SecurityOrigin& requester, LockHistory lockHistory, LockBackForwardList lockBackForwardList, ShouldSendReferrer shouldSendReferrer, AllowNavigationToInvalidURL allowNavigationToInvalidURL, NewFrameOpenerPolicy newFrameOpenerPolicy, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy) + : m_requester(&requester) + , m_lockHistory(lockHistory) + , m_lockBackForwardList(lockBackForwardList) + , m_shouldSendReferrer(shouldSendReferrer) + , m_allowNavigationToInvalidURL(allowNavigationToInvalidURL) + , m_newFrameOpenerPolicy(newFrameOpenerPolicy) + , m_shouldReplaceDocumentIfJavaScriptURL(ReplaceDocumentIfJavaScriptURL) + , m_shouldOpenExternalURLsPolicy(shouldOpenExternalURLsPolicy) { } - FrameLoadRequest(SecurityOrigin* requester, const ResourceRequest& resourceRequest) - : m_requester(requester) + FrameLoadRequest(SecurityOrigin& requester, const ResourceRequest& resourceRequest, LockHistory lockHistory, LockBackForwardList lockBackForwardList, ShouldSendReferrer shouldSendReferrer, AllowNavigationToInvalidURL allowNavigationToInvalidURL, NewFrameOpenerPolicy newFrameOpenerPolicy, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy) + : m_requester(&requester) , m_resourceRequest(resourceRequest) - , m_lockHistory(false) - , m_shouldCheckNewWindowPolicy(false) + , m_lockHistory(lockHistory) + , m_lockBackForwardList(lockBackForwardList) + , m_shouldSendReferrer(shouldSendReferrer) + , m_allowNavigationToInvalidURL(allowNavigationToInvalidURL) + , m_newFrameOpenerPolicy(newFrameOpenerPolicy) + , m_shouldReplaceDocumentIfJavaScriptURL(ReplaceDocumentIfJavaScriptURL) + , m_shouldOpenExternalURLsPolicy(shouldOpenExternalURLsPolicy) { } - FrameLoadRequest(SecurityOrigin* requester, const ResourceRequest& resourceRequest, const String& frameName) - : m_requester(requester) + FrameLoadRequest(SecurityOrigin& requester, const ResourceRequest& resourceRequest, const String& frameName, LockHistory lockHistory, LockBackForwardList lockBackForwardList, ShouldSendReferrer shouldSendReferrer, AllowNavigationToInvalidURL allowNavigationToInvalidURL, NewFrameOpenerPolicy newFrameOpenerPolicy, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy) + : m_requester(&requester) , m_resourceRequest(resourceRequest) , m_frameName(frameName) - , m_lockHistory(false) - , m_shouldCheckNewWindowPolicy(false) + , m_lockHistory(lockHistory) + , m_lockBackForwardList(lockBackForwardList) + , m_shouldSendReferrer(shouldSendReferrer) + , m_allowNavigationToInvalidURL(allowNavigationToInvalidURL) + , m_newFrameOpenerPolicy(newFrameOpenerPolicy) + , m_shouldReplaceDocumentIfJavaScriptURL(ReplaceDocumentIfJavaScriptURL) + , m_shouldOpenExternalURLsPolicy(shouldOpenExternalURLsPolicy) { } - FrameLoadRequest(Frame*, const ResourceRequest&, const SubstituteData& = SubstituteData()); + FrameLoadRequest(SecurityOrigin& requester, const ResourceRequest& resourceRequest, const String& frameName, LockHistory lockHistory, LockBackForwardList lockBackForwardList, ShouldSendReferrer shouldSendReferrer, AllowNavigationToInvalidURL allowNavigationToInvalidURL, NewFrameOpenerPolicy newFrameOpenerPolicy, ShouldReplaceDocumentIfJavaScriptURL shouldReplaceDocumentIfJavaScriptURL, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy) + : m_requester(&requester) + , m_resourceRequest(resourceRequest) + , m_frameName(frameName) + , m_lockHistory(lockHistory) + , m_lockBackForwardList(lockBackForwardList) + , m_shouldSendReferrer(shouldSendReferrer) + , m_allowNavigationToInvalidURL(allowNavigationToInvalidURL) + , m_newFrameOpenerPolicy(newFrameOpenerPolicy) + , m_shouldReplaceDocumentIfJavaScriptURL(shouldReplaceDocumentIfJavaScriptURL) + , m_shouldOpenExternalURLsPolicy(shouldOpenExternalURLsPolicy) + { + } + + FrameLoadRequest(SecurityOrigin& requester, const ResourceRequest& resourceRequest, const String& frameName, LockHistory lockHistory, LockBackForwardList lockBackForwardList, ShouldSendReferrer shouldSendReferrer, AllowNavigationToInvalidURL allowNavigationToInvalidURL, NewFrameOpenerPolicy newFrameOpenerPolicy, ShouldReplaceDocumentIfJavaScriptURL shouldReplaceDocumentIfJavaScriptURL, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, const AtomicString& downloadAttribute) + : m_requester(&requester) + , m_resourceRequest(resourceRequest) + , m_frameName(frameName) + , m_lockHistory(lockHistory) + , m_lockBackForwardList(lockBackForwardList) + , m_shouldSendReferrer(shouldSendReferrer) + , m_allowNavigationToInvalidURL(allowNavigationToInvalidURL) + , m_newFrameOpenerPolicy(newFrameOpenerPolicy) + , m_shouldReplaceDocumentIfJavaScriptURL(shouldReplaceDocumentIfJavaScriptURL) + , m_shouldOpenExternalURLsPolicy(shouldOpenExternalURLsPolicy) + , m_downloadAttribute(downloadAttribute) + { + } + + WEBCORE_EXPORT FrameLoadRequest(Frame*, const ResourceRequest&, ShouldOpenExternalURLsPolicy, const SubstituteData& = SubstituteData()); bool isEmpty() const { return m_resourceRequest.isEmpty(); } @@ -71,9 +115,6 @@ public: const String& frameName() const { return m_frameName; } void setFrameName(const String& frameName) { m_frameName = frameName; } - void setLockHistory(bool lockHistory) { m_lockHistory = lockHistory; } - bool lockHistory() const { return m_lockHistory; } - void setShouldCheckNewWindowPolicy(bool checkPolicy) { m_shouldCheckNewWindowPolicy = checkPolicy; } bool shouldCheckNewWindowPolicy() const { return m_shouldCheckNewWindowPolicy; } @@ -81,15 +122,36 @@ public: void setSubstituteData(const SubstituteData& data) { m_substituteData = data; } bool hasSubstituteData() { return m_substituteData.isValid(); } + LockHistory lockHistory() const { return m_lockHistory; } + LockBackForwardList lockBackForwardList() const { return m_lockBackForwardList; } + ShouldSendReferrer shouldSendReferrer() const { return m_shouldSendReferrer; } + AllowNavigationToInvalidURL allowNavigationToInvalidURL() const { return m_allowNavigationToInvalidURL; } + NewFrameOpenerPolicy newFrameOpenerPolicy() const { return m_newFrameOpenerPolicy; } + + // The shouldReplaceDocumentIfJavaScriptURL parameter will go away when the FIXME to eliminate the + // corresponding parameter from ScriptController::executeIfJavaScriptURL() is addressed. + ShouldReplaceDocumentIfJavaScriptURL shouldReplaceDocumentIfJavaScriptURL() const { return m_shouldReplaceDocumentIfJavaScriptURL; } + + void setShouldOpenExternalURLsPolicy(ShouldOpenExternalURLsPolicy policy) { m_shouldOpenExternalURLsPolicy = policy; } + ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy() const { return m_shouldOpenExternalURLsPolicy; } + + const AtomicString& downloadAttribute() const { return m_downloadAttribute; } + private: RefPtr<SecurityOrigin> m_requester; ResourceRequest m_resourceRequest; String m_frameName; - bool m_lockHistory; - bool m_shouldCheckNewWindowPolicy; + bool m_shouldCheckNewWindowPolicy { false }; SubstituteData m_substituteData; -}; -} + LockHistory m_lockHistory; + LockBackForwardList m_lockBackForwardList; + ShouldSendReferrer m_shouldSendReferrer; + AllowNavigationToInvalidURL m_allowNavigationToInvalidURL; + NewFrameOpenerPolicy m_newFrameOpenerPolicy; + ShouldReplaceDocumentIfJavaScriptURL m_shouldReplaceDocumentIfJavaScriptURL; + ShouldOpenExternalURLsPolicy m_shouldOpenExternalURLsPolicy { ShouldOpenExternalURLsPolicy::ShouldNotAllow }; + AtomicString m_downloadAttribute; +}; -#endif // FrameLoadRequest_h +} // namespace WebCore |