| Index: ppapi/cpp/var_resource.h
|
| diff --git a/ppapi/cpp/dev/var_resource_dev.h b/ppapi/cpp/var_resource.h
|
| similarity index 54%
|
| rename from ppapi/cpp/dev/var_resource_dev.h
|
| rename to ppapi/cpp/var_resource.h
|
| index ab879a55635a954ca1d7fea24d68cfdefd4a2a5a..bda507f690b6cb547f800ff637f5f6f44c15d50f 100644
|
| --- a/ppapi/cpp/dev/var_resource_dev.h
|
| +++ b/ppapi/cpp/var_resource.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef PPAPI_CPP_VAR_RESOURCE_DEV_H_
|
| -#define PPAPI_CPP_VAR_RESOURCE_DEV_H_
|
| +#ifndef PPAPI_CPP_VAR_RESOURCE_H_
|
| +#define PPAPI_CPP_VAR_RESOURCE_H_
|
|
|
| #include "ppapi/cpp/resource.h"
|
| #include "ppapi/cpp/var.h"
|
| @@ -13,32 +13,32 @@
|
|
|
| namespace pp {
|
|
|
| -class VarResource_Dev : public Var {
|
| +class VarResource : public Var {
|
| public:
|
| - /// Constructs a <code>VarResource_Dev</code> given a resource.
|
| - explicit VarResource_Dev(const pp::Resource& resource);
|
| + /// Constructs a <code>VarResource</code> given a resource.
|
| + explicit VarResource(const pp::Resource& resource);
|
|
|
| - /// Constructs a <code>VarResource_Dev</code> given a var for which
|
| - /// is_resource() is true. This will refer to the same resource var, but allow
|
| - /// you to access methods specific to resources.
|
| + /// Constructs a <code>VarResource</code> given a var for which is_resource()
|
| + /// is true. This will refer to the same resource var, but allow you to access
|
| + /// methods specific to resources.
|
| ///
|
| /// @param[in] var A resource var.
|
| - explicit VarResource_Dev(const Var& var);
|
| + explicit VarResource(const Var& var);
|
|
|
| /// Copy constructor.
|
| - VarResource_Dev(const VarResource_Dev& other);
|
| + VarResource(const VarResource& other);
|
|
|
| - virtual ~VarResource_Dev();
|
| + virtual ~VarResource();
|
|
|
| /// Assignment operator.
|
| - VarResource_Dev& operator=(const VarResource_Dev& other);
|
| + VarResource& operator=(const VarResource& other);
|
|
|
| /// The <code>Var</code> assignment operator is overridden here so that we can
|
| - /// check for assigning a non-resource var to a <code>VarResource_Dev</code>.
|
| + /// check for assigning a non-resource var to a <code>VarResource</code>.
|
| ///
|
| /// @param[in] other The resource var to be assigned.
|
| ///
|
| - /// @return The resulting <code>VarResource_Dev</code> (as a
|
| + /// @return The resulting <code>VarResource</code> (as a
|
| /// <code>Var</code>&).
|
| virtual Var& operator=(const Var& other);
|
|
|
| @@ -50,4 +50,4 @@ class VarResource_Dev : public Var {
|
|
|
| } // namespace pp
|
|
|
| -#endif // PPAPI_CPP_VAR_RESOURCE_DEV_H_
|
| +#endif // PPAPI_CPP_VAR_RESOURCE_H_
|
|
|