| Index: Source/core/inspector/InjectedScriptCanvasModule.cpp | 
| diff --git a/Source/core/inspector/InjectedScriptCanvasModule.cpp b/Source/core/inspector/InjectedScriptCanvasModule.cpp | 
| deleted file mode 100644 | 
| index e9877485fa678a891c17bd5c7e6d11024d849b0c..0000000000000000000000000000000000000000 | 
| --- a/Source/core/inspector/InjectedScriptCanvasModule.cpp | 
| +++ /dev/null | 
| @@ -1,218 +0,0 @@ | 
| -/* | 
| - * 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 | 
| - * copyright notice, this list of conditions and the following disclaimer | 
| - * in the documentation and/or other materials provided with the | 
| - * distribution. | 
| - *     * Neither the name of Google Inc. nor the names of its | 
| - * contributors may be used to endorse or promote products derived from | 
| - * this software without specific prior written permission. | 
| - * | 
| - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | 
| - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | 
| - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 
| - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 
| - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 
| - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 
| - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 
| - * 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 "core/inspector/InjectedScriptCanvasModule.h" | 
| - | 
| -#include "bindings/core/v8/ScriptFunctionCall.h" | 
| -#include "bindings/core/v8/ScriptValue.h" | 
| -#include "public/platform/Platform.h" | 
| -#include "public/platform/WebData.h" | 
| - | 
| -using blink::TypeBuilder::Array; | 
| -using blink::TypeBuilder::Canvas::ResourceId; | 
| -using blink::TypeBuilder::Canvas::ResourceState; | 
| -using blink::TypeBuilder::Canvas::TraceLog; | 
| -using blink::TypeBuilder::Canvas::TraceLogId; | 
| -using blink::TypeBuilder::Runtime::RemoteObject; | 
| - | 
| -namespace blink { | 
| - | 
| -InjectedScriptCanvasModule::InjectedScriptCanvasModule() | 
| -    : InjectedScriptModule("InjectedScriptCanvasModule") | 
| -{ | 
| -} | 
| - | 
| -InjectedScriptCanvasModule InjectedScriptCanvasModule::moduleForState(InjectedScriptManager* injectedScriptManager, ScriptState* scriptState) | 
| -{ | 
| -    InjectedScriptCanvasModule result; | 
| -    result.ensureInjected(injectedScriptManager, scriptState); | 
| -    return result; | 
| -} | 
| - | 
| -String InjectedScriptCanvasModule::source() const | 
| -{ | 
| -    const blink::WebData& canvasModuleSourceResource = blink::Platform::current()->loadResource("InjectedScriptCanvasModuleSource.js"); | 
| -    return String(canvasModuleSourceResource.data(), canvasModuleSourceResource.size()); | 
| -} | 
| - | 
| -ScriptValue InjectedScriptCanvasModule::wrapCanvas2DContext(const ScriptValue& context) | 
| -{ | 
| -    return callWrapContextFunction("wrapCanvas2DContext", context); | 
| -} | 
| - | 
| -ScriptValue InjectedScriptCanvasModule::wrapWebGLContext(const ScriptValue& glContext) | 
| -{ | 
| -    return callWrapContextFunction("wrapWebGLContext", glContext); | 
| -} | 
| - | 
| -ScriptValue InjectedScriptCanvasModule::callWrapContextFunction(const String& functionName, const ScriptValue& context) | 
| -{ | 
| -    ScriptFunctionCall function(injectedScriptObject(), functionName); | 
| -    function.appendArgument(context); | 
| -    bool hadException = false; | 
| -    ScriptValue resultValue = callFunctionWithEvalEnabled(function, hadException); | 
| -    if (hadException || resultValue.isEmpty() || !resultValue.isObject()) { | 
| -        ASSERT_NOT_REACHED(); | 
| -        return ScriptValue(); | 
| -    } | 
| -    return resultValue; | 
| -} | 
| - | 
| -void InjectedScriptCanvasModule::markFrameEnd() | 
| -{ | 
| -    ScriptFunctionCall function(injectedScriptObject(), "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); | 
| -    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); | 
| -    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"); | 
| -    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"); | 
| -    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"); | 
| -    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"); | 
| -    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 blink | 
|  |