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 /ui/aura/demo | |
| 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 'ui/aura/demo')
| -rw-r--r-- | ui/aura/demo/DEPS | 3 | ||||
| -rw-r--r-- | ui/aura/demo/demo_main.cc | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/ui/aura/demo/DEPS b/ui/aura/demo/DEPS deleted file mode 100644 index 07d8243..0000000 --- a/ui/aura/demo/DEPS +++ /dev/null @@ -1,3 +0,0 @@ -include_rules = [ - "+ui/gl/gl_surface.h", # To initialize GL bindings. -] diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc index 7739ed5..3dcd7db 100644 --- a/ui/aura/demo/demo_main.cc +++ b/ui/aura/demo/demo_main.cc @@ -21,7 +21,6 @@ #include "ui/events/event.h" #include "ui/gfx/canvas.h" #include "ui/gfx/rect.h" -#include "ui/gl/gl_surface.h" #if defined(USE_X11) #include "base/message_loop/message_pump_x11.h" @@ -109,8 +108,6 @@ int DemoMain() { // Create the message-loop here before creating the root window. base::MessageLoopForUI message_loop; - gfx::GLSurface::InitializeOneOff(); - // The ContextFactory must exist before any Compositors are created. bool allow_test_contexts = false; ui::InitializeContextFactoryForTests(allow_test_contexts); |