Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / inspector / InjectedScriptCanvasModule.cpp

diff --git a/src/third_party/WebKit/Source/core/inspector/InjectedScriptCanvasModule.cpp b/src/third_party/WebKit/Source/core/inspector/InjectedScriptCanvasModule.cpp
index a844a10..e987748 100644 (file)
--- a/src/third_party/WebKit/Source/core/inspector/InjectedScriptCanvasModule.cpp
+++ b/src/third_party/WebKit/Source/core/inspector/InjectedScriptCanvasModule.cpp
@@ -31,18 +31,19 @@
 #include "config.h"
 #include "core/inspector/InjectedScriptCanvasModule.h"
 
-#include "InjectedScriptCanvasModuleSource.h"
-#include "bindings/v8/ScriptFunctionCall.h"
-#include "bindings/v8/ScriptObject.h"
+#include "bindings/core/v8/ScriptFunctionCall.h"
+#include "bindings/core/v8/ScriptValue.h"
+#include "public/platform/Platform.h"
+#include "public/platform/WebData.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;
+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 WebCore {
+namespace blink {
 
 InjectedScriptCanvasModule::InjectedScriptCanvasModule()
     : InjectedScriptModule("InjectedScriptCanvasModule")
@@ -58,20 +59,21 @@ InjectedScriptCanvasModule InjectedScriptCanvasModule::moduleForState(InjectedSc
 
 String InjectedScriptCanvasModule::source() const
 {
-    return String(reinterpret_cast<const char*>(InjectedScriptCanvasModuleSource_js), sizeof(InjectedScriptCanvasModuleSource_js));
+    const blink::WebData& canvasModuleSourceResource = blink::Platform::current()->loadResource("InjectedScriptCanvasModuleSource.js");
+    return String(canvasModuleSourceResource.data(), canvasModuleSourceResource.size());
 }
 
-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);
     function.appendArgument(context);
@@ -79,9 +81,9 @@ ScriptObject InjectedScriptCanvasModule::callWrapContextFunction(const String& f
     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()
@@ -213,4 +215,4 @@ void InjectedScriptCanvasModule::evaluateTraceLogCallArgument(ErrorString* error
         *errorString = "Internal error: no result and no resource state";
 }
 
-} // namespace WebCore
+} // namespace blink