summaryrefslogtreecommitdiffstats
path: root/chromium/third_party/WebKit/Source/core/inspector/InjectedScriptCanvasModule.h
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/WebKit/Source/core/inspector/InjectedScriptCanvasModule.h')
-rw-r--r--chromium/third_party/WebKit/Source/core/inspector/InjectedScriptCanvasModule.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/chromium/third_party/WebKit/Source/core/inspector/InjectedScriptCanvasModule.h b/chromium/third_party/WebKit/Source/core/inspector/InjectedScriptCanvasModule.h
index 9a675eb6601..e4f6709725f 100644
--- a/chromium/third_party/WebKit/Source/core/inspector/InjectedScriptCanvasModule.h
+++ b/chromium/third_party/WebKit/Source/core/inspector/InjectedScriptCanvasModule.h
@@ -38,19 +38,19 @@
namespace WebCore {
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,7 +63,7 @@ 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&);
};