Convert resources to take an instance key instead of an Instance*.

ppapi/cpp/dev/widget_client_dev.cc

Index: ppapi/cpp/dev/widget_client_dev.cc
diff --git a/ppapi/cpp/dev/widget_client_dev.cc b/ppapi/cpp/dev/widget_client_dev.cc
index 9f539833761bae73d5546632bfa0781e76940651..d313b60db27453aa17fee466ea0798edcb1a3ea2 100644
--- a/ppapi/cpp/dev/widget_client_dev.cc
+++ b/ppapi/cpp/dev/widget_client_dev.cc
@@ -9,6 +9,7 @@
 #include "ppapi/cpp/dev/scrollbar_dev.h"
 #include "ppapi/cpp/dev/widget_dev.h"
 #include "ppapi/cpp/instance.h"
+#include "ppapi/cpp/instance_handle.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/module_impl.h"
 #include "ppapi/cpp/rect.h"
@@ -24,8 +25,7 @@ const char kPPPWidgetInterface[] = PPP_WIDGET_DEV_INTERFACE;
 void Widget_Invalidate(PP_Instance instance,
                        PP_Resource widget_id,
                        const PP_Rect* dirty_rect) {
-  void* object =
-      pp::Instance::GetPerInstanceObject(instance, kPPPWidgetInterface);
+  void* object = Instance::GetPerInstanceObject(instance, kPPPWidgetInterface);
   if (!object)
     return;
   return static_cast<WidgetClient_Dev*>(object)->InvalidateWidget(
@@ -44,7 +44,7 @@ void Scrollbar_ValueChanged(PP_Instance instance,
                             PP_Resource scrollbar_id,
                             uint32_t value) {
   void* object =
-      pp::Instance::GetPerInstanceObject(instance, kPPPScrollbarInterface);
+      Instance::GetPerInstanceObject(instance, kPPPScrollbarInterface);
   if (!object)
     return;
   return static_cast<WidgetClient_Dev*>(object)->ScrollbarValueChanged(
@@ -55,7 +55,7 @@ void Scrollbar_OverlayChanged(PP_Instance instance,
                               PP_Resource scrollbar_id,
                               PP_Bool overlay) {
   void* object =
-      pp::Instance::GetPerInstanceObject(instance, kPPPScrollbarInterface);
+      Instance::GetPerInstanceObject(instance, kPPPScrollbarInterface);
   if (!object)
     return;
   return static_cast<WidgetClient_Dev*>(object)->ScrollbarOverlayChanged(
@@ -69,18 +69,20 @@ static PPP_Scrollbar_Dev scrollbar_interface = {
 
 }  // namespace
 
-WidgetClient_Dev::WidgetClient_Dev(Instance* instance)
+WidgetClient_Dev::WidgetClient_Dev(const InstanceHandle& instance)
     : associated_instance_(instance) {
-  pp::Module::Get()->AddPluginInterface(kPPPWidgetInterface, &widget_interface);
-  associated_instance_->AddPerInstanceObject(kPPPWidgetInterface, this);
-  pp::Module::Get()->AddPluginInterface(kPPPScrollbarInterface,
+  Module::Get()->AddPluginInterface(kPPPWidgetInterface, &widget_interface);
+  Instance::AddPerInstanceObject(instance, kPPPWidgetInterface, this);
+  Module::Get()->AddPluginInterface(kPPPScrollbarInterface,
                                         &scrollbar_interface);

[dmichael (off chromium), 2012/02/22 21:38:44]

nit: indentation

-  associated_instance_->AddPerInstanceObject(kPPPScrollbarInterface, this);
+  Instance::AddPerInstanceObject(instance, kPPPScrollbarInterface, this);
 }
 
 WidgetClient_Dev::~WidgetClient_Dev() {
-  associated_instance_->RemovePerInstanceObject(kPPPScrollbarInterface, this);
-  associated_instance_->RemovePerInstanceObject(kPPPWidgetInterface, this);
+  Instance::RemovePerInstanceObject(associated_instance_,
+                                    kPPPScrollbarInterface, this);
+  Instance::RemovePerInstanceObject(associated_instance_,
+                                    kPPPWidgetInterface, this);
 }
 
 }  // namespace pp