diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2018-01-09 16:41:30 +0100 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2018-01-11 08:23:51 +0000 |
| commit | 0309aa1e9a8d6fa016fed19963f75cbe328d6a4f (patch) | |
| tree | c70febc5e35ff517c82a0c8b06b5208ab9e1fde0 | |
| parent | 6402c18d26333b4cec5ee13a3536c7a997f48998 (diff) | |
| download | qtwebengine-chromium-0309aa1e9a8d6fa016fed19963f75cbe328d6a4f.tar.gz | |
FIXUP: Fix assert on chrome://gpu
Guard the usage of an unimplemented getter function.
Change-Id: I90ad502ada44a10be131c8f63424d0f71e00efbb
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| -rw-r--r-- | chromium/content/browser/gpu/gpu_internals_ui.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chromium/content/browser/gpu/gpu_internals_ui.cc b/chromium/content/browser/gpu/gpu_internals_ui.cc index 155513dfb9e..0900a897d5b 100644 --- a/chromium/content/browser/gpu/gpu_internals_ui.cc +++ b/chromium/content/browser/gpu/gpu_internals_ui.cc @@ -559,7 +559,10 @@ void GpuMessageHandler::OnGpuInfoUpdate() { gpu_info_val->Set("featureStatus", std::move(feature_status)); gpu_info_val->Set("compositorInfo", CompositorInfo()); gpu_info_val->Set("gpuMemoryBufferInfo", GpuMemoryBufferInfo()); +#if !defined(TOOLKIT_QT) + // DesktopScreenQt::GetAllDisplays() has to be implemented for this gpu_info_val->Set("displayInfo", getDisplayInfo()); +#endif // Send GPU Info to javascript. web_ui()->CallJavascriptFunctionUnsafe("browserBridge.onGpuInfoUpdate", |