Add a unified resource tracker shared between the proxy and the impl.

webkit/plugins/ppapi/ppapi_plugin_instance.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/ppapi_plugin_instance.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
@@ skipping 436 matching lines @@
     if (!event_class)
       return false;
 
     if ((filtered_input_event_mask_ & event_class) ||
         (input_event_mask_ & event_class)) {
       // Actually send the event.
       std::vector< ::ppapi::InputEventData > events;
       CreateInputEventData(event, &events);
 
       // Each input event may generate more than one PP_InputEvent.
-      ResourceTracker* tracker = ResourceTracker::Get();
       for (size_t i = 0; i < events.size(); i++) {
         if (filtered_input_event_mask_ & event_class)
           events[i].is_filtered = true;
         else
           rv = true;  // Unfiltered events are assumed to be handled.
         scoped_refptr<PPB_InputEvent_Impl> event_resource(
             new PPB_InputEvent_Impl(this, events[i]));
-        PP_Resource resource = event_resource->GetReference();
+        Resource::ScopedResourceId resource_id(event_resource.get());
 
         rv |= PP_ToBool(plugin_input_event_interface_->HandleInputEvent(
-            pp_instance(), event_resource->GetReference()));
-
-        // Release the reference we took above.
-        tracker->UnrefResource(resource);
+            pp_instance(), resource_id.id));
       }
     }
   }
 
   if (cursor_.get())
     *cursor_info = *cursor_;
   return rv;
 }
 
 void PluginInstance::HandlePolicyUpdate(const std::string& policy_json) {
@@ skipping 1064 matching lines @@
 }
 
 void PluginInstance::DoSetCursor(WebCursorInfo* cursor) {
   cursor_.reset(cursor);
   if (fullscreen_container_)
     fullscreen_container_->DidChangeCursor(*cursor);
 }
 
 }  // namespace ppapi
 }  // namespace webkit