summaryrefslogtreecommitdiffstats
path: root/content/gpu/gpu_child_thread.cc
diff options
context:
space:
mode:
Diffstat (limited to 'content/gpu/gpu_child_thread.cc')
-rw-r--r--content/gpu/gpu_child_thread.cc9
1 files changed, 3 insertions, 6 deletions
diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc
index 63f850f..170b364 100644
--- a/content/gpu/gpu_child_thread.cc
+++ b/content/gpu/gpu_child_thread.cc
@@ -65,14 +65,11 @@ GpuChildThread::GpuChildThread(const std::string& channel_id)
DCHECK(
CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess) ||
CommandLine::ForCurrentProcess()->HasSwitch(switches::kInProcessGPU));
-#if !defined(OS_ANDROID)
// For single process and in-process GPU mode, we need to load and
// initialize the GL implementation and locate the GL entry points here.
- // On Android, GLSurface::InitializeOneOff() is called from BrowserMainLoop
- // before getting here. crbug.com/326295
- if (!gfx::GLSurface::InitializeOneOff())
- VLOG(1) << "gfx::GLSurface::InitializeOneOff failed";
-#endif
+ if (!gfx::GLSurface::InitializeOneOff()) {
+ VLOG(1) << "gfx::GLSurface::InitializeOneOff()";
+ }
g_thread_safe_sender.Get() = thread_safe_sender();
}