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/browser_main_loop.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/browser_main_loop.cc')
| -rw-r--r-- | chromium/content/browser/browser_main_loop.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/content/browser/browser_main_loop.cc b/chromium/content/browser/browser_main_loop.cc index 60728faa5ad..4baaf2fcc57 100644 --- a/chromium/content/browser/browser_main_loop.cc +++ b/chromium/content/browser/browser_main_loop.cc @@ -423,7 +423,7 @@ class GpuDataManagerVisualProxy : public GpuDataManagerObserver { } void OnGpuInfoUpdate() override { - if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kHeadless)) + if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kHeadless) || !gfx::GetXDisplay()) return; gpu::GPUInfo gpu_info = gpu_data_manager_->GetGPUInfo(); if (!ui::XVisualManager::GetInstance()->OnGPUInfoChanged( @@ -550,7 +550,7 @@ int BrowserMainLoop::EarlyInitialization() { DCHECK(SandboxHostLinux::GetInstance()->IsInitialized()); #endif -#if defined(USE_X11) +#if defined(USE_X11) && !defined(TOOLKIT_QT) if (UsingInProcessGpu()) { if (!gfx::InitializeThreadedX11()) { LOG(ERROR) << "Failed to put Xlib into threaded mode."; @@ -1464,7 +1464,7 @@ bool BrowserMainLoop::InitializeToolkit() { #if defined(USE_AURA) -#if defined(USE_X11) +#if defined(USE_X11) && !defined(TOOLKIT_QT) if (!parsed_command_line_.HasSwitch(switches::kHeadless) && !gfx::GetXDisplay()) { LOG(ERROR) << "Unable to open X display."; |