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

ppapi/proxy/ppb_testing_proxy.cc

 // 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.
 
 #include "ppapi/proxy/ppb_testing_proxy.h"
 
 #include "base/message_loop.h"
 #include "ppapi/c/dev/ppb_testing_dev.h"
 #include "ppapi/proxy/enter_proxy.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
-#include "ppapi/shared_impl/proxy_lock.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/shared_impl/resource_tracker.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_input_event_api.h"
 
 using ppapi::thunk::EnterInstance;
-using ppapi::thunk::EnterResourceNoLock;
+using ppapi::thunk::EnterResource;
 using ppapi::thunk::PPB_InputEvent_API;
 
 namespace ppapi {
 namespace proxy {
 
 namespace {
 
 PP_Bool ReadImageData(PP_Resource graphics_2d,
                       PP_Resource image,
                       const PP_Point* top_left) {
-  ProxyAutoLock lock;
   Resource* image_object =
       PpapiGlobals::Get()->GetResourceTracker()->GetResource(image);
   if (!image_object)
     return PP_FALSE;
   Resource* graphics_2d_object =
       PpapiGlobals::Get()->GetResourceTracker()->GetResource(graphics_2d);
   if (!graphics_2d_object ||
       image_object->pp_instance() != graphics_2d_object->pp_instance())
     return PP_FALSE;
 
   PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(
       image_object->pp_instance());
   if (!dispatcher)
     return PP_FALSE;
 
   PP_Bool result = PP_FALSE;
   dispatcher->Send(new PpapiHostMsg_PPBTesting_ReadImageData(
       API_ID_PPB_TESTING, graphics_2d_object->host_resource(),
       image_object->host_resource(), *top_left, &result));
   return result;
 }
 
 void RunMessageLoop(PP_Instance instance) {
-  // TODO(dmichael): We should probably assert that this is the main thread.
   bool old_state = MessageLoop::current()->NestableTasksAllowed();
   MessageLoop::current()->SetNestableTasksAllowed(true);
   MessageLoop::current()->Run();
   MessageLoop::current()->SetNestableTasksAllowed(old_state);
 }
 
 void QuitMessageLoop(PP_Instance instance) {
-  // TODO(dmichael): We should probably assert that this is the main thread.
   MessageLoop::current()->QuitNow();
 }
 
 uint32_t GetLiveObjectsForInstance(PP_Instance instance_id) {
-  ProxyAutoLock lock;
   PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance_id);
   if (!dispatcher)
     return static_cast<uint32_t>(-1);
 
   uint32_t result = 0;
   dispatcher->Send(new PpapiHostMsg_PPBTesting_GetLiveObjectsForInstance(
       API_ID_PPB_TESTING, instance_id, &result));
   return result;
 }
 
 PP_Bool IsOutOfProcess() {
   return PP_TRUE;
 }
 
 void SimulateInputEvent(PP_Instance instance_id, PP_Resource input_event) {
-  ProxyAutoLock lock;
   PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance_id);
   if (!dispatcher)
     return;
-  EnterResourceNoLock<PPB_InputEvent_API> enter(input_event, false);
+  EnterResource<PPB_InputEvent_API> enter(input_event, false);
   if (enter.failed())
     return;
 
   const InputEventData& input_event_data = enter.object()->GetInputEventData();
   dispatcher->Send(new PpapiHostMsg_PPBTesting_SimulateInputEvent(
       API_ID_PPB_TESTING, instance_id, input_event_data));
 }
 
 PP_Var GetDocumentURL(PP_Instance instance, PP_URLComponents_Dev* components) {
   EnterInstance enter(instance);
   if (enter.failed())
     return PP_MakeUndefined();
   return enter.functions()->GetDocumentURL(instance, components);
 }
 
 // TODO(dmichael): Ideally we could get a way to check the number of vars in the
 // host-side tracker when running out-of-process, to make sure the proxy does
 // not leak host-side vars.
 uint32_t GetLiveVars(PP_Var live_vars[], uint32_t array_size) {
-  ProxyAutoLock lock;
   std::vector<PP_Var> vars =
       PpapiGlobals::Get()->GetVarTracker()->GetLiveVars();
   for (size_t i = 0u;
        i < std::min(static_cast<size_t>(array_size), vars.size());
        ++i)
     live_vars[i] = vars[i];
   return vars.size();
 }
 
 const PPB_Testing_Dev testing_interface = {
@@ skipping 77 matching lines @@
     PP_Instance instance,
     const InputEventData& input_event) {
   scoped_refptr<PPB_InputEvent_Shared> input_event_impl(
       new PPB_InputEvent_Shared(OBJECT_IS_PROXY, instance, input_event));
   ppb_testing_impl_->SimulateInputEvent(instance,
                                         input_event_impl->pp_resource());
 }
 
 }  // namespace proxy
 }  // namespace ppapi