diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-02 03:39:59 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-02 03:39:59 +0000 |
| commit | 26d8482f9f2554a9926c7e5da18fa623ae3ad62f (patch) | |
| tree | 98d5e10e3104470fb5d187126efa7338f7dbf258 /mojo/mojo_examples.gypi | |
| parent | 011dfbca43d7c8eb055cb86ab0bed143ffca813d (diff) | |
| download | chromium_src-26d8482f9f2554a9926c7e5da18fa623ae3ad62f.zip chromium_src-26d8482f9f2554a9926c7e5da18fa623ae3ad62f.tar.gz chromium_src-26d8482f9f2554a9926c7e5da18fa623ae3ad62f.tar.bz2 | |
Adds a way to associate key/value pairs with the environment
This is to fix a deadlock during shutdown. Specifically
WatcherThreadManager was a LazyInstance. This means it would be
shutdown by LazyInstance, which holds a lock. If the thread attempted
to grab the lazyinstance lock (which it does), then we deadlock.
Making the WatcherTheadManager owned by Environment makes for saner
lifetime management and easier shutdown in tests.
BUG=none
TEST=none
R=darin@chromium.org
Review URL: https://codereview.chromium.org/218583009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261045 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/mojo_examples.gypi')
| -rw-r--r-- | mojo/mojo_examples.gypi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mojo/mojo_examples.gypi b/mojo/mojo_examples.gypi index f83c4a9..fc70762 100644 --- a/mojo/mojo_examples.gypi +++ b/mojo/mojo_examples.gypi @@ -89,6 +89,7 @@ '../gpu/gpu.gyp:command_buffer_common', '../ppapi/ppapi.gyp:ppapi_c', '../ppapi/ppapi_internal.gyp:ppapi_example_gles2_spinning_cube', + 'mojo_common_lib', 'mojo_environment_chromium', 'mojo_gles2', 'mojo_native_viewport_bindings', |