Index: ppapi/cpp/var_resource.cc |
diff --git a/ppapi/cpp/dev/var_resource_dev.cc b/ppapi/cpp/var_resource.cc |
similarity index 51% |
rename from ppapi/cpp/dev/var_resource_dev.cc |
rename to ppapi/cpp/var_resource.cc |
index 69fb15b0898b8d662e867f6a259b4723b9db017e..a94cba9e6e8920eb6a74e29133c9bf10c42f87a2 100644 |
--- a/ppapi/cpp/dev/var_resource_dev.cc |
+++ b/ppapi/cpp/var_resource.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_resource_dev.h" |
+#include "ppapi/cpp/var_resource.h" |
-#include "ppapi/c/dev/ppb_var_resource_dev.h" |
+#include "ppapi/c/ppb_var_resource.h" |
#include "ppapi/cpp/logging.h" |
#include "ppapi/cpp/module_impl.h" |
@@ -12,25 +12,25 @@ namespace pp { |
namespace { |
-template <> const char* interface_name<PPB_VarResource_Dev_0_1>() { |
- return PPB_VAR_RESOURCE_DEV_INTERFACE_0_1; |
+template <> const char* interface_name<PPB_VarResource_1_0>() { |
+ return PPB_VAR_RESOURCE_INTERFACE_1_0; |
} |
} // namespace |
-VarResource_Dev::VarResource_Dev(const pp::Resource& resource) : Var(Null()) { |
- if (!has_interface<PPB_VarResource_Dev_0_1>()) { |
+VarResource::VarResource(const pp::Resource& resource) : Var(Null()) { |
+ if (!has_interface<PPB_VarResource_1_0>()) { |
PP_NOTREACHED(); |
return; |
} |
// Note: Var(Null()) sets is_managed_ to true, so |var_| will be properly |
// released upon destruction. |
- var_ = get_interface<PPB_VarResource_Dev_0_1>()->VarFromResource( |
+ var_ = get_interface<PPB_VarResource_1_0>()->VarFromResource( |
resource.pp_resource()); |
} |
-VarResource_Dev::VarResource_Dev(const Var& var) : Var(var) { |
+VarResource::VarResource(const Var& var) : Var(var) { |
if (!var.is_resource()) { |
PP_NOTREACHED(); |
@@ -39,16 +39,16 @@ VarResource_Dev::VarResource_Dev(const Var& var) : Var(var) { |
} |
} |
-VarResource_Dev::VarResource_Dev(const VarResource_Dev& other) : Var(other) {} |
+VarResource::VarResource(const VarResource& other) : Var(other) {} |
-VarResource_Dev::~VarResource_Dev() {} |
+VarResource::~VarResource() {} |
-VarResource_Dev& VarResource_Dev::operator=(const VarResource_Dev& other) { |
+VarResource& VarResource::operator=(const VarResource& other) { |
Var::operator=(other); |
return *this; |
} |
-Var& VarResource_Dev::operator=(const Var& other) { |
+Var& VarResource::operator=(const Var& other) { |
if (other.is_resource()) { |
Var::operator=(other); |
} else { |
@@ -58,13 +58,13 @@ Var& VarResource_Dev::operator=(const Var& other) { |
return *this; |
} |
-pp::Resource VarResource_Dev::AsResource() { |
- if (!has_interface<PPB_VarResource_Dev_0_1>()) |
+pp::Resource VarResource::AsResource() { |
+ if (!has_interface<PPB_VarResource_1_0>()) |
return pp::Resource(); |
return pp::Resource( |
pp::PASS_REF, |
- get_interface<PPB_VarResource_Dev_0_1>()->VarToResource(var_)); |
+ get_interface<PPB_VarResource_1_0>()->VarToResource(var_)); |
} |
} // namespace pp |