diff options
| author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-15 01:44:47 +0000 |
|---|---|---|
| committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-15 01:44:47 +0000 |
| commit | 4c41d3fd4bf9cfef6108f5f700d503820bcddba4 (patch) | |
| tree | efc3cf9fdac963f1aa6449cea762408904a9f936 /ppapi/proxy/ppp_graphics_3d_proxy.cc | |
| parent | 0f9386895aa7a61246eaa95246cbc0f05d320eee (diff) | |
| download | chromium_src-4c41d3fd4bf9cfef6108f5f700d503820bcddba4.zip chromium_src-4c41d3fd4bf9cfef6108f5f700d503820bcddba4.tar.gz chromium_src-4c41d3fd4bf9cfef6108f5f700d503820bcddba4.tar.bz2 | |
reland 121901, PPAPI: Add unlocking for PPP calls and callbacks...
"""
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=
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=121901
"""
TBR=dmichael@chromium.org
Review URL: http://codereview.chromium.org/9361065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122001 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/ppp_graphics_3d_proxy.cc')
| -rw-r--r-- | ppapi/proxy/ppp_graphics_3d_proxy.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ppapi/proxy/ppp_graphics_3d_proxy.cc b/ppapi/proxy/ppp_graphics_3d_proxy.cc index d83aa80..8143f31 100644 --- a/ppapi/proxy/ppp_graphics_3d_proxy.cc +++ b/ppapi/proxy/ppp_graphics_3d_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. @@ -8,6 +8,7 @@ #include "ppapi/proxy/host_dispatcher.h" #include "ppapi/proxy/plugin_dispatcher.h" #include "ppapi/proxy/ppapi_messages.h" +#include "ppapi/shared_impl/proxy_lock.h" namespace ppapi { namespace proxy { @@ -65,7 +66,7 @@ bool PPP_Graphics3D_Proxy::OnMessageReceived(const IPC::Message& msg) { void PPP_Graphics3D_Proxy::OnMsgContextLost(PP_Instance instance) { if (ppp_graphics_3d_impl_) - ppp_graphics_3d_impl_->Graphics3DContextLost(instance); + CallWhileUnlocked(ppp_graphics_3d_impl_->Graphics3DContextLost, instance); } } // namespace proxy |