Update To 11.40.268.0

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

diff --git a/src/third_party/WebKit/Source/core/inspector/InjectedScriptCanvasModule.h b/src/third_party/WebKit/Source/core/inspector/InjectedScriptCanvasModule.h
index 9a675eb..bfecfe2 100644 (file)
--- a/src/third_party/WebKit/Source/core/inspector/InjectedScriptCanvasModule.h
+++ b/src/third_party/WebKit/Source/core/inspector/InjectedScriptCanvasModule.h
@@ -31,26 +31,26 @@
 #ifndef InjectedScriptCanvasModule_h
 #define InjectedScriptCanvasModule_h
 
-#include "bindings/v8/ScriptState.h"
+#include "bindings/core/v8/ScriptState.h"
 #include "core/inspector/InjectedScriptModule.h"
 #include "wtf/text/WTFString.h"
 
-namespace WebCore {
+namespace blink {
 
 class InjectedScriptManager;
-class ScriptObject;
+class ScriptValue;
 
 
-class InjectedScriptCanvasModule : public InjectedScriptModule {
+class InjectedScriptCanvasModule final : public InjectedScriptModule {
 public:
     InjectedScriptCanvasModule();
 
-    virtual String source() const;
+    virtual String source() const override;
 
     static InjectedScriptCanvasModule moduleForState(InjectedScriptManager*, ScriptState*);
 
-    ScriptObject wrapCanvas2DContext(const ScriptObject&);
-    ScriptObject wrapWebGLContext(const ScriptObject&);
+    ScriptValue wrapCanvas2DContext(const ScriptValue&);
+    ScriptValue wrapWebGLContext(const ScriptValue&);
     void markFrameEnd();
 
     void captureFrame(ErrorString*, TypeBuilder::Canvas::TraceLogId*);
@@ -63,12 +63,12 @@ public:
     void evaluateTraceLogCallArgument(ErrorString*, const TypeBuilder::Canvas::TraceLogId&, int, int, const String&, RefPtr<TypeBuilder::Runtime::RemoteObject>*, RefPtr<TypeBuilder::Canvas::ResourceState>*);
 
 private:
-    ScriptObject callWrapContextFunction(const String&, const ScriptObject&);
+    ScriptValue callWrapContextFunction(const String&, const ScriptValue&);
     void callStartCapturingFunction(const String&, ErrorString*, String*);
     void callVoidFunctionWithTraceLogIdArgument(const String&, ErrorString*, const String&);
 };
 
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // !defined(InjectedScriptCanvasModule_h)