Pass isolate to ScriptValue constructor

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 43 matching lines @@
     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();
     ScriptScope scope(m_scriptState);
-    m_arguments.append(v8String(argument, m_scriptState->isolate()));
+    m_arguments.append(ScriptValue(v8String(argument, isolate), isolate));
 }
 
 void ScriptCallArgumentHandler::appendArgument(const char* argument)
 {
+    v8::Isolate* isolate = m_scriptState->isolate();
     ScriptScope scope(m_scriptState);
-    m_arguments.append(v8String(argument, m_scriptState->isolate()));
+    m_arguments.append(ScriptValue(v8String(argument, isolate), isolate));
 }
 
 void ScriptCallArgumentHandler::appendArgument(long argument)
 {
+    v8::Isolate* isolate = m_scriptState->isolate();
     ScriptScope scope(m_scriptState);
-    m_arguments.append(v8::Number::New(m_scriptState->isolate(), argument));
+    m_arguments.append(ScriptValue(v8::Number::New(isolate, argument), isolate));
 }
 
 void ScriptCallArgumentHandler::appendArgument(long long argument)
 {
+    v8::Isolate* isolate = m_scriptState->isolate();
     ScriptScope scope(m_scriptState);
-    m_arguments.append(v8::Number::New(m_scriptState->isolate(), argument));
+    m_arguments.append(ScriptValue(v8::Number::New(isolate, argument), isolate));
 }
 
 void ScriptCallArgumentHandler::appendArgument(unsigned int argument)
 {
+    v8::Isolate* isolate = m_scriptState->isolate();
     ScriptScope scope(m_scriptState);
-    m_arguments.append(v8::Number::New(m_scriptState->isolate(), argument));
+    m_arguments.append(ScriptValue(v8::Number::New(isolate, argument), isolate));
 }
 
 void ScriptCallArgumentHandler::appendArgument(unsigned long argument)
 {
+    v8::Isolate* isolate = m_scriptState->isolate();
     ScriptScope scope(m_scriptState);
-    m_arguments.append(v8::Number::New(m_scriptState->isolate(), argument));
+    m_arguments.append(ScriptValue(v8::Number::New(isolate, argument), isolate));
 }
 
 void ScriptCallArgumentHandler::appendArgument(int argument)
 {
+    v8::Isolate* isolate = m_scriptState->isolate();
     ScriptScope scope(m_scriptState);
-    m_arguments.append(v8::Number::New(m_scriptState->isolate(), argument));
+    m_arguments.append(ScriptValue(v8::Number::New(isolate, argument), isolate));
 }
 
 void ScriptCallArgumentHandler::appendArgument(bool argument)
 {
-    m_arguments.append(v8Boolean(argument, m_scriptState->isolate()));
+    v8::Isolate* isolate = m_scriptState->isolate();
+    m_arguments.append(ScriptValue(v8Boolean(argument, isolate), isolate));
 }
 
 ScriptFunctionCall::ScriptFunctionCall(const ScriptObject& thisObject, const String& name)
     : ScriptCallArgumentHandler(thisObject.scriptState())
     , m_thisObject(thisObject)
     , m_name(name)
 {
 }
 
 ScriptValue ScriptFunctionCall::call(bool& hadException, bool reportExceptions)
@@ skipping 15 matching lines @@
         args[i] = m_arguments[i].v8Value();
         ASSERT(!args[i].IsEmpty());
     }
 
     v8::Local<v8::Value> result = V8ScriptRunner::callFunction(function, getScriptExecutionContext(), thisObject, m_arguments.size(), args.get(), m_scriptState->isolate());
     if (!scope.success()) {
         hadException = true;
         return ScriptValue();
     }
 
-    return ScriptValue(result);
+    return ScriptValue(result, m_scriptState->isolate());
 }
 
 ScriptValue ScriptFunctionCall::call()
 {
     bool hadException = false;
     return call(hadException);
 }
 
 ScriptObject ScriptFunctionCall::construct(bool& hadException, bool reportExceptions)
 {
@@ skipping 36 matching lines @@
     v8::TryCatch exceptionCatcher;
     exceptionCatcher.SetVerbose(true);
     v8::Handle<v8::Object> object = v8::Context::GetCurrent()->Global();
     v8::Handle<v8::Function> function = v8::Handle<v8::Function>::Cast(m_function.v8Value());
 
     OwnArrayPtr<v8::Handle<v8::Value> > args = adoptArrayPtr(new v8::Handle<v8::Value>[m_arguments.size()]);
     for (size_t i = 0; i < m_arguments.size(); ++i)
         args[i] = m_arguments[i].v8Value();
 
     v8::Handle<v8::Value> result = ScriptController::callFunctionWithInstrumentation(0, function, object, m_arguments.size(), args.get(), m_scriptState->isolate());
-    return ScriptValue(result);
+    return ScriptValue(result, m_scriptState->isolate());
 }
 
 } // namespace WebCore