Use upstream V8Proxy and V8Utilities

webkit/port/bindings/v8/NPV8Object.cpp

 /*
  * Copyright (C) 2004, 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2007-2009 Google, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 23 matching lines @@
 #include "NPV8Object.h"
 #include "ChromiumBridge.h"
 #include "Frame.h"
 #include "bindings/npruntime.h"
 #include "npruntime_priv.h"
 #include "PlatformString.h"
 #include "ScriptController.h"
 #include "V8CustomBinding.h"
 #include "V8Helpers.h"
 #include "V8NPUtils.h"
-#include "v8_proxy.h"
+#include "V8Proxy.h"
 #include "DOMWindow.h"
 
 using WebCore::toV8Context;
 using WebCore::toV8Proxy;
 using WebCore::V8ClassIndex;
 using WebCore::V8Custom;
 using WebCore::V8Proxy;
 
 // FIXME(mbelshe): comments on why use malloc and free.
 static NPObject* AllocV8NPObject(NPP, NPClass*)
 {
     return static_cast<NPObject*>(malloc(sizeof(V8NPObject)));
 }
 
 static void FreeV8NPObject(NPObject* npobj)
 {
     V8NPObject *object = reinterpret_cast<V8NPObject*>(npobj);
 #ifndef NDEBUG
-    V8Proxy::UnregisterGlobalHandle(object, object->v8Object);
+    V8Proxy::unregisterGlobalHandle(object, object->v8Object);
 #endif
     object->v8Object.Dispose();
     free(object);
 }
 
 static v8::Handle<v8::Value>* listFromVariantArgs(const NPVariant* args,
                                                   uint32_t argCount,
                                                   NPObject *owner)
 {
     v8::Handle<v8::Value>* argv = new v8::Handle<v8::Value>[argCount];
@@ skipping 24 matching lines @@
 // NPAPI's npruntime functions
 NPClass* npScriptObjectClass = &V8NPObjectClass;
 
 NPObject* npCreateV8ScriptObject(NPP npp, v8::Handle<v8::Object> object, WebCore::DOMWindow* root)
 {
     // Check to see if this object is already wrapped.
     if (object->InternalFieldCount() == V8Custom::kNPObjectInternalFieldCount &&
         object->GetInternalField(V8Custom::kDOMWrapperTypeIndex)->IsNumber() &&
         object->GetInternalField(V8Custom::kDOMWrapperTypeIndex)->Uint32Value() == V8ClassIndex::NPOBJECT) {
 
-        NPObject* rv = V8Proxy::ToNativeObject<NPObject>(V8ClassIndex::NPOBJECT, object);
+        NPObject* rv = V8Proxy::convertToNativeObject<NPObject>(V8ClassIndex::NPOBJECT, object);
         NPN_RetainObject(rv);
         return rv;
     }
 
     V8NPObject* obj = reinterpret_cast<V8NPObject*>(NPN_CreateObject(npp, &V8NPObjectClass));
     obj->v8Object = v8::Persistent<v8::Object>::New(object);
 #ifndef NDEBUG
-    V8Proxy::RegisterGlobalHandle(WebCore::NPOBJECT, obj, obj->v8Object);
+    V8Proxy::registerGlobalHandle(WebCore::NPOBJECT, obj, obj->v8Object);
 #endif
     obj->rootObject = root;
     return reinterpret_cast<NPObject*>(obj);
 }
 
 bool NPN_Invoke(NPP npp, NPObject *npobj, NPIdentifier methodName,
                 const NPVariant *args, uint32_t argCount, NPVariant *result)
 {
     if (!npobj)
         return false;
@@ skipping 33 matching lines @@
         }
 
         V8Proxy* proxy = toV8Proxy(npobj);
         ASSERT(proxy);  // must not be null
 
         // FIXME: fix variable naming
         // Call the function object
         v8::Handle<v8::Function> func = v8::Handle<v8::Function>::Cast(funcObj);
         // Create list of args to pass to v8
         v8::Handle<v8::Value>* argv = listFromVariantArgs(args, argCount, npobj);
-        v8::Local<v8::Value> resultObj = proxy->CallFunction(func, object->v8Object, argCount, argv);
+        v8::Local<v8::Value> resultObj = proxy->callFunction(func, object->v8Object, argCount, argv);
         delete[] argv;
 
         // If we had an error, return false.  The spec is a little unclear here, but
         // says "Returns true if the method was successfully invoked".  If we get an
         // error return value, was that successfully invoked?
         if (resultObj.IsEmpty())
             return false;
 
         // Convert the result back to an NPVariant
         convertV8ObjectToNPVariant(resultObj, npobj, result);
@@ skipping 33 matching lines @@
 
         // Call the function object
         v8::Local<v8::Value> resultObj;
         v8::Handle<v8::Function> func(v8::Function::Cast(*funcObj));
         if (!func->IsNull()) {
             V8Proxy* proxy = toV8Proxy(npobj);
             ASSERT(proxy);
 
             // Create list of args to pass to v8
             v8::Handle<v8::Value>* argv = listFromVariantArgs(args, argCount, npobj);
-            resultObj = proxy->CallFunction(func, funcObj, argCount, argv);
+            resultObj = proxy->callFunction(func, funcObj, argCount, argv);
             delete[] argv;
         }
 
         // If we had an error, return false.  The spec is a little unclear here, but
         // says "Returns true if the method was successfully invoked".  If we get an
         // error return value, was that successfully invoked?
         if (resultObj.IsEmpty())
             return false;
 
         // Convert the result back to an NPVariant.
@@ skipping 178 matching lines @@
 void NPN_SetException(NPObject *npobj, const NPUTF8 *message)
 {
     if (npobj->_class != npScriptObjectClass)
         return;
     v8::HandleScope handleScope;
     v8::Handle<v8::Context> context = toV8Context(0, npobj);
     if (context.IsEmpty())
         return;
 
     v8::Context::Scope scope(context);
-    V8Proxy::ThrowError(V8Proxy::GENERAL_ERROR, message);
+    V8Proxy::throwError(V8Proxy::GeneralError, message);
 }
 
 bool NPN_Enumerate(NPP npp, NPObject *npobj, NPIdentifier **identifier, uint32_t *count)
 {
     if (!npobj)
         return false;
 
     if (npobj->_class == npScriptObjectClass) {
         V8NPObject *object = reinterpret_cast<V8NPObject*>(npobj);
 
@@ skipping 66 matching lines @@
 
         // Call the constructor.
         v8::Local<v8::Value> resultObj;
         v8::Handle<v8::Function> ctor(v8::Function::Cast(*ctorObj));
         if (!ctor->IsNull()) {
             V8Proxy* proxy = toV8Proxy(npobj);
             ASSERT(proxy);
 
             // Create list of args to pass to v8.
             v8::Handle<v8::Value>* argv = listFromVariantArgs(args, argCount, npobj);
-            resultObj = proxy->NewInstance(ctor, argCount, argv);
+            resultObj = proxy->newInstance(ctor, argCount, argv);
             delete[] argv;
         }
 
         // If we had an error return false.
         if (resultObj.IsEmpty())
             return false;
 
         // Convert the result back to an NPVariant.
         convertV8ObjectToNPVariant(resultObj, npobj, result);
         return true;
     }
 
     if (NP_CLASS_STRUCT_VERSION_HAS_CTOR(npobj->_class) && npobj->_class->construct)
         return npobj->_class->construct(npobj, args, argCount, result);
 
     return false;
 }