Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(964)

Unified Diff: Source/core/loader/FrameLoadRequest.h

Issue 838903002: Replicate sandbox flags for OOPIF (Blink part 2) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@iframe-sandbox-flags-part1
Patch Set: Remove old createLocalChild Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/loader/FrameLoadRequest.h
diff --git a/Source/core/loader/FrameLoadRequest.h b/Source/core/loader/FrameLoadRequest.h
index df0e8ace97048d833d48662d9e14906393a9c639..66f4e3795253027a2d00b673f96f82afa1414843 100644
--- a/Source/core/loader/FrameLoadRequest.h
+++ b/Source/core/loader/FrameLoadRequest.h
@@ -45,6 +45,7 @@ public:
, m_clientRedirect(NotClientRedirect)
, m_shouldSendReferrer(MaybeSendReferrer)
, m_shouldCheckMainWorldContentSecurityPolicy(CheckContentSecurityPolicy)
+ , m_sandboxFlags(SandboxNone)
{
}
@@ -55,6 +56,7 @@ public:
, m_clientRedirect(NotClientRedirect)
, m_shouldSendReferrer(MaybeSendReferrer)
, m_shouldCheckMainWorldContentSecurityPolicy(CheckContentSecurityPolicy)
+ , m_sandboxFlags(SandboxNone)
{
}
@@ -66,6 +68,7 @@ public:
, m_clientRedirect(NotClientRedirect)
, m_shouldSendReferrer(MaybeSendReferrer)
, m_shouldCheckMainWorldContentSecurityPolicy(CheckContentSecurityPolicy)
+ , m_sandboxFlags(SandboxNone)
{
}
@@ -77,6 +80,19 @@ public:
, m_clientRedirect(NotClientRedirect)
, m_shouldSendReferrer(MaybeSendReferrer)
, m_shouldCheckMainWorldContentSecurityPolicy(shouldCheckMainWorldContentSecurityPolicy)
+ , m_sandboxFlags(SandboxNone)
dcheng 2015/01/16 19:11:19 We should probably consider delegated constructors
alexmos 2015/01/17 02:54:42 Oh, neat, didn't realize these are allowed. :) I
+ {
+ }
+
+ FrameLoadRequest(Document* originDocument, const ResourceRequest& resourceRequest, const AtomicString& frameName, ContentSecurityPolicyDisposition shouldCheckMainWorldContentSecurityPolicy, SandboxFlags sandboxFlags)
+ : m_originDocument(originDocument)
+ , m_resourceRequest(resourceRequest)
+ , m_frameName(frameName)
+ , m_lockBackForwardList(false)
+ , m_clientRedirect(NotClientRedirect)
+ , m_shouldSendReferrer(MaybeSendReferrer)
+ , m_shouldCheckMainWorldContentSecurityPolicy(shouldCheckMainWorldContentSecurityPolicy)
+ , m_sandboxFlags(sandboxFlags)
{
}
@@ -88,6 +104,7 @@ public:
, m_clientRedirect(NotClientRedirect)
, m_shouldSendReferrer(MaybeSendReferrer)
, m_shouldCheckMainWorldContentSecurityPolicy(CheckContentSecurityPolicy)
+ , m_sandboxFlags(SandboxNone)
{
}
@@ -118,6 +135,8 @@ public:
ContentSecurityPolicyDisposition shouldCheckMainWorldContentSecurityPolicy() const { return m_shouldCheckMainWorldContentSecurityPolicy; }
+ const SandboxFlags& sandboxFlags() const { return m_sandboxFlags; }
dcheng 2015/01/16 19:11:19 Are you intentionally returning a reference here?
alexmos 2015/01/17 02:54:42 Unintentional, fixed.
+
private:
RefPtrWillBeMember<Document> m_originDocument;
ResourceRequest m_resourceRequest;
@@ -129,6 +148,7 @@ private:
RefPtrWillBeMember<FormState> m_formState;
ShouldSendReferrer m_shouldSendReferrer;
ContentSecurityPolicyDisposition m_shouldCheckMainWorldContentSecurityPolicy;
+ SandboxFlags m_sandboxFlags;
};
}

Powered by Google App Engine
This is Rietveld 408576698