Commit 51be9373 authored by Nate Chapin's avatar Nate Chapin Committed by Commit Bot

Remove BindCSPImmediately(), it's no longer necessary

Change-Id: I770dded68d2ff6de14897b5a1666f5931fcfc450
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2224830
Commit-Queue: Daniel Cheng <dcheng@chromium.org>
Auto-Submit: Nate Chapin <japhet@chromium.org>
Reviewed-by: default avatarDaniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#773811}
parent 3253b67c
......@@ -75,8 +75,7 @@ SecurityContext::SecurityContext(const SecurityContextInit& init,
context_type_for_asserts_(context_type),
agent_(init.GetAgent()),
secure_context_mode_(init.GetSecureContextMode()),
origin_trial_context_(init.GetOriginTrialContext()),
bind_csp_immediately_(init.BindCSPImmediately()) {}
origin_trial_context_(init.GetOriginTrialContext()) {}
void SecurityContext::Trace(Visitor* visitor) const {
visitor->Trace(content_security_policy_);
......
......@@ -191,8 +191,6 @@ class CORE_EXPORT SecurityContext {
secure_context_mode_ = mode;
}
bool BindCSPImmediately() const { return bind_csp_immediately_; }
protected:
network::mojom::blink::WebSandboxFlags sandbox_flags_;
scoped_refptr<SecurityOrigin> security_origin_;
......@@ -212,7 +210,6 @@ class CORE_EXPORT SecurityContext {
Member<Agent> agent_;
SecureContextMode secure_context_mode_;
Member<OriginTrialContext> origin_trial_context_;
bool bind_csp_immediately_ = false;
DISALLOW_COPY_AND_ASSIGN(SecurityContext);
};
......
......@@ -175,7 +175,6 @@ void SecurityContextInit::InitializeContentSecurityPolicy(
// not specify a CSP to be used. Ideally they should be forced to explicitly
// choose one.
csp_ = MakeGarbageCollected<ContentSecurityPolicy>();
bind_csp_immediately_ = true;
}
void SecurityContextInit::InitializeSandboxFlags(
......
......@@ -79,8 +79,6 @@ class CORE_EXPORT SecurityContextInit : public FeaturePolicyParserDelegate {
void ApplyPendingDataToDocument(Document&) const;
bool BindCSPImmediately() const { return bind_csp_immediately_; }
private:
void InitializeContentSecurityPolicy(const DocumentInit&);
void InitializeOrigin(const DocumentInit&);
......@@ -109,7 +107,6 @@ class CORE_EXPORT SecurityContextInit : public FeaturePolicyParserDelegate {
Agent* agent_ = nullptr;
HashSet<mojom::blink::FeaturePolicyFeature> parsed_feature_policies_;
HashSet<mojom::WebFeature> feature_count_;
bool bind_csp_immediately_ = false;
base::Optional<SecureContextMode> secure_context_mode_;
};
......
......@@ -547,13 +547,6 @@ Document* LocalDOMWindow::InstallNewDocument(const DocumentInit& init) {
document_ = init.CreateDocument();
document_->Initialize();
// The CSP delegate doesn't have access to all of the state it needs until
// document_ is set.
if (GetSecurityContext().BindCSPImmediately()) {
GetSecurityContext().GetContentSecurityPolicy()->BindToDelegate(
GetContentSecurityPolicyDelegate());
}
if (!GetFrame())
return document_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment