Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(251)

Unified Diff: trunk/src/content/gpu/gpu_child_thread.cc

Issue 149953003: Revert 247793 "Ensure GL initialization only happens once, and p..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/content/common/gpu/client/gl_helper_unittest.cc ('k') | trunk/src/content/gpu/gpu_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
}
« no previous file with comments | « trunk/src/content/common/gpu/client/gl_helper_unittest.cc ('k') | trunk/src/content/gpu/gpu_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698