Revert 106142 - Add a new globals object for PPAPI tracking information.

webkit/plugins/ppapi/plugin_module.cc

 // 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 "webkit/plugins/ppapi/plugin_module.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 72 matching lines @@
 #include "ppapi/c/trusted/ppb_graphics_3d_trusted.h"
 #include "ppapi/c/trusted/ppb_image_data_trusted.h"
 #include "ppapi/c/trusted/ppb_url_loader_trusted.h"
 #include "ppapi/shared_impl/input_event_impl.h"
 #include "ppapi/shared_impl/time_conversion.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/thunk.h"
 #include "webkit/plugins/plugin_switches.h"
 #include "webkit/plugins/ppapi/callbacks.h"
 #include "webkit/plugins/ppapi/common.h"
-#include "webkit/plugins/ppapi/host_globals.h"
 #include "webkit/plugins/ppapi/ppapi_interface_factory.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/ppb_directory_reader_impl.h"
 #include "webkit/plugins/ppapi/ppb_flash_clipboard_impl.h"
 #include "webkit/plugins/ppapi/ppb_flash_file_impl.h"
 #include "webkit/plugins/ppapi/ppb_flash_impl.h"
 #include "webkit/plugins/ppapi/ppb_flash_menu_impl.h"
 #include "webkit/plugins/ppapi/ppb_flash_net_connector_impl.h"
 #include "webkit/plugins/ppapi/ppb_font_impl.h"
 #include "webkit/plugins/ppapi/ppb_gpu_blacklist_private_impl.h"
 #include "webkit/plugins/ppapi/ppb_graphics_2d_impl.h"
 #include "webkit/plugins/ppapi/ppb_image_data_impl.h"
 #include "webkit/plugins/ppapi/ppb_layer_compositor_impl.h"
 #include "webkit/plugins/ppapi/ppb_opengles_impl.h"
 #include "webkit/plugins/ppapi/ppb_proxy_impl.h"
 #include "webkit/plugins/ppapi/ppb_scrollbar_impl.h"
 #include "webkit/plugins/ppapi/ppb_uma_private_impl.h"
 #include "webkit/plugins/ppapi/ppb_var_impl.h"
 #include "webkit/plugins/ppapi/ppb_video_capture_impl.h"
 #include "webkit/plugins/ppapi/ppb_video_decoder_impl.h"
 #include "webkit/plugins/ppapi/ppb_video_layer_impl.h"
 #include "webkit/plugins/ppapi/resource_tracker.h"
 #include "webkit/plugins/ppapi/webkit_forwarding_impl.h"
 
