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/video_capture_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/video_capture_client_dev.cc')
| -rw-r--r-- | ppapi/cpp/dev/video_capture_client_dev.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/ppapi/cpp/dev/video_capture_client_dev.cc b/ppapi/cpp/dev/video_capture_client_dev.cc index 1bebeec..22a6b9b 100644 --- a/ppapi/cpp/dev/video_capture_client_dev.cc +++ b/ppapi/cpp/dev/video_capture_client_dev.cc @@ -6,6 +6,7 @@ #include "ppapi/c/dev/ppp_video_capture_dev.h" #include "ppapi/cpp/instance.h" +#include "ppapi/cpp/instance_handle.h" #include "ppapi/cpp/module.h" namespace pp { @@ -64,15 +65,16 @@ PPP_VideoCapture_Dev ppp_video_capture = { } // namespace -VideoCaptureClient_Dev::VideoCaptureClient_Dev(Instance* instance) +VideoCaptureClient_Dev::VideoCaptureClient_Dev(const InstanceHandle& instance) : instance_(instance) { - pp::Module::Get()->AddPluginInterface(kPPPVideoCaptureInterface, - &ppp_video_capture); - instance_->AddPerInstanceObject(kPPPVideoCaptureInterface, this); + Module::Get()->AddPluginInterface(kPPPVideoCaptureInterface, + &ppp_video_capture); + Instance::AddPerInstanceObject(instance, kPPPVideoCaptureInterface, this); } VideoCaptureClient_Dev::~VideoCaptureClient_Dev() { - instance_->RemovePerInstanceObject(kPPPVideoCaptureInterface, this); + Instance::RemovePerInstanceObject(instance_, + kPPPVideoCaptureInterface, this); } } // namespace pp |