content/browser/browser_main_loop.cc - Issue 135213003: Ensure GL initialization only happens once, and provide common init path

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/browser_main_loop.cc

Issue 135213003: Ensure GL initialization only happens once, and provide common init path (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: initgl: compile3 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 | « chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc ('k') | content/browser/compositor/software_browser_compositor_output_surface_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/browser_main_loop.cc

diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc

index cc8e6c562f89a52d22fbb499dbd434715fa6fc41..a4c3b722cc7074dda0cd17e730bb626c720213f6 100644

--- a/content/browser/browser_main_loop.cc

+++ b/content/browser/browser_main_loop.cc

@@ -70,6 +70,7 @@

#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)

@@ -947,6 +948,13 @@ int BrowserMainLoop::BrowserThreadsStarted() {

#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();