| Index: content/gpu/gpu_main.cc
|
| diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
|
| index be8b15403e0b3a01258fc97bbd1e045696857de7..66cfd9bcc88b10102d0acbc038b1ca62edf9a1eb 100644
|
| --- a/content/gpu/gpu_main.cc
|
| +++ b/content/gpu/gpu_main.cc
|
| @@ -48,7 +48,9 @@
|
|
|
| namespace {
|
| void WarmUpSandbox(const content::GPUInfo&, bool);
|
| +#if defined(OS_LINUX)
|
| void CollectGraphicsInfo(content::GPUInfo*);
|
| +#endif
|
| }
|
|
|
| // Main function for starting the Gpu process.
|
| @@ -226,6 +228,7 @@ int GpuMain(const content::MainFunctionParams& parameters) {
|
|
|
| namespace {
|
|
|
| +#if defined(OS_LINUX)
|
| void CreateDummyGlContext() {
|
| scoped_refptr<gfx::GLSurface> surface(
|
| gfx::GLSurface::CreateOffscreenGLSurface(false, gfx::Size(1, 1)));
|
| @@ -252,6 +255,7 @@ void CreateDummyGlContext() {
|
| VLOG(1) << "gfx::GLContext::MakeCurrent failed";
|
| }
|
| }
|
| +#endif
|
|
|
| void WarmUpSandbox(const content::GPUInfo& gpu_info,
|
| bool should_initialize_gl_context) {
|
| @@ -308,11 +312,13 @@ void WarmUpSandbox(const content::GPUInfo& gpu_info,
|
| #endif
|
| }
|
|
|
| +#if defined(OS_LINUX)
|
| void CollectGraphicsInfo(content::GPUInfo* gpu_info) {
|
| if (!gpu_info_collector::CollectGraphicsInfo(gpu_info))
|
| VLOG(1) << "gpu_info_collector::CollectGraphicsInfo failed";
|
| content::GetContentClient()->SetGpuInfo(*gpu_info);
|
| }
|
| +#endif
|
|
|
| } // namespace.
|
|
|
|
|