diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-29 10:46:47 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-02 12:02:10 +0000 |
| commit | 99677208ff3b216fdfec551fbe548da5520cd6fb (patch) | |
| tree | 476a4865c10320249360e859d8fdd3e01833b03a /chromium/content/browser/gpu/gpu_internals_ui.cc | |
| parent | c30a6232df03e1efbd9f3b226777b07e087a1122 (diff) | |
| download | qtwebengine-chromium-99677208ff3b216fdfec551fbe548da5520cd6fb.tar.gz | |
BASELINE: Update Chromium to 86.0.4240.124
Change-Id: Ide0ff151e94cd665ae6521a446995d34a9d1d644
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/content/browser/gpu/gpu_internals_ui.cc')
| -rw-r--r-- | chromium/content/browser/gpu/gpu_internals_ui.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chromium/content/browser/gpu/gpu_internals_ui.cc b/chromium/content/browser/gpu/gpu_internals_ui.cc index 3a61d1573d3..618abbcd773 100644 --- a/chromium/content/browser/gpu/gpu_internals_ui.cc +++ b/chromium/content/browser/gpu/gpu_internals_ui.cc @@ -76,6 +76,9 @@ WebUIDataSource* CreateGpuHTMLSource() { source->OverrideContentSecurityPolicy( network::mojom::CSPDirectiveName::ScriptSrc, "script-src chrome://resources 'self' 'unsafe-eval';"); + source->OverrideContentSecurityPolicy( + network::mojom::CSPDirectiveName::TrustedTypes, + "trusted-types jstemplate;"); source->UseStringsJs(); source->AddResourcePath("gpu_internals.js", IDR_GPU_INTERNALS_JS); @@ -379,7 +382,7 @@ std::unique_ptr<base::ListValue> GpuMemoryBufferInfo( gpu::GpuMemoryBufferConfigurationSet native_config; #if defined(USE_X11) - if (features::IsUsingOzonePlatform()) { + if (!features::IsUsingOzonePlatform()) { for (const auto& config : gpu_extra_info.gpu_memory_buffer_support_x11) { native_config.emplace(config); } @@ -821,7 +824,7 @@ void GpuMessageHandler::OnGpuInfoUpdate() { GpuDataManagerImpl::GetInstance()->GetGpuExtraInfo(); auto gpu_info_val = GpuInfoAsDictionaryValue(); - // Add in blacklisting features + // Add in blocklisting features auto feature_status = std::make_unique<base::DictionaryValue>(); feature_status->Set("featureStatus", GetFeatureStatus()); feature_status->Set("problems", GetProblems()); |