Merge DevTools Refactor CL to Blink36

Source/core/inspector/InspectorDebuggerAgent.h

Index: Source/core/inspector/InspectorDebuggerAgent.h
diff --git a/Source/core/inspector/InspectorDebuggerAgent.h b/Source/core/inspector/InspectorDebuggerAgent.h
index 64bc952653ae2c3e747d8b650a1b7f4f05424f99..7d400847ae7b3519d0e6e4fd038a0ec779193c5a 100644
--- a/Source/core/inspector/InspectorDebuggerAgent.h
+++ b/Source/core/inspector/InspectorDebuggerAgent.h
@@ -62,7 +62,9 @@ class KURL;
 class MutationObserver;
 class ScriptArguments;
 class ScriptCallStack;
+class ScriptCallFrame;
 class ScriptDebugServer;
+class ScriptDebugServerBase;
 class ScriptRegexp;
 class ScriptSourceCode;
 class ScriptValue;
@@ -134,6 +136,11 @@ public:
         RefPtr<TypeBuilder::Runtime::RemoteObject>& result,
         TypeBuilder::OptOutput<bool>* wasThrown) OVERRIDE FINAL;
     virtual void compileScript(ErrorString*, const String& expression, const String& sourceURL, const int* executionContextId, TypeBuilder::OptOutput<TypeBuilder::Debugger::ScriptId>*, TypeBuilder::OptOutput<String>* syntaxErrorMessage) OVERRIDE;
+    virtual void getCompletionsOnCallFrame(ErrorString*,
+        const String& callFrameId,
+        const String& expression,
+        RefPtr<TypeBuilder::Array<String> >& result) OVERRIDE FINAL;
+
     virtual void runScript(ErrorString*, const TypeBuilder::Debugger::ScriptId&, const int* executionContextId, const String* objectGroup, const bool* doNotPauseOnExceptionsAndMuteConsole, RefPtr<TypeBuilder::Runtime::RemoteObject>& result, TypeBuilder::OptOutput<bool>* wasThrown) OVERRIDE;
     virtual void setOverlayMessage(ErrorString*, const String*) OVERRIDE;
     virtual void setVariableValue(ErrorString*, int in_scopeNumber, const String& in_variableName, const RefPtr<JSONObject>& in_newValue, const String* in_callFrame, const String* in_functionObjectId) OVERRIDE FINAL;
@@ -180,14 +187,14 @@ public:
     };
     void setListener(Listener* listener) { m_listener = listener; }
 
-    virtual ScriptDebugServer& scriptDebugServer() = 0;
+    virtual ScriptDebugServerBase& scriptDebugServer() = 0;
 
     void setBreakpoint(const String& scriptId, int lineNumber, int columnNumber, BreakpointSource, const String& condition = String());
     void removeBreakpoint(const String& scriptId, int lineNumber, int columnNumber, BreakpointSource);
 
-    virtual SkipPauseRequest shouldSkipExceptionPause(RefPtr<JavaScriptCallFrame>& topFrame) OVERRIDE FINAL;
-    virtual SkipPauseRequest shouldSkipBreakpointPause(RefPtr<JavaScriptCallFrame>& topFrame) OVERRIDE FINAL;
-    virtual SkipPauseRequest shouldSkipStepPause(RefPtr<JavaScriptCallFrame>& topFrame) OVERRIDE FINAL;
+    virtual SkipPauseRequest shouldSkipExceptionPause(const ScriptCallFrame& topFrame) OVERRIDE FINAL;
+    virtual SkipPauseRequest shouldSkipBreakpointPause(const ScriptCallFrame& topFrame) OVERRIDE FINAL;
+    virtual SkipPauseRequest shouldSkipStepPause(const ScriptCallFrame& topFrame) OVERRIDE FINAL;
 
 protected:
     explicit InspectorDebuggerAgent(InjectedScriptManager*);
@@ -197,11 +204,11 @@ protected:
     virtual void muteConsole() = 0;
     virtual void unmuteConsole() = 0;
     InjectedScriptManager* injectedScriptManager() { return m_injectedScriptManager; }
-    virtual InjectedScript injectedScriptForEval(ErrorString*, const int* executionContextId) = 0;
+    virtual InjectedScript& injectedScriptForEval(ErrorString*, const int* executionContextId) = 0;
 
     virtual void enable();
     virtual void disable();
-    virtual void didPause(ScriptState*, const ScriptValue& callFrames, const ScriptValue& exception, const Vector<String>& hitBreakpoints) OVERRIDE FINAL;
+    virtual void didPause(ScriptState*, const StackTrace& callFrames, const ScriptValue& exception, const Vector<String>& hitBreakpoints) OVERRIDE FINAL;
     virtual void didContinue() OVERRIDE FINAL;
     void reset();
     void pageDidCommitLoad();
@@ -228,9 +235,8 @@ private:
 
     String sourceMapURLForScript(const Script&);
 
-    String scriptURL(JavaScriptCallFrame*);
-
-    ScriptValue resolveCallFrame(ErrorString*, const String* callFrameId);
+    ActivationFrame resolveCallFrame(ErrorString*, const String* callFrameId);
+    void collectAsyncCallStacks(Vector<StackTrace>& asyncCallStacks);
 
     typedef HashMap<String, Script> ScriptsMap;
     typedef HashMap<String, Vector<String> > BreakpointIdToDebugServerBreakpointIdsMap;
@@ -239,7 +245,7 @@ private:
     InjectedScriptManager* m_injectedScriptManager;
     InspectorFrontend::Debugger* m_frontend;
     RefPtr<ScriptState> m_pausedScriptState;
-    ScriptValue m_currentCallStack;
+    StackTrace m_currentCallStack;
     ScriptsMap m_scripts;
     BreakpointIdToDebugServerBreakpointIdsMap m_breakpointIdToDebugServerBreakpointIds;
     DebugServerBreakpointToBreakpointIdAndSourceMap m_serverBreakpoints;