| Index: ppapi/shared_impl/ppp_instance_combined.cc
|
| diff --git a/ppapi/shared_impl/ppp_instance_combined.cc b/ppapi/shared_impl/ppp_instance_combined.cc
|
| index d27c2a0c870c3668e9c95073b678dc414f79e0b9..e87c2a5cb9d9d62b6c30907c159fe8356d1fddef 100644
|
| --- a/ppapi/shared_impl/ppp_instance_combined.cc
|
| +++ b/ppapi/shared_impl/ppp_instance_combined.cc
|
| @@ -3,6 +3,7 @@
|
| // found in the LICENSE file.
|
|
|
| #include "ppapi/shared_impl/ppp_instance_combined.h"
|
| +#include "ppapi/shared_impl/proxy_lock.h"
|
|
|
| namespace ppapi {
|
|
|
| @@ -26,31 +27,36 @@ PP_Bool PPP_Instance_Combined::DidCreate(PP_Instance instance,
|
| uint32_t argc,
|
| const char* argn[],
|
| const char* argv[]) {
|
| - return instance_1_1_.DidCreate(instance, argc, argn, argv);
|
| + return CallWhileUnlocked(instance_1_1_.DidCreate, instance, argc, argn, argv);
|
| }
|
|
|
| void PPP_Instance_Combined::DidDestroy(PP_Instance instance) {
|
| - return instance_1_1_.DidDestroy(instance);
|
| + return CallWhileUnlocked(instance_1_1_.DidDestroy, instance);
|
| }
|
|
|
| void PPP_Instance_Combined::DidChangeView(PP_Instance instance,
|
| PP_Resource view_changed_resource,
|
| const struct PP_Rect* position,
|
| const struct PP_Rect* clip) {
|
| - if (instance_1_1_.DidChangeView)
|
| - instance_1_1_.DidChangeView(instance, view_changed_resource);
|
| - else
|
| - did_change_view_1_0_(instance, position, clip);
|
| + if (instance_1_1_.DidChangeView) {
|
| + CallWhileUnlocked(instance_1_1_.DidChangeView,
|
| + instance,
|
| + view_changed_resource);
|
| + } else {
|
| + CallWhileUnlocked(did_change_view_1_0_, instance, position, clip);
|
| + }
|
| }
|
|
|
| void PPP_Instance_Combined::DidChangeFocus(PP_Instance instance,
|
| PP_Bool has_focus) {
|
| - instance_1_1_.DidChangeFocus(instance, has_focus);
|
| + CallWhileUnlocked(instance_1_1_.DidChangeFocus, instance, has_focus);
|
| }
|
|
|
| PP_Bool PPP_Instance_Combined::HandleDocumentLoad(PP_Instance instance,
|
| PP_Resource url_loader) {
|
| - return instance_1_1_.HandleDocumentLoad(instance, url_loader);
|
| + return CallWhileUnlocked(instance_1_1_.HandleDocumentLoad,
|
| + instance,
|
| + url_loader);
|
| }
|
|
|
| } // namespace ppapi
|
|
|