| Index: webkit/plugins/ppapi/var.h
|
| ===================================================================
|
| --- webkit/plugins/ppapi/var.h (revision 0)
|
| +++ webkit/plugins/ppapi/var.h (working copy)
|
| @@ -2,12 +2,12 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef WEBKIT_GLUE_PLUGINS_PEPPER_VAR_H_
|
| -#define WEBKIT_GLUE_PLUGINS_PEPPER_VAR_H_
|
| +#ifndef WEBKIT_PLUGINS_PPAPI_VAR_H_
|
| +#define WEBKIT_PLUGINS_PPAPI_VAR_H_
|
|
|
| #include <string>
|
|
|
| -#include "webkit/glue/plugins/pepper_resource.h"
|
| +#include "webkit/plugins/ppapi/resource.h"
|
|
|
| struct PP_Var;
|
| struct PPB_Var;
|
| @@ -16,7 +16,9 @@
|
| typedef struct _NPVariant NPVariant;
|
| typedef void* NPIdentifier;
|
|
|
| -namespace pepper {
|
| +namespace webkit {
|
| +namespace plugins {
|
| +namespace ppapi {
|
|
|
| // Var -------------------------------------------------------------------------
|
|
|
| @@ -28,7 +30,7 @@
|
| virtual ~Var();
|
|
|
| // Resource overrides.
|
| - virtual Var* AsVar() { return this; }
|
| + virtual Var* AsVar();
|
|
|
| // Returns a PP_Var that corresponds to the given NPVariant. The contents of
|
| // the NPVariant will be copied unless the NPVariant corresponds to an
|
| @@ -114,7 +116,7 @@
|
| const std::string& value() const { return value_; }
|
|
|
| // Resource overrides.
|
| - virtual StringVar* AsStringVar() { return this; }
|
| + virtual StringVar* AsStringVar();
|
|
|
| // Helper function to create a PP_Var of type string that contains a copy of
|
| // the given string. The input data must be valid UTF-8 encoded text, if it
|
| @@ -154,7 +156,7 @@
|
| virtual ~ObjectVar();
|
|
|
| // Resource overrides.
|
| - virtual ObjectVar* AsObjectVar() { return this; }
|
| + virtual ObjectVar* AsObjectVar();
|
|
|
| // Returns the underlying NPObject corresponding to this ObjectVar.
|
| // Guaranteed non-NULL.
|
| @@ -246,6 +248,8 @@
|
| PP_Var* exception_;
|
| };
|
|
|
| -} // namespace pepper
|
| +} // namespace ppapi
|
| +} // namespace plugins
|
| +} // namespace webkit
|
|
|
| -#endif // WEBKIT_GLUE_PLUGINS_PEPPER_VAR_H_
|
| +#endif // WEBKIT_PLUGINS_PPAPI_VAR_H_
|
|
|