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

Unified Diff: ppapi/cpp/dev/video_capture_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_dev.h ('k') | ppapi/cpp/dev/video_decoder_client_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_dev.cc
diff --git a/ppapi/cpp/dev/video_capture_dev.cc b/ppapi/cpp/dev/video_capture_dev.cc
index 7e590b6638071f3a4a0871d1273c2905b94eb988..c1c60ec576d0baebdc639bc4dae10167074330e1 100644
--- a/ppapi/cpp/dev/video_capture_dev.cc
+++ b/ppapi/cpp/dev/video_capture_dev.cc
@@ -9,7 +9,7 @@
#include "ppapi/cpp/completion_callback.h"
#include "ppapi/cpp/dev/device_ref_dev.h"
#include "ppapi/cpp/dev/resource_array_dev.h"
-#include "ppapi/cpp/instance.h"
+#include "ppapi/cpp/instance_handle.h"
#include "ppapi/cpp/module.h"
#include "ppapi/cpp/module_impl.h"
@@ -39,7 +39,7 @@ struct VideoCapture_Dev::EnumerateDevicesState {
VideoCapture_Dev* video_capture;
};
-VideoCapture_Dev::VideoCapture_Dev(const Instance& instance)
+VideoCapture_Dev::VideoCapture_Dev(const InstanceHandle& instance)
: enum_state_(NULL) {
if (!has_interface<PPB_VideoCapture_Dev>())
return;
@@ -149,8 +149,7 @@ void VideoCapture_Dev::OnEnumerateDevicesComplete(void* user_data,
if (result == PP_OK) {
// It will take care of releasing the reference.
- ResourceArray_Dev resources(ResourceArray_Dev::PassRef(),
- enum_state->devices_resource);
+ ResourceArray_Dev resources(pp::PASS_REF, enum_state->devices_resource);
if (need_to_callback) {
enum_state->devices->clear();
« no previous file with comments | « ppapi/cpp/dev/video_capture_dev.h ('k') | ppapi/cpp/dev/video_decoder_client_dev.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698