Index: webkit/plugins/ppapi/var.cc |
=================================================================== |
--- webkit/plugins/ppapi/var.cc (revision 0) |
+++ webkit/plugins/ppapi/var.cc (working copy) |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "webkit/glue/plugins/pepper_var.h" |
+#include "webkit/plugins/ppapi/var.h" |
#include <limits> |
@@ -13,15 +13,17 @@ |
#include "ppapi/c/ppb_var.h" |
#include "ppapi/c/pp_var.h" |
#include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" |
-#include "webkit/glue/plugins/pepper_common.h" |
-#include "webkit/glue/plugins/pepper_plugin_instance.h" |
-#include "webkit/glue/plugins/pepper_plugin_module.h" |
-#include "webkit/glue/plugins/pepper_plugin_object.h" |
+#include "webkit/plugins/ppapi/common.h" |
+#include "webkit/plugins/ppapi/plugin_instance.h" |
+#include "webkit/plugins/ppapi/plugin_module.h" |
+#include "webkit/plugins/ppapi/plugin_object.h" |
#include "v8/include/v8.h" |
using WebKit::WebBindings; |
-namespace pepper { |
+namespace webkit { |
+namespace plugins { |
+namespace ppapi { |
namespace { |
@@ -652,6 +654,10 @@ |
Var::~Var() { |
} |
+Var* Var::AsVar() { |
+ return this; |
+} |
+ |
// static |
PP_Var Var::NPVariantToPPVar(PluginModule* module, const NPVariant* variant) { |
switch (variant->type) { |
@@ -744,6 +750,10 @@ |
StringVar::~StringVar() { |
} |
+StringVar* StringVar::AsStringVar() { |
+ return this; |
+} |
+ |
// static |
PP_Var StringVar::StringToPPVar(PluginModule* module, const std::string& var) { |
return StringToPPVar(module, var.c_str(), var.size()); |
@@ -785,6 +795,10 @@ |
WebBindings::releaseObject(np_object_); |
} |
+ObjectVar* ObjectVar::AsObjectVar() { |
+ return this; |
+} |
+ |
// static |
PP_Var ObjectVar::NPObjectToPPVar(PluginModule* module, NPObject* object) { |
scoped_refptr<ObjectVar> object_var(module->ObjectVarForNPObject(object)); |
@@ -850,4 +864,7 @@ |
static_cast<TryCatch*>(self)->SetException(message); |
} |
-} // namespace pepper |
+} // namespace ppapi |
+} // namespace plugins |
+} // namespace webkit |
+ |