diff options
| author | dpapad@chromium.org <dpapad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-14 18:22:49 +0000 |
|---|---|---|
| committer | dpapad@chromium.org <dpapad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-14 18:22:49 +0000 |
| commit | aa036eee91668fd6f60791fd44df9153a8869072 (patch) | |
| tree | 0bcd6c7c067f2834e4bbbb754352bdb5a7108bde /ppapi/proxy/ppp_mouse_lock_proxy.cc | |
| parent | 28fa793cc1c6f9945bb2dacce70a48cc72e100c7 (diff) | |
| download | chromium_src-aa036eee91668fd6f60791fd44df9153a8869072.zip chromium_src-aa036eee91668fd6f60791fd44df9153a8869072.tar.gz chromium_src-aa036eee91668fd6f60791fd44df9153a8869072.tar.bz2 | |
Revert 121901 - 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
TBR=dmichael@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9348092
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121903 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/ppp_mouse_lock_proxy.cc')
| -rw-r--r-- | ppapi/proxy/ppp_mouse_lock_proxy.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ppapi/proxy/ppp_mouse_lock_proxy.cc b/ppapi/proxy/ppp_mouse_lock_proxy.cc index 10aa47f..37ca35b 100644 --- a/ppapi/proxy/ppp_mouse_lock_proxy.cc +++ b/ppapi/proxy/ppp_mouse_lock_proxy.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -7,7 +7,6 @@ #include "ppapi/c/ppp_mouse_lock.h" #include "ppapi/proxy/host_dispatcher.h" #include "ppapi/proxy/ppapi_messages.h" -#include "ppapi/shared_impl/proxy_lock.h" namespace ppapi { namespace proxy { @@ -72,7 +71,7 @@ bool PPP_MouseLock_Proxy::OnMessageReceived(const IPC::Message& msg) { void PPP_MouseLock_Proxy::OnMsgMouseLockLost(PP_Instance instance) { if (ppp_mouse_lock_impl_) - CallWhileUnlocked(ppp_mouse_lock_impl_->MouseLockLost, instance); + ppp_mouse_lock_impl_->MouseLockLost(instance); } } // namespace proxy |