| Index: ppapi/cpp/var_array.cc
|
| diff --git a/ppapi/cpp/dev/var_array_dev.cc b/ppapi/cpp/var_array.cc
|
| similarity index 43%
|
| rename from ppapi/cpp/dev/var_array_dev.cc
|
| rename to ppapi/cpp/var_array.cc
|
| index 247e9c442040e8dc8afee7ea5db8b63697003a0a..b0dcc3964642c061026ee7b70e16e1fc734191ff 100644
|
| --- a/ppapi/cpp/dev/var_array_dev.cc
|
| +++ b/ppapi/cpp/var_array.cc
|
| @@ -2,9 +2,9 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "ppapi/cpp/dev/var_array_dev.h"
|
| +#include "ppapi/cpp/var_array.h"
|
|
|
| -#include "ppapi/c/dev/ppb_var_array_dev.h"
|
| +#include "ppapi/c/ppb_var_array.h"
|
| #include "ppapi/cpp/logging.h"
|
| #include "ppapi/cpp/module_impl.h"
|
|
|
| @@ -12,20 +12,20 @@ namespace pp {
|
|
|
| namespace {
|
|
|
| -template <> const char* interface_name<PPB_VarArray_Dev_0_1>() {
|
| - return PPB_VAR_ARRAY_DEV_INTERFACE_0_1;
|
| +template <> const char* interface_name<PPB_VarArray_1_0>() {
|
| + return PPB_VAR_ARRAY_INTERFACE_1_0;
|
| }
|
|
|
| } // namespace
|
|
|
| -VarArray_Dev::VarArray_Dev() : Var(Null()) {
|
| - if (has_interface<PPB_VarArray_Dev_0_1>())
|
| - var_ = get_interface<PPB_VarArray_Dev_0_1>()->Create();
|
| +VarArray::VarArray() : Var(Null()) {
|
| + if (has_interface<PPB_VarArray_1_0>())
|
| + var_ = get_interface<PPB_VarArray_1_0>()->Create();
|
| else
|
| PP_NOTREACHED();
|
| }
|
|
|
| -VarArray_Dev::VarArray_Dev(const Var& var) : Var(var) {
|
| +VarArray::VarArray(const Var& var) : Var(var) {
|
| if (!var.is_array()) {
|
| PP_NOTREACHED();
|
|
|
| @@ -34,7 +34,7 @@ VarArray_Dev::VarArray_Dev(const Var& var) : Var(var) {
|
| }
|
| }
|
|
|
| -VarArray_Dev::VarArray_Dev(const PP_Var& var) : Var(var) {
|
| +VarArray::VarArray(const PP_Var& var) : Var(var) {
|
| if (var.type != PP_VARTYPE_ARRAY) {
|
| PP_NOTREACHED();
|
|
|
| @@ -43,18 +43,18 @@ VarArray_Dev::VarArray_Dev(const PP_Var& var) : Var(var) {
|
| }
|
| }
|
|
|
| -VarArray_Dev::VarArray_Dev(const VarArray_Dev& other) : Var(other) {
|
| +VarArray::VarArray(const VarArray& other) : Var(other) {
|
| }
|
|
|
| -VarArray_Dev::~VarArray_Dev() {
|
| +VarArray::~VarArray() {
|
| }
|
|
|
| -VarArray_Dev& VarArray_Dev::operator=(const VarArray_Dev& other) {
|
| +VarArray& VarArray::operator=(const VarArray& other) {
|
| Var::operator=(other);
|
| return *this;
|
| }
|
|
|
| -Var& VarArray_Dev::operator=(const Var& other) {
|
| +Var& VarArray::operator=(const Var& other) {
|
| if (other.is_array()) {
|
| Var::operator=(other);
|
| } else {
|
| @@ -64,33 +64,33 @@ Var& VarArray_Dev::operator=(const Var& other) {
|
| return *this;
|
| }
|
|
|
| -Var VarArray_Dev::Get(uint32_t index) const {
|
| - if (!has_interface<PPB_VarArray_Dev_0_1>())
|
| +Var VarArray::Get(uint32_t index) const {
|
| + if (!has_interface<PPB_VarArray_1_0>())
|
| return Var();
|
|
|
| - return Var(PASS_REF, get_interface<PPB_VarArray_Dev_0_1>()->Get(var_, index));
|
| + return Var(PASS_REF, get_interface<PPB_VarArray_1_0>()->Get(var_, index));
|
| }
|
|
|
| -PP_Bool VarArray_Dev::Set(uint32_t index, const Var& value) {
|
| - if (!has_interface<PPB_VarArray_Dev_0_1>())
|
| +PP_Bool VarArray::Set(uint32_t index, const Var& value) {
|
| + if (!has_interface<PPB_VarArray_1_0>())
|
| return PP_FALSE;
|
|
|
| - return get_interface<PPB_VarArray_Dev_0_1>()->Set(var_, index,
|
| + return get_interface<PPB_VarArray_1_0>()->Set(var_, index,
|
| value.pp_var());
|
| }
|
|
|
| -uint32_t VarArray_Dev::GetLength() const {
|
| - if (!has_interface<PPB_VarArray_Dev_0_1>())
|
| +uint32_t VarArray::GetLength() const {
|
| + if (!has_interface<PPB_VarArray_1_0>())
|
| return 0;
|
|
|
| - return get_interface<PPB_VarArray_Dev_0_1>()->GetLength(var_);
|
| + return get_interface<PPB_VarArray_1_0>()->GetLength(var_);
|
| }
|
|
|
| -PP_Bool VarArray_Dev::SetLength(uint32_t length) {
|
| - if (!has_interface<PPB_VarArray_Dev_0_1>())
|
| +PP_Bool VarArray::SetLength(uint32_t length) {
|
| + if (!has_interface<PPB_VarArray_1_0>())
|
| return PP_FALSE;
|
|
|
| - return get_interface<PPB_VarArray_Dev_0_1>()->SetLength(var_, length);
|
| + return get_interface<PPB_VarArray_1_0>()->SetLength(var_, length);
|
| }
|
|
|
| } // namespace pp
|
|
|