Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(104)

Unified Diff: ppapi/cpp/dev/video_capture_client_dev.cc

Issue 9381010: Convert resources to take an instance key instead of an Instance*. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: USELESS PATCH TITLE Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/cpp/dev/video_capture_client_dev.h ('k') | ppapi/cpp/dev/video_capture_dev.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/cpp/dev/video_capture_client_dev.cc
diff --git a/ppapi/cpp/dev/video_capture_client_dev.cc b/ppapi/cpp/dev/video_capture_client_dev.cc
index 1bebeec82f80882c0496db85e52411d01642a016..22a6b9b3838ebfd2e96e03746ccaed481a59c1cc 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
« no previous file with comments | « ppapi/cpp/dev/video_capture_client_dev.h ('k') | ppapi/cpp/dev/video_capture_dev.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698