| Index: Source/core/inspector/InspectorCanvasAgent.h
|
| diff --git a/Source/core/inspector/InspectorCanvasAgent.h b/Source/core/inspector/InspectorCanvasAgent.h
|
| index c6511396e7c61ed2b3096c9630c727fe4ec01731..1e7af0990afdfce7c355f8f7dfc318bdceaf42a9 100644
|
| --- a/Source/core/inspector/InspectorCanvasAgent.h
|
| +++ b/Source/core/inspector/InspectorCanvasAgent.h
|
| @@ -48,7 +48,7 @@ class InjectedScriptCanvasModule;
|
| class InjectedScriptManager;
|
| class InspectorPageAgent;
|
| class InstrumentingAgents;
|
| -class ScriptObject;
|
| +class ScriptValue;
|
|
|
| typedef String ErrorString;
|
|
|
| @@ -69,8 +69,8 @@ public:
|
| void didBeginFrame();
|
|
|
| // Called from InspectorCanvasInstrumentation.
|
| - ScriptObject wrapCanvas2DRenderingContextForInstrumentation(const ScriptObject&);
|
| - ScriptObject wrapWebGLRenderingContextForInstrumentation(const ScriptObject&);
|
| + ScriptValue wrapCanvas2DRenderingContextForInstrumentation(const ScriptValue&);
|
| + ScriptValue wrapWebGLRenderingContextForInstrumentation(const ScriptValue&);
|
|
|
| // Called from the front-end.
|
| virtual void enable(ErrorString*) OVERRIDE;
|
| @@ -89,12 +89,12 @@ private:
|
| InspectorCanvasAgent(InspectorPageAgent*, InjectedScriptManager*);
|
|
|
| InjectedScriptCanvasModule injectedScriptCanvasModule(ErrorString*, ScriptState*);
|
| - InjectedScriptCanvasModule injectedScriptCanvasModule(ErrorString*, const ScriptObject&);
|
| + InjectedScriptCanvasModule injectedScriptCanvasModule(ErrorString*, const ScriptValue&);
|
| InjectedScriptCanvasModule injectedScriptCanvasModule(ErrorString*, const String&);
|
|
|
| void findFramesWithUninstrumentedCanvases();
|
| bool checkIsEnabled(ErrorString*) const;
|
| - ScriptObject notifyRenderingContextWasWrapped(const ScriptObject&);
|
| + ScriptValue notifyRenderingContextWasWrapped(const ScriptValue&);
|
|
|
| InspectorPageAgent* m_pageAgent;
|
| InjectedScriptManager* m_injectedScriptManager;
|
|
|