Commit dc5fca30 authored by arthursonzogni's avatar arthursonzogni Committed by Commit Bot

Remove instrumentation for bug 1037776

The bug has been fixed, the instrumentation is no longer useful.

R=clamy@chromium.org,mkwst@chromium.org

Bug: 1037776
Change-Id: I3f36b1de3f9b02ffb3f10d4943ebe18950325c16
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2108735
Auto-Submit: Arthur Sonzogni <arthursonzogni@chromium.org>
Commit-Queue: Mike West <mkwst@chromium.org>
Reviewed-by: default avatarMike West <mkwst@chromium.org>
Cr-Commit-Position: refs/heads/master@{#751940}
parent 675766f5
...@@ -174,22 +174,8 @@ void LocalWindowProxy::Initialize() { ...@@ -174,22 +174,8 @@ void LocalWindowProxy::Initialize() {
(world_->IsIsolatedWorld() && (world_->IsIsolatedWorld() &&
IsolatedWorldCSP::Get().HasContentSecurityPolicy(world_->GetWorldId())); IsolatedWorldCSP::Get().HasContentSecurityPolicy(world_->GetWorldId()));
if (evaluate_csp_for_eval) { if (evaluate_csp_for_eval) {
// Check that there is a document that can be used to get the
// ContentSecurityPolicy;
// TODO(clamy): Remove this DumpWithoutCrashing once
// https://crbug.com/1037776 is fixed.
if (!GetFrame()->GetDocument())
base::debug::DumpWithoutCrashing();
ContentSecurityPolicy* csp = ContentSecurityPolicy* csp =
GetFrame()->GetDocument()->GetContentSecurityPolicyForWorld(); GetFrame()->GetDocument()->GetContentSecurityPolicyForWorld();
// Check that the ContentSecurityPolicy returned is not null.
// TODO(clamy): Remove this DumpWithoutCrashing once
// https://crbug.com/1037776 is fixed.
if (!csp)
base::debug::DumpWithoutCrashing();
context->AllowCodeGenerationFromStrings(!csp->ShouldCheckEval()); context->AllowCodeGenerationFromStrings(!csp->ShouldCheckEval());
context->SetErrorMessageForCodeGenerationFromStrings( context->SetErrorMessageForCodeGenerationFromStrings(
V8String(GetIsolate(), csp->EvalDisabledErrorMessage())); V8String(GetIsolate(), csp->EvalDisabledErrorMessage()));
......
...@@ -614,15 +614,8 @@ bool ContentSecurityPolicy::AllowWasmEval( ...@@ -614,15 +614,8 @@ bool ContentSecurityPolicy::AllowWasmEval(
String ContentSecurityPolicy::EvalDisabledErrorMessage() const { String ContentSecurityPolicy::EvalDisabledErrorMessage() const {
for (const auto& policy : policies_) { for (const auto& policy : policies_) {
// Check that the policy is non-null. if (policy->ShouldDisableEval())
// TODO(clamy): Remove this DumpWithoutCrashing once
// https://crbug.com/1037776 is fixed.
if (!policy)
base::debug::DumpWithoutCrashing();
if (policy->ShouldDisableEval()) {
return policy->EvalDisabledErrorMessage(); return policy->EvalDisabledErrorMessage();
}
} }
return String(); return String();
} }
......
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