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

Unified Diff: ppapi/cpp/image_data.cc

Issue 9700088: Check for specific PPB interface versions in C++ wrappers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix MouseInputEvent version check. Created 8 years, 9 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/graphics_2d.cc ('k') | ppapi/cpp/input_event.cc » ('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 4ccbaba4cfe96934005a0c5a3c780fbff0f955cb..371d9240fb76e502524d2b75435d6563abd300c6 100644
--- a/ppapi/cpp/image_data.cc
+++ b/ppapi/cpp/image_data.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -16,8 +16,8 @@ namespace pp {
namespace {
-template <> const char* interface_name<PPB_ImageData>() {
- return PPB_IMAGEDATA_INTERFACE;
+template <> const char* interface_name<PPB_ImageData_1_0>() {
+ return PPB_IMAGEDATA_INTERFACE_1_0;
}
} // namespace
@@ -46,10 +46,10 @@ ImageData::ImageData(const InstanceHandle& instance,
: data_(NULL) {
memset(&desc_, 0, sizeof(PP_ImageDataDesc));
- if (!has_interface<PPB_ImageData>())
+ if (!has_interface<PPB_ImageData_1_0>())
return;
- PassRefFromConstructor(get_interface<PPB_ImageData>()->Create(
+ PassRefFromConstructor(get_interface<PPB_ImageData_1_0>()->Create(
instance.pp_instance(), format, &size.pp_size(),
PP_FromBool(init_to_zero)));
InitData();
@@ -76,16 +76,16 @@ uint32_t* ImageData::GetAddr32(const Point& coord) {
// static
PP_ImageDataFormat ImageData::GetNativeImageDataFormat() {
- if (!has_interface<PPB_ImageData>())
+ if (!has_interface<PPB_ImageData_1_0>())
return PP_IMAGEDATAFORMAT_BGRA_PREMUL; // Default to something on failure.
- return get_interface<PPB_ImageData>()->GetNativeImageDataFormat();
+ return get_interface<PPB_ImageData_1_0>()->GetNativeImageDataFormat();
}
void ImageData::InitData() {
- if (!has_interface<PPB_ImageData>())
+ if (!has_interface<PPB_ImageData_1_0>())
return;
- if (!get_interface<PPB_ImageData>()->Describe(pp_resource(), &desc_) ||
- !(data_ = get_interface<PPB_ImageData>()->Map(pp_resource())))
+ if (!get_interface<PPB_ImageData_1_0>()->Describe(pp_resource(), &desc_) ||
+ !(data_ = get_interface<PPB_ImageData_1_0>()->Map(pp_resource())))
*this = ImageData();
}
« no previous file with comments | « ppapi/cpp/graphics_2d.cc ('k') | ppapi/cpp/input_event.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698