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

Unified Diff: trunk/src/content/browser/browser_main_loop.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
Index: trunk/src/content/browser/browser_main_loop.cc
===================================================================
--- trunk/src/content/browser/browser_main_loop.cc (revision 247809)
+++ trunk/src/content/browser/browser_main_loop.cc (working copy)
@@ -70,7 +70,6 @@
#include "base/android/jni_android.h"
#include "content/browser/android/browser_startup_controller.h"
#include "content/browser/android/surface_texture_peer_browser_impl.h"
-#include "ui/gl/gl_surface.h"
#endif
#if defined(OS_MACOSX) && !defined(OS_IOS)
@@ -948,13 +947,6 @@
#if !defined(OS_IOS)
HistogramSynchronizer::GetInstance();
-#if defined(OS_ANDROID)
- // On Android, GLSurface::InitializeOneOff() must be called before initalizing
- // the GpuDataManagerImpl as it uses the GL bindings. crbug.com/326295
- if (!gfx::GLSurface::InitializeOneOff())
- LOG(FATAL) << "GLSurface::InitializeOneOff failed";
-#endif
-
// Initialize the GpuDataManager before we set up the MessageLoops because
// otherwise we'll trigger the assertion about doing IO on the UI thread.
GpuDataManagerImpl::GetInstance()->Initialize();

Powered by Google App Engine
This is Rietveld 408576698