-using ppapi::PpapiGlobals;
 using ppapi::TimeTicksToPPTimeTicks;
 using ppapi::TimeToPPTime;
 using ppapi::thunk::EnterResource;
 using ppapi::thunk::PPB_Graphics2D_API;
 
 namespace webkit {
 namespace ppapi {
 
 namespace {
 
-// Global tracking info for PPAPI plugins. This is lazily created before the
-// first plugin is allocated, and leaked on shutdown.
-//
-// Note that we don't want a Singleton here since destroying this object will
-// try to free some stuff that requires WebKit, and Singletons are destroyed
-// after WebKit.
-webkit::ppapi::HostGlobals* host_globals = NULL;
-
 // Maintains all currently loaded plugin libs for validating PP_Module
 // identifiers.
 typedef std::set<PluginModule*> PluginModuleSet;
 
 PluginModuleSet* GetLivePluginSet() {
   static PluginModuleSet live_plugin_libs;
   return &live_plugin_libs;
 }
 
 base::MessageLoopProxy* GetMainThreadMessageLoop() {
   static scoped_refptr<base::MessageLoopProxy> proxy(
       base::MessageLoopProxy::current());
   return proxy.get();
 }
 
 // PPB_Core --------------------------------------------------------------------
 
 void AddRefResource(PP_Resource resource) {
-  PpapiGlobals::Get()->GetResourceTracker()->AddRefResource(resource);
+  ResourceTracker::Get()->AddRefResource(resource);
 }
 
 void ReleaseResource(PP_Resource resource) {
-  PpapiGlobals::Get()->GetResourceTracker()->ReleaseResource(resource);
+  ResourceTracker::Get()->ReleaseResource(resource);
 }
 
 PP_Time GetTime() {
   return TimeToPPTime(base::Time::Now());
 }
 
 PP_TimeTicks GetTickTime() {
   return TimeTicksToPPTimeTicks(base::TimeTicks::Now());
 }
 
@@ skipping 38 matching lines @@
   MessageLoop::current()->SetNestableTasksAllowed(true);
   MessageLoop::current()->Run();
   MessageLoop::current()->SetNestableTasksAllowed(old_state);
 }
 
 void QuitMessageLoop(PP_Instance instance) {
   MessageLoop::current()->QuitNow();
 }
 
 uint32_t GetLiveObjectsForInstance(PP_Instance instance_id) {
-  return HostGlobals::Get()->host_resource_tracker()->GetLiveObjectsForInstance(
-      instance_id);
+  return ResourceTracker::Get()->GetLiveObjectsForInstance(instance_id);
 }
 
 PP_Bool IsOutOfProcess() {
   return PP_FALSE;
 }
 
 const PPB_Testing_Dev testing_interface = {
   &ReadImageData,
   &RunMessageLoop,
   &QuitMessageLoop,
@@ skipping 145 matching lines @@
                            PluginDelegate::ModuleLifetime* lifetime_delegate)
     : lifetime_delegate_(lifetime_delegate),
       callback_tracker_(new CallbackTracker),
       is_in_destructor_(false),
       is_crashed_(false),
       broker_(NULL),
       library_(NULL),
       name_(name),
       path_(path),
       reserve_instance_id_(NULL) {
-  // Ensure the globals object is created.
-  if (!host_globals)
-    host_globals = new HostGlobals;
-
   memset(&entry_points_, 0, sizeof(entry_points_));
-  pp_module_ = HostGlobals::Get()->host_resource_tracker()->AddModule(this);
+  pp_module_ = ResourceTracker::Get()->AddModule(this);
   GetMainThreadMessageLoop();  // Initialize the main thread message loop.
   GetLivePluginSet()->insert(this);
 }
 
 PluginModule::~PluginModule() {
   // In the past there have been crashes reentering the plugin module
   // destructor. Catch if that happens again earlier.
   CHECK(!is_in_destructor_);
   is_in_destructor_ = true;
 
   // When the module is being deleted, there should be no more instances still
   // holding a reference to us.
   DCHECK(instances_.empty());
 
   GetLivePluginSet()->erase(this);
 
   callback_tracker_->AbortAll();
 
   if (entry_points_.shutdown_module)
     entry_points_.shutdown_module();
 
   if (library_)
     base::UnloadNativeLibrary(library_);
 
   // Notifications that we've been deleted should be last.
-  HostGlobals::Get()->host_resource_tracker()->ModuleDeleted(pp_module_);
+  ResourceTracker::Get()->ModuleDeleted(pp_module_);
   if (!is_crashed_) {
     // When the plugin crashes, we immediately tell the lifetime delegate that
     // we're gone, so we don't want to tell it again.
     lifetime_delegate_->PluginModuleDead(this);
   }
 
   // Don't add stuff here, the two notifications that the module object has
   // been deleted should be last. This allows, for example,
   // PPB_Proxy.IsInModuleDestructor to map PP_Module to this class during the
   // previous parts of the destructor.
@@ skipping 130 matching lines @@
   int retval = entry_points.initialize_module(pp_module(), &GetInterface);
   if (retval != 0) {
     LOG(WARNING) << "PPP_InitializeModule returned failure " << retval;
     return false;
   }
   return true;
 }
 
 }  // namespace ppapi
 }  // namespace webkit