Move the Pepper implementation from webkit/glue/plugins/pepper_* to...

webkit/plugins/ppapi/var.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // 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>
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "ppapi/c/dev/ppb_var_deprecated.h"
 #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 ppapi {
 
 namespace {
 
 const char kInvalidObjectException[] = "Error: Invalid object";
 const char kInvalidPropertyException[] = "Error: Invalid property";
 const char kInvalidValueException[] = "Error: Invalid value";
 const char kUnableToGetPropertyException[] = "Error: Unable to get property";
 const char kUnableToSetPropertyException[] = "Error: Unable to set property";
 const char kUnableToRemovePropertyException[] =
     "Error: Unable to remove property";
@@ skipping 610 matching lines @@
 }  // namespace
 
 // Var -------------------------------------------------------------------------
 
 Var::Var(PluginModule* module) : Resource(module) {
 }
 
 Var::~Var() {
 }
 
+Var* Var::AsVar() {
+  return this;
+}
+
 // static
 PP_Var Var::NPVariantToPPVar(PluginModule* module, const NPVariant* variant) {
   switch (variant->type) {
     case NPVariantType_Void:
       return PP_MakeUndefined();
     case NPVariantType_Null:
       return PP_MakeNull();
     case NPVariantType_Bool:
       return BoolToPPVar(NPVARIANT_TO_BOOLEAN(*variant));
     case NPVariantType_Int32:
@@ skipping 38 matching lines @@
     return StringVar::StringToPPVar(module, string_value);
 
   return PP_MakeInt32(int_value);
 }
 
 // static
 void Var::PluginAddRefPPVar(PP_Var var) {
   if (var.type == PP_VARTYPE_STRING || var.type == PP_VARTYPE_OBJECT) {
     // TODO(brettw) consider checking that the ID is actually a var ID rather
     // than some random other resource ID.
-    if (!ResourceTracker::Get()->AddRefResource(var.value.as_id))
+    PP_Resource resource = static_cast<PP_Resource>(var.value.as_id);
+    if (!ResourceTracker::Get()->AddRefResource(resource))
       DLOG(WARNING) << "AddRefVar()ing a nonexistant string/object var.";
   }
 }
 
 // static
 void Var::PluginReleasePPVar(PP_Var var) {
   if (var.type == PP_VARTYPE_STRING || var.type == PP_VARTYPE_OBJECT) {
     // TODO(brettw) consider checking that the ID is actually a var ID rather
     // than some random other resource ID.
-    if (!ResourceTracker::Get()->UnrefResource(var.value.as_id))
+    PP_Resource resource = static_cast<PP_Resource>(var.value.as_id);
+    if (!ResourceTracker::Get()->UnrefResource(resource))
       DLOG(WARNING) << "ReleaseVar()ing a nonexistant string/object var.";
   }
 }
 
 // static
 const PPB_Var_Deprecated* Var::GetDeprecatedInterface() {
   return &var_deprecated_interface;
 }
 
 const PPB_Var* Var::GetInterface() {
   return &var_interface;
 }
 
 // StringVar -------------------------------------------------------------------
 
 StringVar::StringVar(PluginModule* module, const char* str, uint32 len)
     : Var(module),
       value_(str, len) {
 }
 
 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());
 }
 
 // static
 PP_Var StringVar::StringToPPVar(PluginModule* module,
                                 const char* data, uint32 len) {
   scoped_refptr<StringVar> str(new StringVar(module, data, len));
   if (!str || !IsStringUTF8(str->value()))
     return PP_MakeNull();
 
   PP_Var ret;
   ret.type = PP_VARTYPE_STRING;
 
   // The caller takes ownership now.
   ret.value.as_id = str->GetReference();
   return ret;
 }
 
 // static
 scoped_refptr<StringVar> StringVar::FromPPVar(PP_Var var) {
   if (var.type != PP_VARTYPE_STRING)
     return scoped_refptr<StringVar>(NULL);
-  return Resource::GetAs<StringVar>(var.value.as_id);
+  PP_Resource resource = static_cast<PP_Resource>(var.value.as_id);
+  return Resource::GetAs<StringVar>(resource);
 }
 
 // ObjectVar -------------------------------------------------------------
 
 ObjectVar::ObjectVar(PluginModule* module, NPObject* np_object)
     : Var(module),
       np_object_(np_object) {
   WebBindings::retainObject(np_object_);
   module->AddNPObjectVar(this);
 }
 
 ObjectVar::~ObjectVar() {
   module()->RemoveNPObjectVar(this);
   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));
   if (!object_var)  // No object for this module yet, make a new one.
     object_var = new ObjectVar(module, object);
 
   if (!object_var)
     return PP_MakeUndefined();
 
   // Convert to a PP_Var, GetReference will AddRef for us.
   PP_Var result;
   result.type = PP_VARTYPE_OBJECT;
   result.value.as_id = object_var->GetReference();
   return result;
 }
 
 // static
 scoped_refptr<ObjectVar> ObjectVar::FromPPVar(PP_Var var) {
   if (var.type != PP_VARTYPE_OBJECT)
     return scoped_refptr<ObjectVar>(NULL);
-  return Resource::GetAs<ObjectVar>(var.value.as_id);
+  PP_Resource resource = static_cast<PP_Resource>(var.value.as_id);
+  return Resource::GetAs<ObjectVar>(resource);
 }
 
 // TryCatch --------------------------------------------------------------------
 
 TryCatch::TryCatch(PluginModule* module, PP_Var* exception)
     : module_(module),
       has_exception_(exception && exception->type != PP_VARTYPE_UNDEFINED),
       exception_(exception) {
   WebBindings::pushExceptionHandler(&TryCatch::Catch, this);
 }
@@ skipping 24 matching lines @@
     if (exception_)
       *exception_ = PP_MakeInt32(1);
   }
 }
 
 // static
 void TryCatch::Catch(void* self, const char* message) {
   static_cast<TryCatch*>(self)->SetException(message);
 }
 
-}  // namespace pepper
+}  // namespace ppapi
+}  // namespace webkit
+