diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-27 20:23:19 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-27 20:23:19 +0000 |
| commit | 09af0f7661d6a5971804c9a8ec47bbd038a5de78 (patch) | |
| tree | f2c56e46b629df59a3a1781ac54a7d43d170ea31 /ppapi/cpp/dev/widget_client_dev.cc | |
| parent | 7e26ac973ede2fd0576d40086a437a3177668ea1 (diff) | |
| download | chromium_src-09af0f7661d6a5971804c9a8ec47bbd038a5de78.zip chromium_src-09af0f7661d6a5971804c9a8ec47bbd038a5de78.tar.gz chromium_src-09af0f7661d6a5971804c9a8ec47bbd038a5de78.tar.bz2 | |
Convert resources to take an instance key instead of an Instance*.
Review URL: https://chromiumcodereview.appspot.com/9381010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123795 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/cpp/dev/widget_client_dev.cc')
| -rw-r--r-- | ppapi/cpp/dev/widget_client_dev.cc | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/ppapi/cpp/dev/widget_client_dev.cc b/ppapi/cpp/dev/widget_client_dev.cc index 9f53983..f170e15 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, - &scrollbar_interface); - associated_instance_->AddPerInstanceObject(kPPPScrollbarInterface, this); + Module::Get()->AddPluginInterface(kPPPWidgetInterface, &widget_interface); + Instance::AddPerInstanceObject(instance, kPPPWidgetInterface, this); + Module::Get()->AddPluginInterface(kPPPScrollbarInterface, + &scrollbar_interface); + 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 |