Revert 121901 - PPAPI: Add unlocking for PPP calls and callbacks. Add more locking.

ppapi/proxy/ppp_class_proxy.cc

-// 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.
 
 #include "ppapi/proxy/ppp_class_proxy.h"
 
 #include "ppapi/c/dev/ppb_var_deprecated.h"
 #include "ppapi/c/dev/ppp_class_deprecated.h"
 #include "ppapi/proxy/dispatcher.h"
 #include "ppapi/proxy/ppapi_messages.h"
-#include "ppapi/shared_impl/proxy_lock.h"
 #include "ppapi/proxy/serialized_var.h"
 #include "ppapi/shared_impl/api_id.h"
 
 namespace ppapi {
 namespace proxy {
 
 namespace {
 
 // PPP_Class in the browser implementation -------------------------------------
 
@@ skipping 215 matching lines @@
                         OnMsgDeallocate)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void PPP_Class_Proxy::OnMsgHasProperty(int64 ppp_class, int64 object,
                                        SerializedVarReceiveInput property,
                                        SerializedVarOutParam exception,
                                        bool* result) {
-  *result = CallWhileUnlocked(ToPPPClass(ppp_class)->HasProperty,
-                              ToUserData(object),
-                              property.Get(dispatcher()),
-                              exception.OutParam(dispatcher()));
+  *result = ToPPPClass(ppp_class)->HasProperty(ToUserData(object),
+      property.Get(dispatcher()), exception.OutParam(dispatcher()));
 }
 
 void PPP_Class_Proxy::OnMsgHasMethod(int64 ppp_class, int64 object,
                                      SerializedVarReceiveInput property,
                                      SerializedVarOutParam exception,
                                      bool* result) {
-  *result = CallWhileUnlocked(ToPPPClass(ppp_class)->HasMethod,
-                              ToUserData(object),
-                              property.Get(dispatcher()),
-                              exception.OutParam(dispatcher()));
+  *result = ToPPPClass(ppp_class)->HasMethod(ToUserData(object),
+      property.Get(dispatcher()), exception.OutParam(dispatcher()));
 }
 
 void PPP_Class_Proxy::OnMsgGetProperty(int64 ppp_class, int64 object,
                                        SerializedVarReceiveInput property,
                                        SerializedVarOutParam exception,
                                        SerializedVarReturnValue result) {
-  result.Return(dispatcher(), CallWhileUnlocked(
-      ToPPPClass(ppp_class)->GetProperty,
+  result.Return(dispatcher(), ToPPPClass(ppp_class)->GetProperty(
       ToUserData(object), property.Get(dispatcher()),
       exception.OutParam(dispatcher())));
 }
 
 void PPP_Class_Proxy::OnMsgEnumerateProperties(
     int64 ppp_class, int64 object,
     std::vector<SerializedVar>* props,
     SerializedVarOutParam exception) {
   NOTIMPLEMENTED();
   // TODO(brettw) implement this.
 }
 
 void PPP_Class_Proxy::OnMsgSetProperty(int64 ppp_class, int64 object,
                                        SerializedVarReceiveInput property,
                                        SerializedVarReceiveInput value,
                                        SerializedVarOutParam exception) {
-  CallWhileUnlocked(ToPPPClass(ppp_class)->SetProperty,
+  ToPPPClass(ppp_class)->SetProperty(
       ToUserData(object), property.Get(dispatcher()), value.Get(dispatcher()),
       exception.OutParam(dispatcher()));
 }
 
 void PPP_Class_Proxy::OnMsgRemoveProperty(int64 ppp_class, int64 object,
                                           SerializedVarReceiveInput property,
                                           SerializedVarOutParam exception) {
-  CallWhileUnlocked(ToPPPClass(ppp_class)->RemoveProperty,
+  ToPPPClass(ppp_class)->RemoveProperty(
       ToUserData(object), property.Get(dispatcher()),
       exception.OutParam(dispatcher()));
 }
 
 void PPP_Class_Proxy::OnMsgCall(
     int64 ppp_class, int64 object,
     SerializedVarReceiveInput method_name,
     SerializedVarVectorReceiveInput arg_vector,
     SerializedVarOutParam exception,
     SerializedVarReturnValue result) {
   uint32_t arg_count = 0;
   PP_Var* args = arg_vector.Get(dispatcher(), &arg_count);
-  result.Return(dispatcher(), CallWhileUnlocked(ToPPPClass(ppp_class)->Call,
+  result.Return(dispatcher(), ToPPPClass(ppp_class)->Call(
       ToUserData(object), method_name.Get(dispatcher()),
       arg_count, args, exception.OutParam(dispatcher())));
 }
 
 void PPP_Class_Proxy::OnMsgConstruct(
     int64 ppp_class, int64 object,
     SerializedVarVectorReceiveInput arg_vector,
     SerializedVarOutParam exception,
     SerializedVarReturnValue result) {
   uint32_t arg_count = 0;
   PP_Var* args = arg_vector.Get(dispatcher(), &arg_count);
-  result.Return(dispatcher(), CallWhileUnlocked(
-      ToPPPClass(ppp_class)->Construct,
+  result.Return(dispatcher(), ToPPPClass(ppp_class)->Construct(
       ToUserData(object), arg_count, args, exception.OutParam(dispatcher())));
 }
 
 void PPP_Class_Proxy::OnMsgDeallocate(int64 ppp_class, int64 object) {
-  CallWhileUnlocked(ToPPPClass(ppp_class)->Deallocate, ToUserData(object));
+  ToPPPClass(ppp_class)->Deallocate(ToUserData(object));
 }
 
 }  // namespace proxy
 }  // namespace ppapi