diff options
| author | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-27 18:55:34 +0000 |
|---|---|---|
| committer | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-27 18:55:34 +0000 |
| commit | e2f8f8ade4fed8722823bf6afb9077763ddb8309 (patch) | |
| tree | 195a97a5a6bccc727d2d692cf8f6082ca9efc42e /content/gpu | |
| parent | 021bd23df4e9193cf4d6efa1e1dbc8cd638af7da (diff) | |
| download | chromium_src-e2f8f8ade4fed8722823bf6afb9077763ddb8309.zip chromium_src-e2f8f8ade4fed8722823bf6afb9077763ddb8309.tar.gz chromium_src-e2f8f8ade4fed8722823bf6afb9077763ddb8309.tar.bz2 | |
Make sure if GPU process fails to launch, all observers waiting for full gpu info get a response.
BUG=174296
TEST=AutofillRiskFingerprintTest.GetFingerprint
Review URL: https://codereview.chromium.org/12335100
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184995 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/gpu')
| -rw-r--r-- | content/gpu/gpu_info_collector.cc | 1 | ||||
| -rw-r--r-- | content/gpu/gpu_main.cc | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/content/gpu/gpu_info_collector.cc b/content/gpu/gpu_info_collector.cc index 86fb0c5..756c23f 100644 --- a/content/gpu/gpu_info_collector.cc +++ b/content/gpu/gpu_info_collector.cc @@ -129,7 +129,6 @@ void MergeGPUInfoGL(content::GPUInfo* basic_gpu_info, basic_gpu_info->can_lose_context = context_gpu_info.can_lose_context; basic_gpu_info->sandboxed = context_gpu_info.sandboxed; - basic_gpu_info->gpu_accessible = context_gpu_info.gpu_accessible; basic_gpu_info->finalized = context_gpu_info.finalized; basic_gpu_info->initialization_time = context_gpu_info.initialization_time; } diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc index ffb90fe..37828f4 100644 --- a/content/gpu/gpu_main.cc +++ b/content/gpu/gpu_main.cc @@ -195,15 +195,12 @@ int GpuMain(const MainFunctionParams& parameters) { base::ThreadRestrictions::AssertIOAllowed(); if (access("/dev/nvidiactl", R_OK) != 0) { VLOG(1) << "NVIDIA device file /dev/nvidiactl access denied"; - gpu_info.gpu_accessible = false; dead_on_arrival = true; } } #endif // OS_CHROMEOS } else { VLOG(1) << "gfx::GLSurface::InitializeOneOff failed"; - gpu_info.gpu_accessible = false; - gpu_info.finalized = true; dead_on_arrival = true; } |