Remove ScriptObject

Source/core/inspector/InjectedScriptCanvasModule.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 15 matching lines @@
  * 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 "core/inspector/InjectedScriptCanvasModule.h"
 
 #include "InjectedScriptCanvasModuleSource.h"
 #include "bindings/v8/ScriptFunctionCall.h"
-#include "bindings/v8/ScriptObject.h"
+#include "bindings/v8/ScriptValue.h"
 
 using WebCore::TypeBuilder::Array;
 using WebCore::TypeBuilder::Canvas::ResourceId;
 using WebCore::TypeBuilder::Canvas::ResourceState;
 using WebCore::TypeBuilder::Canvas::TraceLog;
 using WebCore::TypeBuilder::Canvas::TraceLogId;
 using WebCore::TypeBuilder::Runtime::RemoteObject;
 
 namespace WebCore {
 
 InjectedScriptCanvasModule::InjectedScriptCanvasModule()
     : InjectedScriptModule("InjectedScriptCanvasModule")
 {
 }
 
 InjectedScriptCanvasModule InjectedScriptCanvasModule::moduleForState(InjectedScriptManager* injectedScriptManager, ScriptState* scriptState)
 {
     InjectedScriptCanvasModule result;
     result.ensureInjected(injectedScriptManager, scriptState);
     return result;
 }
 
 String InjectedScriptCanvasModule::source() const
 {
     return String(reinterpret_cast<const char*>(InjectedScriptCanvasModuleSource_js), sizeof(InjectedScriptCanvasModuleSource_js));
 }
 
-ScriptObject InjectedScriptCanvasModule::wrapCanvas2DContext(const ScriptObject& context)
+ScriptValue InjectedScriptCanvasModule::wrapCanvas2DContext(const ScriptValue& context)
 {
     return callWrapContextFunction("wrapCanvas2DContext", context);
 }
 
-ScriptObject InjectedScriptCanvasModule::wrapWebGLContext(const ScriptObject& glContext)
+ScriptValue InjectedScriptCanvasModule::wrapWebGLContext(const ScriptValue& glContext)
 {
     return callWrapContextFunction("wrapWebGLContext", glContext);
 }
 
-ScriptObject InjectedScriptCanvasModule::callWrapContextFunction(const String& functionName, const ScriptObject& context)
+ScriptValue InjectedScriptCanvasModule::callWrapContextFunction(const String& functionName, const ScriptValue& context)
 {
-    ScriptFunctionCall function(injectedScriptObject(), functionName);
+    ScriptFunctionCall function(injectedScriptValue(), functionName);
     function.appendArgument(context);
     bool hadException = false;
     ScriptValue resultValue = callFunctionWithEvalEnabled(function, hadException);
     if (hadException || resultValue.isEmpty() || !resultValue.isObject()) {
         ASSERT_NOT_REACHED();
-        return ScriptObject();
+        return ScriptValue();
     }
-    return ScriptObject(context.scriptState(), resultValue);
+    return resultValue;
 }
 
 void InjectedScriptCanvasModule::markFrameEnd()
 {
-    ScriptFunctionCall function(injectedScriptObject(), "markFrameEnd");
+    ScriptFunctionCall function(injectedScriptValue(), "markFrameEnd");
     RefPtr<JSONValue> resultValue;
     makeCall(function, &resultValue);
     ASSERT(resultValue);
 }
 
 void InjectedScriptCanvasModule::captureFrame(ErrorString* errorString, TraceLogId* traceLogId)
 {
     callStartCapturingFunction("captureFrame", errorString, traceLogId);
 }
 
 void InjectedScriptCanvasModule::startCapturing(ErrorString* errorString, TraceLogId* traceLogId)
 {
     callStartCapturingFunction("startCapturing", errorString, traceLogId);
 }
 
 void InjectedScriptCanvasModule::callStartCapturingFunction(const String& functionName, ErrorString* errorString, TraceLogId* traceLogId)
 {
-    ScriptFunctionCall function(injectedScriptObject(), functionName);
+    ScriptFunctionCall function(injectedScriptValue(), functionName);
     RefPtr<JSONValue> resultValue;
     makeCall(function, &resultValue);
     if (!resultValue || resultValue->type() != JSONValue::TypeString || !resultValue->asString(traceLogId))
         *errorString = "Internal error: " + functionName;
 }
 
 void InjectedScriptCanvasModule::stopCapturing(ErrorString* errorString, const TraceLogId& traceLogId)
 {
     callVoidFunctionWithTraceLogIdArgument("stopCapturing", errorString, traceLogId);
 }
 
 void InjectedScriptCanvasModule::dropTraceLog(ErrorString* errorString, const TraceLogId& traceLogId)
 {
     callVoidFunctionWithTraceLogIdArgument("dropTraceLog", errorString, traceLogId);
 }
 
 void InjectedScriptCanvasModule::callVoidFunctionWithTraceLogIdArgument(const String& functionName, ErrorString* errorString, const TraceLogId& traceLogId)
 {
-    ScriptFunctionCall function(injectedScriptObject(), functionName);
+    ScriptFunctionCall function(injectedScriptValue(), functionName);
     function.appendArgument(traceLogId);
     bool hadException = false;
     callFunctionWithEvalEnabled(function, hadException);
     ASSERT(!hadException);
     if (hadException)
         *errorString = "Internal error: " + functionName;
 }
 
 void InjectedScriptCanvasModule::traceLog(ErrorString* errorString, const TraceLogId& traceLogId, const int* startOffset, const int* maxLength, RefPtr<TraceLog>* traceLog)
 {
-    ScriptFunctionCall function(injectedScriptObject(), "traceLog");
+    ScriptFunctionCall function(injectedScriptValue(), "traceLog");
     function.appendArgument(traceLogId);
     if (startOffset)
         function.appendArgument(*startOffset);
     if (maxLength)
         function.appendArgument(*maxLength);
     RefPtr<JSONValue> resultValue;
     makeCall(function, &resultValue);
     if (!resultValue || resultValue->type() != JSONValue::TypeObject) {
         if (!resultValue->asString(errorString))
             *errorString = "Internal error: traceLog";
         return;
     }
     *traceLog = TraceLog::runtimeCast(resultValue);
 }
 
 void InjectedScriptCanvasModule::replayTraceLog(ErrorString* errorString, const TraceLogId& traceLogId, int stepNo, RefPtr<ResourceState>* result, double* replayTime)
 {
-    ScriptFunctionCall function(injectedScriptObject(), "replayTraceLog");
+    ScriptFunctionCall function(injectedScriptValue(), "replayTraceLog");
     function.appendArgument(traceLogId);
     function.appendArgument(stepNo);
     RefPtr<JSONValue> resultValue;
     makeCall(function, &resultValue);
     if (!resultValue || resultValue->type() != JSONValue::TypeObject) {
         if (!resultValue->asString(errorString))
             *errorString = "Internal error: replayTraceLog";
         return;
     }
     RefPtr<JSONObject> resultObject = resultValue->asObject();
     RefPtr<JSONObject> resourceStateObject = resultObject->getObject("resourceState");
     if (!resourceStateObject) {
         *errorString = "Internal error: replayTraceLog: no resourceState";
         return;
     }
     *result = ResourceState::runtimeCast(resourceStateObject);
     if (!resultObject->getNumber("replayTime", replayTime))
         *errorString = "Internal error: replayTraceLog: no replayTime";
 }
 
 void InjectedScriptCanvasModule::resourceState(ErrorString* errorString, const TraceLogId& traceLogId, const ResourceId& resourceId, RefPtr<ResourceState>* result)
 {
-    ScriptFunctionCall function(injectedScriptObject(), "resourceState");
+    ScriptFunctionCall function(injectedScriptValue(), "resourceState");
     function.appendArgument(traceLogId);
     function.appendArgument(resourceId);
     RefPtr<JSONValue> resultValue;
     makeCall(function, &resultValue);
     if (!resultValue || resultValue->type() != JSONValue::TypeObject) {
         if (!resultValue->asString(errorString))
             *errorString = "Internal error: resourceState";
         return;
     }
     *result = ResourceState::runtimeCast(resultValue);
 }
 
 void InjectedScriptCanvasModule::evaluateTraceLogCallArgument(ErrorString* errorString, const TraceLogId& traceLogId, int callIndex, int argumentIndex, const String& objectGroup, RefPtr<RemoteObject>* result, RefPtr<ResourceState>* resourceState)
 {
-    ScriptFunctionCall function(injectedScriptObject(), "evaluateTraceLogCallArgument");
+    ScriptFunctionCall function(injectedScriptValue(), "evaluateTraceLogCallArgument");
     function.appendArgument(traceLogId);
     function.appendArgument(callIndex);
     function.appendArgument(argumentIndex);
     function.appendArgument(objectGroup);
     RefPtr<JSONValue> resultValue;
     makeCall(function, &resultValue);
     if (!resultValue || resultValue->type() != JSONValue::TypeObject) {
         if (!resultValue->asString(errorString))
             *errorString = "Internal error: evaluateTraceLogCallArgument";
         return;
     }
     RefPtr<JSONObject> resultObject = resultValue->asObject();
     RefPtr<JSONObject> remoteObject = resultObject->getObject("result");
     if (remoteObject)
         *result = RemoteObject::runtimeCast(remoteObject);
     RefPtr<JSONObject> resourceStateObject = resultObject->getObject("resourceState");
     if (resourceStateObject)
         *resourceState = ResourceState::runtimeCast(resourceStateObject);
     if (!remoteObject && !resourceStateObject)
         *errorString = "Internal error: no result and no resource state";
 }
 
 } // namespace WebCore