diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-10 15:11:42 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-23 13:31:33 +0200 |
| commit | 03ee550bc147d9b02f55cd233c938b46b8598c7b (patch) | |
| tree | d19f41f136da9e8bc7adcf9f5a1ccdaae64ea396 /chromium/content/browser/gpu/gpu_internals_ui.cc | |
| parent | 1d63e8bf494af4a6c2f6c469802e8f4461914bbb (diff) | |
| download | qtwebengine-chromium-03ee550bc147d9b02f55cd233c938b46b8598c7b.tar.gz | |
Fix Chromium built with X11 running without
Handles cases where gfx::GetXDisplay() returns null at least for Qt.
Task-number: QTBUG-55384
Change-Id: Ie57c57d7189c279cb5c702325b450f9fb964ac60
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/content/browser/gpu/gpu_internals_ui.cc')
| -rw-r--r-- | chromium/content/browser/gpu/gpu_internals_ui.cc | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/chromium/content/browser/gpu/gpu_internals_ui.cc b/chromium/content/browser/gpu/gpu_internals_ui.cc index 210eb5fe2da..37e2a81ac26 100644 --- a/chromium/content/browser/gpu/gpu_internals_ui.cc +++ b/chromium/content/browser/gpu/gpu_internals_ui.cc @@ -227,9 +227,9 @@ std::unique_ptr<base::DictionaryValue> GpuInfoAsDictionaryValue() { basic_info->Append(NewDescriptionValuePair("Window system binding extensions", gpu_info.gl_ws_extensions)); #if defined(USE_X11) - basic_info->Append(NewDescriptionValuePair("Window manager", - ui::GuessWindowManagerName())); - { + if (gfx::GetXDisplay()) { + basic_info->Append(NewDescriptionValuePair("Window manager", + ui::GuessWindowManagerName())); std::unique_ptr<base::Environment> env(base::Environment::Create()); std::string value; const char kXDGCurrentDesktop[] = "XDG_CURRENT_DESKTOP"; @@ -266,10 +266,12 @@ std::unique_ptr<base::DictionaryValue> GpuInfoAsDictionaryValue() { #endif #if defined(USE_X11) - basic_info->Append(NewDescriptionValuePair( - "System visual ID", base::NumberToString(gpu_info.system_visual))); - basic_info->Append(NewDescriptionValuePair( - "RGBA visual ID", base::NumberToString(gpu_info.rgba_visual))); + if (gfx::GetXDisplay()) { + basic_info->Append(NewDescriptionValuePair( + "System visual ID", base::NumberToString(gpu_info.system_visual))); + basic_info->Append(NewDescriptionValuePair( + "RGBA visual ID", base::NumberToString(gpu_info.rgba_visual))); + } #endif info->Set("basic_info", std::move(basic_info)); |