diff options
| author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-14 18:05:39 +0000 |
|---|---|---|
| committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-14 18:05:39 +0000 |
| commit | 2ef706e47ff06fb0509f660475e12392f6b40a72 (patch) | |
| tree | 79af67b204457912f3735619d8a2c52b6edf903e /ppapi/proxy/ppp_instance_private_proxy.cc | |
| parent | bd9ea1bc4abd3dea19674737d963d6a50272ad45 (diff) | |
| download | chromium_src-2ef706e47ff06fb0509f660475e12392f6b40a72.zip chromium_src-2ef706e47ff06fb0509f660475e12392f6b40a72.tar.gz chromium_src-2ef706e47ff06fb0509f660475e12392f6b40a72.tar.bz2 | |
PPAPI: Add unlocking for PPP calls and callbacks. Add more locking.
With this patch, ppapi_tests pass locally when building with enable_pepper_threading=1. (They didn't before).
TODO: Test more calls off the main thread, make sync completion callbacks work.
BUG=92909
TEST=
Review URL: http://codereview.chromium.org/9391006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121901 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/ppp_instance_private_proxy.cc')
| -rw-r--r-- | ppapi/proxy/ppp_instance_private_proxy.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ppapi/proxy/ppp_instance_private_proxy.cc b/ppapi/proxy/ppp_instance_private_proxy.cc index 75e9d60..678d30b 100644 --- a/ppapi/proxy/ppp_instance_private_proxy.cc +++ b/ppapi/proxy/ppp_instance_private_proxy.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -12,6 +12,7 @@ #include "ppapi/proxy/plugin_dispatcher.h" #include "ppapi/proxy/plugin_resource_tracker.h" #include "ppapi/proxy/ppapi_messages.h" +#include "ppapi/shared_impl/proxy_lock.h" namespace ppapi { namespace proxy { @@ -74,7 +75,8 @@ void PPP_Instance_Private_Proxy::OnMsgGetInstanceObject( PP_Instance instance, SerializedVarReturnValue result) { result.Return(dispatcher(), - ppp_instance_private_impl_->GetInstanceObject(instance)); + CallWhileUnlocked(ppp_instance_private_impl_->GetInstanceObject, + instance)); } } // namespace proxy |