Remove ScriptObject

Source/bindings/v8/ScriptFunctionCall.cpp

 /*
  * Copyright (C) 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:
  *
  *     * 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 24 matching lines @@
 #include "bindings/v8/ScriptState.h"
 #include "bindings/v8/ScriptValue.h"
 #include "bindings/v8/V8Binding.h"
 #include "bindings/v8/V8ObjectConstructor.h"
 #include "bindings/v8/V8ScriptRunner.h"
 
 #include <v8.h>
 
 namespace WebCore {
 
-void ScriptCallArgumentHandler::appendArgument(const ScriptObject& argument)
+void ScriptCallArgumentHandler::appendArgument(const ScriptValue& argument)
 {
     if (argument.scriptState() != m_scriptState) {
         ASSERT_NOT_REACHED();
         return;
     }
     m_arguments.append(argument);
 }
 
-void ScriptCallArgumentHandler::appendArgument(const ScriptValue& argument)
-{
-    m_arguments.append(argument);
-}
-
 void ScriptCallArgumentHandler::appendArgument(const String& argument)
 {
     v8::Isolate* isolate = m_scriptState->isolate();
     ScriptState::Scope scope(m_scriptState.get());
     m_arguments.append(ScriptValue(m_scriptState.get(), v8String(isolate, argument)));
 }
 
 void ScriptCallArgumentHandler::appendArgument(const char* argument)
 {
     v8::Isolate* isolate = m_scriptState->isolate();
@@ skipping 45 matching lines @@
 void ScriptCallArgumentHandler::appendArgument(const Vector<ScriptValue>& argument)
 {
     v8::Isolate* isolate = m_scriptState->isolate();
     ScriptState::Scope scope(m_scriptState.get());
     v8::Handle<v8::Array> result = v8::Array::New(isolate, argument.size());
     for (size_t i = 0; i < argument.size(); ++i)
         result->Set(v8::Integer::New(isolate, i), argument[i].v8Value());
     m_arguments.append(ScriptValue(m_scriptState.get(), result));
 }
 
-ScriptFunctionCall::ScriptFunctionCall(const ScriptObject& thisObject, const String& name)
+ScriptFunctionCall::ScriptFunctionCall(const ScriptValue& thisObject, const String& name)
     : ScriptCallArgumentHandler(thisObject.scriptState())
     , m_thisObject(thisObject)
     , m_name(name)
 {
 }
 
 ScriptValue ScriptFunctionCall::call(bool& hadException, bool reportExceptions)
 {
     ScriptState::Scope scope(m_scriptState.get());
     v8::TryCatch tryCatch;
     tryCatch.SetVerbose(reportExceptions);
 
-    v8::Handle<v8::Object> thisObject = m_thisObject.v8Object();
+    v8::Handle<v8::Object> thisObject = v8::Handle<v8::Object>::Cast(m_thisObject.v8Value());
     v8::Local<v8::Value> value = thisObject->Get(v8String(m_scriptState->isolate(), m_name));
     if (tryCatch.HasCaught()) {
         hadException = true;
         return ScriptValue();
     }
 
     ASSERT(value->IsFunction());
 
     v8::Local<v8::Function> function = v8::Local<v8::Function>::Cast(value);
     OwnPtr<v8::Handle<v8::Value>[]> info = adoptArrayPtr(new v8::Handle<v8::Value>[m_arguments.size()]);
@@ skipping 10 matching lines @@
 
     return ScriptValue(m_scriptState.get(), result);
 }
 
 ScriptValue ScriptFunctionCall::call()
 {
     bool hadException = false;
     return call(hadException);
 }
 
-ScriptObject ScriptFunctionCall::construct(bool& hadException, bool reportExceptions)
+ScriptValue ScriptFunctionCall::construct(bool& hadException, bool reportExceptions)
 {
     ScriptState::Scope scope(m_scriptState.get());
     v8::TryCatch tryCatch;
     tryCatch.SetVerbose(reportExceptions);
 
-    v8::Handle<v8::Object> thisObject = m_thisObject.v8Object();
+    v8::Handle<v8::Object> thisObject = v8::Handle<v8::Object>::Cast(m_thisObject.v8Value());
     v8::Local<v8::Value> value = thisObject->Get(v8String(m_scriptState->isolate(), m_name));
     if (tryCatch.HasCaught()) {
         hadException = true;
-        return ScriptObject();
+        return ScriptValue();
     }
 
     ASSERT(value->IsFunction());
 
     v8::Local<v8::Function> constructor = v8::Local<v8::Function>::Cast(value);
     OwnPtr<v8::Handle<v8::Value>[]> info = adoptArrayPtr(new v8::Handle<v8::Value>[m_arguments.size()]);
     for (size_t i = 0; i < m_arguments.size(); ++i)
         info[i] = m_arguments[i].v8Value();
 
     v8::Local<v8::Object> result = V8ObjectConstructor::newInstance(m_scriptState->isolate(), constructor, m_arguments.size(), info.get());
     if (tryCatch.HasCaught()) {
         hadException = true;
-        return ScriptObject();
+        return ScriptValue();
     }
 
-    return ScriptObject(m_scriptState.get(), result);
+    return ScriptValue(m_scriptState.get(), result);
 }
 
 } // namespace WebCore