diff options
| author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-12 19:08:54 +0000 |
|---|---|---|
| committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-12 19:08:54 +0000 |
| commit | c869c0e8289c0f660108137807edd470b0228a92 (patch) | |
| tree | bfa249ab0a54b19fa2758f35bebaf02d22f78dc5 /content/renderer/pepper/v8_var_converter_unittest.cc | |
| parent | 0d0b4caed59bae8912eb8df340d571caef34f056 (diff) | |
| download | chromium_src-c869c0e8289c0f660108137807edd470b0228a92.zip chromium_src-c869c0e8289c0f660108137807edd470b0228a92.tar.gz chromium_src-c869c0e8289c0f660108137807edd470b0228a92.tar.bz2 | |
PPAPI: Purposely leak ProxyLock, fix shutdown race
This CL:
- Makes callbacks returned by RunWhileLocked acquire the lock when they are destroyed if they are not run. This eliminates some potential race conditions.
- Because MessageLoops can be destroyed after the PpapiGlobals (and thus the ProxyLock), this means we need to make the ProxyLock live longer. So we leak it so that it lives all the way through shutdown.
This issue depends on: https://codereview.chromium.org/19492014/
BUG=
R=yzshen@chromium.org
Review URL: https://codereview.chromium.org/19492014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222829 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/pepper/v8_var_converter_unittest.cc')
| -rw-r--r-- | content/renderer/pepper/v8_var_converter_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/renderer/pepper/v8_var_converter_unittest.cc b/content/renderer/pepper/v8_var_converter_unittest.cc index 095d70c..e39f9df 100644 --- a/content/renderer/pepper/v8_var_converter_unittest.cc +++ b/content/renderer/pepper/v8_var_converter_unittest.cc @@ -159,7 +159,7 @@ class V8VarConverterTest : public testing::Test { // testing::Test implementation. virtual void SetUp() { - ProxyLock::Acquire(); + ppapi::ProxyLock::DisableLockingOnThreadForTest(); v8::HandleScope handle_scope(isolate_); v8::Handle<v8::ObjectTemplate> global = v8::ObjectTemplate::New(); context_.Reset(isolate_, v8::Context::New(isolate_, NULL, global)); |