diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/v8/src/inspector/v8-runtime-agent-impl.cc | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/v8/src/inspector/v8-runtime-agent-impl.cc')
| -rw-r--r-- | chromium/v8/src/inspector/v8-runtime-agent-impl.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chromium/v8/src/inspector/v8-runtime-agent-impl.cc b/chromium/v8/src/inspector/v8-runtime-agent-impl.cc index 5a2a49154c1..ac505be5ccc 100644 --- a/chromium/v8/src/inspector/v8-runtime-agent-impl.cc +++ b/chromium/v8/src/inspector/v8-runtime-agent-impl.cc @@ -237,6 +237,7 @@ void V8RuntimeAgentImpl::evaluate( Maybe<bool> generatePreview, Maybe<bool> userGesture, Maybe<bool> maybeAwaitPromise, Maybe<bool> throwOnSideEffect, Maybe<double> timeout, Maybe<bool> disableBreaks, Maybe<bool> maybeReplMode, + Maybe<bool> allowUnsafeEvalBlockedByCSP, std::unique_ptr<EvaluateCallback> callback) { TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "EvaluateScript"); @@ -262,8 +263,10 @@ void V8RuntimeAgentImpl::evaluate( const bool replMode = maybeReplMode.fromMaybe(false); - // Temporarily enable allow evals for inspector. - scope.allowCodeGenerationFromStrings(); + if (allowUnsafeEvalBlockedByCSP.fromMaybe(true)) { + // Temporarily enable allow evals for inspector. + scope.allowCodeGenerationFromStrings(); + } v8::MaybeLocal<v8::Value> maybeResultValue; { V8InspectorImpl::EvaluateScope evaluateScope(scope); |