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

Unified Diff: ppapi/cpp/image_data.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/image_data.h ('k') | ppapi/cpp/input_event.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/cpp/image_data.cc
diff --git a/ppapi/cpp/image_data.cc b/ppapi/cpp/image_data.cc
index 5fcc4c3522c958e4acfd86fda12f9fe29036fec2..4ccbaba4cfe96934005a0c5a3c780fbff0f955cb 100644
--- a/ppapi/cpp/image_data.cc
+++ b/ppapi/cpp/image_data.cc
@@ -8,7 +8,7 @@
#include <algorithm>
-#include "ppapi/cpp/instance.h"
+#include "ppapi/cpp/instance_handle.h"
#include "ppapi/cpp/module.h"
#include "ppapi/cpp/module_impl.h"
@@ -33,16 +33,13 @@ ImageData::ImageData(const ImageData& other)
}
ImageData::ImageData(PassRef, PP_Resource resource)
- : data_(NULL) {
+ : Resource(PASS_REF, resource),
+ data_(NULL) {
memset(&desc_, 0, sizeof(PP_ImageDataDesc));
-
- if (!has_interface<PPB_ImageData>())
- return;
-
- PassRefAndInitData(resource);
+ InitData();
}
-ImageData::ImageData(Instance* instance,
+ImageData::ImageData(const InstanceHandle& instance,
PP_ImageDataFormat format,
const Size& size,
bool init_to_zero)
@@ -52,9 +49,10 @@ ImageData::ImageData(Instance* instance,
if (!has_interface<PPB_ImageData>())
return;
- PassRefAndInitData(get_interface<PPB_ImageData>()->Create(
- instance->pp_instance(), format, &size.pp_size(),
+ PassRefFromConstructor(get_interface<PPB_ImageData>()->Create(
+ instance.pp_instance(), format, &size.pp_size(),
PP_FromBool(init_to_zero)));
+ InitData();
}
ImageData& ImageData::operator=(const ImageData& other) {
@@ -83,8 +81,9 @@ PP_ImageDataFormat ImageData::GetNativeImageDataFormat() {
return get_interface<PPB_ImageData>()->GetNativeImageDataFormat();
}
-void ImageData::PassRefAndInitData(PP_Resource resource) {
- PassRefFromConstructor(resource);
+void ImageData::InitData() {
+ if (!has_interface<PPB_ImageData>())
+ return;
if (!get_interface<PPB_ImageData>()->Describe(pp_resource(), &desc_) ||
!(data_ = get_interface<PPB_ImageData>()->Map(pp_resource())))
*this = ImageData();
« no previous file with comments | « ppapi/cpp/image_data.h ('k') | ppapi/cpp/input_event.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698