diff options
| author | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-30 02:06:08 +0000 |
|---|---|---|
| committer | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-30 02:06:08 +0000 |
| commit | 64437e622c11f77938e41b473bd77421ec2482e1 (patch) | |
| tree | 09baeeb57cf7f5d40829051c1d75adb58c7e9393 /ui/views/examples/examples_main.cc | |
| parent | cb99348010b1e026f4ef4c0d242434731e497dca (diff) | |
| download | chromium_src-64437e622c11f77938e41b473bd77421ec2482e1.zip chromium_src-64437e622c11f77938e41b473bd77421ec2482e1.tar.gz chromium_src-64437e622c11f77938e41b473bd77421ec2482e1.tar.bz2 | |
Revert 247793 "Ensure GL initialization only happens once, and p..."
due to new static initializers in gl_bindings_autogen_gl.cc
> 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
>
> Review URL: https://codereview.chromium.org/135213003
TBR=danakj@chromium.org
Review URL: https://codereview.chromium.org/149953003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247811 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/examples/examples_main.cc')
| -rw-r--r-- | ui/views/examples/examples_main.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/ui/views/examples/examples_main.cc b/ui/views/examples/examples_main.cc index 53a206f..62a6405 100644 --- a/ui/views/examples/examples_main.cc +++ b/ui/views/examples/examples_main.cc @@ -14,7 +14,6 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/compositor/test/context_factories_for_test.h" #include "ui/gfx/screen.h" -#include "ui/gl/gl_surface.h" #include "ui/views/corewm/wm_state.h" #include "ui/views/examples/example_base.h" #include "ui/views/examples/examples_window.h" @@ -47,8 +46,6 @@ int main(int argc, char** argv) { ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file); - gfx::GLSurface::InitializeOneOff(); - // The ContextFactory must exist before any Compositors are created. bool allow_test_contexts = false; ui::InitializeContextFactoryForTests(allow_test_contexts); |