Index: ppapi/cpp/graphics_3d_client.cc |
diff --git a/ppapi/cpp/graphics_3d_client.cc b/ppapi/cpp/graphics_3d_client.cc |
index d827f9d95f1e01081a182e6ee57bdf4e2a35aae6..6702c057e0836a4e1dab34cd747d0df478e00fd7 100644 |
--- a/ppapi/cpp/graphics_3d_client.cc |
+++ b/ppapi/cpp/graphics_3d_client.cc |
@@ -6,6 +6,7 @@ |
#include "ppapi/c/ppp_graphics_3d.h" |
#include "ppapi/cpp/instance.h" |
+#include "ppapi/cpp/instance_handle.h" |
#include "ppapi/cpp/module.h" |
#include "ppapi/cpp/module_impl.h" |
@@ -17,7 +18,7 @@ const char kPPPGraphics3DInterface[] = PPP_GRAPHICS_3D_INTERFACE; |
void Graphics3D_ContextLost(PP_Instance instance) { |
void* object = |
- pp::Instance::GetPerInstanceObject(instance, kPPPGraphics3DInterface); |
+ Instance::GetPerInstanceObject(instance, kPPPGraphics3DInterface); |
if (!object) |
return; |
return static_cast<Graphics3DClient*>(object)->Graphics3DContextLost(); |
@@ -29,15 +30,16 @@ static PPP_Graphics3D graphics3d_interface = { |
} // namespace |
-Graphics3DClient::Graphics3DClient(Instance* instance) |
+Graphics3DClient::Graphics3DClient(const InstanceHandle& instance) |
: associated_instance_(instance) { |
- pp::Module::Get()->AddPluginInterface(kPPPGraphics3DInterface, |
- &graphics3d_interface); |
- associated_instance_->AddPerInstanceObject(kPPPGraphics3DInterface, this); |
+ Module::Get()->AddPluginInterface(kPPPGraphics3DInterface, |
+ &graphics3d_interface); |
+ Instance::AddPerInstanceObject(instance, kPPPGraphics3DInterface, this); |
} |
Graphics3DClient::~Graphics3DClient() { |
- associated_instance_->RemovePerInstanceObject(kPPPGraphics3DInterface, this); |
+ Instance::RemovePerInstanceObject(associated_instance_, |
+ kPPPGraphics3DInterface, this); |
} |
} // namespace pp |