diff options
| author | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-31 00:49:49 +0000 |
|---|---|---|
| committer | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-31 00:49:49 +0000 |
| commit | f2e336a4de167f0618bb9e6c602037a52a10788c (patch) | |
| tree | f90c60527cc10a67227ddf900969a582d1e1def1 /content/browser/browser_main_loop.cc | |
| parent | adeda57080446a169b93bd361978de3dbbed0f40 (diff) | |
| download | chromium_src-f2e336a4de167f0618bb9e6c602037a52a10788c.zip chromium_src-f2e336a4de167f0618bb9e6c602037a52a10788c.tar.gz chromium_src-f2e336a4de167f0618bb9e6c602037a52a10788c.tar.bz2 | |
Revert 248049 "Ensure GL initialization only happens once, and p..."
Caused content_gl_tests to start failing on all Mac Release GPU bots.
See Issue 339658 for details.
> Ensure GL initialization only happens once, and provide common init path
>
> Currently tests initialize GL by calling into methods that should be
> internal to the gl bindings code. Instead, everyone should go through
> GLSurface::InitializeOneOff.
>
> Also GLSurface::InitializeOneOff early outs if it was already called,
> leading to a pattern of initializing GL all over the place just in case
> and not having a clear idea of where it should be set up. Instead, DCHECK
> that it is not called more than once, and move calls to this method to
> be during process startup for unit test suites instead of mid-test.
>
> This adds two test variants of InitializeOneOff for tests to call, that
> set up OSMesa or Mock GL bindings, via GLSurface::InitializeOneOff.
>
> R=piman, sievers
> BUG=270918
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=247793
>
> Review URL: https://codereview.chromium.org/135213003
TBR=danakj@chromium.org
BUG=270918,339658
Review URL: https://codereview.chromium.org/151003002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248093 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_main_loop.cc')
| -rw-r--r-- | content/browser/browser_main_loop.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc index a4c3b72..cc8e6c5 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc @@ -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 @@ 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(); |