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

Unified Diff: ppapi/cpp/dev/resource_array_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/resource_array_dev.h ('k') | ppapi/cpp/dev/scrollbar_dev.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/cpp/dev/resource_array_dev.cc
diff --git a/ppapi/cpp/dev/resource_array_dev.cc b/ppapi/cpp/dev/resource_array_dev.cc
index 4193e0f8a0cf580db291147c767af6f515ee75a3..6a8493fc6d3cabc60848b644b14c437acee5b5a2 100644
--- a/ppapi/cpp/dev/resource_array_dev.cc
+++ b/ppapi/cpp/dev/resource_array_dev.cc
@@ -5,7 +5,7 @@
#include "ppapi/cpp/dev/resource_array_dev.h"
#include "ppapi/c/dev/ppb_resource_array_dev.h"
-#include "ppapi/cpp/instance.h"
+#include "ppapi/cpp/instance_handle.h"
#include "ppapi/cpp/module_impl.h"
namespace pp {
@@ -21,20 +21,20 @@ template <> const char* interface_name<PPB_ResourceArray_Dev>() {
ResourceArray_Dev::ResourceArray_Dev() {
}
-ResourceArray_Dev::ResourceArray_Dev(PassRef, PP_Resource resource) {
- PassRefFromConstructor(resource);
+ResourceArray_Dev::ResourceArray_Dev(PassRef, PP_Resource resource)
+ : Resource(PASS_REF, resource) {
}
ResourceArray_Dev::ResourceArray_Dev(const ResourceArray_Dev& other)
: Resource(other) {
}
-ResourceArray_Dev::ResourceArray_Dev(Instance* instance,
+ResourceArray_Dev::ResourceArray_Dev(const InstanceHandle& instance,
const PP_Resource elements[],
uint32_t size) {
- if (has_interface<PPB_ResourceArray_Dev>() && instance) {
+ if (has_interface<PPB_ResourceArray_Dev>()) {
PassRefFromConstructor(get_interface<PPB_ResourceArray_Dev>()->Create(
- instance->pp_instance(), elements, size));
+ instance.pp_instance(), elements, size));
}
}
« no previous file with comments | « ppapi/cpp/dev/resource_array_dev.h ('k') | ppapi/cpp/dev/scrollbar_dev.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698