diff options
| author | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-23 21:01:48 +0000 |
|---|---|---|
| committer | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-23 21:01:48 +0000 |
| commit | 51b82ecaf371f30f7d9d306ad724743de1571363 (patch) | |
| tree | 24355c56d985539fb66cf2071554193d35c84ad7 /mojo/examples/pepper_container_app | |
| parent | cfd337941bd28003776d8283ad64c7c073777181 (diff) | |
| download | chromium_src-51b82ecaf371f30f7d9d306ad724743de1571363.zip chromium_src-51b82ecaf371f30f7d9d306ad724743de1571363.tar.gz chromium_src-51b82ecaf371f30f7d9d306ad724743de1571363.tar.bz2 | |
Revert 272472 "Mojo: nuke EnvironmentData"
Caused layout tests (when run with check-sys-deps) to hang on Windows
with a stuck content_shell process. See Issue 376929.
BUG=376929
> Mojo: nuke EnvironmentData
>
> With this change, Mojo applications that link against mojo_environment_chromium
> do not need to instantiate mojo::Environment. We rely on AtExitManager for all
> finalization of singleton objects. This frees us up to use the familiar
> base::Singleton and base::LazyInstance for any such state. Tests can use
> ShadowingAtExitManager to clean the environment between test runs.
>
> It becomes a link error to use mojo::Environment if you are not linking against
> mojo_environment_standalone. I plan to follow this up with a change that buries
> mojo::Environment for the case where you are linking against
> mojo_environment_standalone. Ideally, this means no one will ever need to think
> about mojo::Environment again.
>
> Review URL: https://codereview.chromium.org/281353005
TBR=darin@chromium.org
Review URL: https://codereview.chromium.org/299263002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272589 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/examples/pepper_container_app')
| -rw-r--r-- | mojo/examples/pepper_container_app/pepper_container_app.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mojo/examples/pepper_container_app/pepper_container_app.cc b/mojo/examples/pepper_container_app/pepper_container_app.cc index 8fccce6..d2aab41 100644 --- a/mojo/examples/pepper_container_app/pepper_container_app.cc +++ b/mojo/examples/pepper_container_app/pepper_container_app.cc @@ -12,6 +12,7 @@ #include "mojo/examples/pepper_container_app/plugin_module.h" #include "mojo/examples/pepper_container_app/type_converters.h" #include "mojo/public/cpp/bindings/allocation_scope.h" +#include "mojo/public/cpp/environment/environment.h" #include "mojo/public/cpp/gles2/gles2.h" #include "mojo/public/cpp/shell/application.h" #include "mojo/public/cpp/system/core.h" @@ -120,6 +121,7 @@ class PepperContainerApp: public Application, extern "C" PEPPER_CONTAINER_APP_EXPORT MojoResult CDECL MojoMain( MojoHandle shell_handle) { + mojo::Environment env; mojo::GLES2Initializer gles2; base::MessageLoop run_loop; mojo::examples::PepperContainerApp app(shell_handle); |