[dartium] Dart half of ScriptValue refactoring.

Source/bindings/dart/DartHandleProxy.cpp

 /*
  * Copyright (C) 2012 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "config.h"
 #include "bindings/dart/DartHandleProxy.h"
 
 #include "DartNode.h"
 #include "bindings/dart/DartJsInterop.h"
-#include "bindings/dart/DartScriptValue.h"
+#include "bindings/dart/DartPersistentValue.h"
 #include "bindings/dart/V8Converter.h"
 #include "bindings/v8/PageScriptDebugServer.h"
 #include "bindings/v8/ScriptController.h"
 #include "bindings/v8/ScriptState.h"
 #include "bindings/v8/V8Binding.h"
 #include "bindings/v8/V8ScriptRunner.h"
 #include "bindings/v8/V8ThrowException.h"
 
 #include "wtf/StdLibExtras.h"
 
 namespace WebCore {
 
 struct DartHandleProxy::CallbackData {
     ScopedPersistent<v8::Object> handle;
-    DartScriptValue* value;
+    DartPersistentValue* value;
 };
 
 typedef HashMap<String, v8::Persistent<v8::FunctionTemplate>* > FunctionTemplateMap;
 
 static v8::Local<v8::FunctionTemplate> objectProxyTemplate(Dart_Handle instance);
 static v8::Local<v8::FunctionTemplate> functionProxyTemplate();
 static v8::Local<v8::FunctionTemplate> libraryProxyTemplate(v8::Handle<v8::String> libraryNameV8);
 static v8::Local<v8::FunctionTemplate> typeProxyTemplate(Dart_Handle type);
 static v8::Local<v8::FunctionTemplate> frameProxyTemplate();
 
-DartScriptValue* DartHandleProxy::readPointerFromProxy(v8::Handle<v8::Value> proxy)
+DartPersistentValue* DartHandleProxy::readPointerFromProxy(v8::Handle<v8::Value> proxy)
 {
     void* pointer = proxy.As<v8::Object>()->GetAlignedPointerFromInternalField(0);
-    return static_cast<DartScriptValue*>(pointer);
+    return static_cast<DartPersistentValue*>(pointer);
 }
 
 bool DartHandleProxy::isDartProxy(v8::Handle<v8::Value> value)
 {
     if (value->IsObject()) {
         v8::Isolate* v8Isolate = v8::Isolate::GetCurrent();
         v8::Local<v8::Value> hiddenValue = value.As<v8::Object>()->GetHiddenValue(v8::String::NewFromUtf8(v8Isolate, "dartProxy"));
         return *hiddenValue && hiddenValue->IsBoolean();
     }
     return false;
@@ skipping 209 matching lines @@
         v8::Isolate* v8Isolate = v8::Isolate::GetCurrent();
         V8ThrowException::throwError(v8::String::NewFromUtf8(v8Isolate, Dart_GetError(result)), v8::Isolate::GetCurrent());
     } else {
         v8SetReturnValue(info, DartHandleProxy::create(result));
     }
 }
 
 void DartHandleProxy::writePointerToProxy(v8::Local<v8::Object> proxy, Dart_Handle value)
 {
     ASSERT(!proxy.IsEmpty());
-    DartScriptValue* dartScriptValue = new DartScriptValue(value);
+    DartPersistentValue* dartScriptValue = new DartPersistentValue(value);
     proxy->SetAlignedPointerInInternalField(0, dartScriptValue);
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
     v8::Persistent<v8::Object> persistentHandle;
     DartHandleProxy::CallbackData* callbackData = new DartHandleProxy::CallbackData();
     callbackData->value = dartScriptValue;
     callbackData->handle.set(isolate, proxy);
     callbackData->handle.setWeak(callbackData, &weakCallback);
 }
 
 intptr_t getLibraryId(v8::Local<v8::Object> proxy)
@@ skipping 765 matching lines @@
 }
 
 /**
  * Returns the JavaScript type name following the Chrome debugger conventions
  * for Dart objects that have natural JavaScript analogs.
  * This enables visually consistent display of Dart Lists and JavaScript arrays,
  * functions, and DOM nodes.
  */
 const char* DartHandleProxy::getJavaScriptType(v8::Handle<v8::Value> value)
 {
-    DartScriptValue* scriptValue = readPointerFromProxy(value);
+    DartPersistentValue* scriptValue = readPointerFromProxy(value);
     ASSERT(scriptValue->isIsolateAlive());
     DartIsolateScope scope(scriptValue->isolate());
     DartApiScope apiScope;
     Dart_PersistentHandle handle = scriptValue->value();
 
     if (Dart_IsInstance(handle)) {
         if (Dart_IsList(handle))
             return "array";
 
         if (DartDOMWrapper::subtypeOf(handle, DartNode::dartClassId))
             return "node";
     }
 
     return 0;
 }
 
 Node* DartHandleProxy::toNativeNode(v8::Handle<v8::Value> value)
 {
-    DartScriptValue* scriptValue = readPointerFromProxy(value);
+    DartPersistentValue* scriptValue = readPointerFromProxy(value);
     ASSERT(scriptValue->isIsolateAlive());
     DartIsolateScope scope(scriptValue->isolate());
     DartApiScope apiScope;
     Dart_PersistentHandle handle = scriptValue->value();
     Dart_Handle exception = 0;
     Node* node = DartNode::toNative(handle, exception);
     ASSERT(!exception);
     return node;
 }
 
@@ skipping 127 matching lines @@
     for (intptr_t i = 0; i < length; i ++)
         dartFunctionArgs.append(Dart_ListGetAt(wrappedExpressionArgs, i));
 
     Dart_Handle result = Dart_InvokeClosure(closure, dartFunctionArgs.size(), dartFunctionArgs.data());
     if (Dart_IsError(result))
         return V8ThrowException::throwError(v8::String::NewFromUtf8(v8Isolate, Dart_GetError(result)), v8::Isolate::GetCurrent());
     return DartHandleProxy::create(result);
 }
 
 }