| Index: trunk/src/content/gpu/gpu_child_thread.cc
|
| ===================================================================
|
| --- trunk/src/content/gpu/gpu_child_thread.cc (revision 247809)
|
| +++ trunk/src/content/gpu/gpu_child_thread.cc (working copy)
|
| @@ -65,14 +65,11 @@
|
| 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();
|
| }
|
|
|
|
|