Upstream version 9.37.197.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / bindings / v8 / ScriptDebugServer.h

diff --git a/src/third_party/WebKit/Source/bindings/v8/ScriptDebugServer.h b/src/third_party/WebKit/Source/bindings/v8/ScriptDebugServer.h
index bd3f138..ea8d35f 100644 (file)
--- a/src/third_party/WebKit/Source/bindings/v8/ScriptDebugServer.h
+++ b/src/third_party/WebKit/Source/bindings/v8/ScriptDebugServer.h
@@ -31,25 +31,26 @@
 #ifndef ScriptDebugServer_h
 #define ScriptDebugServer_h
 
-#include "InspectorBackendDispatcher.h"
 #include "bindings/v8/ScopedPersistent.h"
+#include "core/InspectorBackendDispatcher.h"
 #include "core/inspector/ScriptBreakpoint.h"
+#include "core/inspector/ScriptCallStack.h"
 #include "core/inspector/ScriptDebugListener.h"
-#include <v8-debug.h>
 #include "wtf/HashMap.h"
 #include "wtf/Noncopyable.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/Vector.h"
 #include "wtf/text/StringHash.h"
 #include "wtf/text/WTFString.h"
+#include <v8-debug.h>
+#include <v8.h>
 
 namespace WebCore {
 
+class ScriptState;
 class ScriptController;
 class ScriptDebugListener;
-class ScriptObject;
 class ScriptSourceCode;
-class ScriptState;
 class ScriptValue;
 class JavaScriptCallFrame;
 
@@ -74,12 +75,14 @@ public:
     void breakProgram();
     void continueProgram();
     void stepIntoStatement();
-    void stepOverStatement(const ScriptValue& frame);
-    void stepOutOfFunction(const ScriptValue& frame);
+    void stepOverStatement();
+    void stepOutOfFunction();
 
-    bool setScriptSource(const String& sourceID, const String& newContent, bool preview, String* error, RefPtr<TypeBuilder::Debugger::SetScriptSourceError>&, ScriptValue* newCallFrames, ScriptObject* result);
+    bool setScriptSource(const String& sourceID, const String& newContent, bool preview, String* error, RefPtr<TypeBuilder::Debugger::SetScriptSourceError>&, ScriptValue* newCallFrames, RefPtr<JSONObject>* result);
     ScriptValue currentCallFrames();
     ScriptValue currentCallFramesForAsyncStack();
+    PassRefPtrWillBeRawPtr<JavaScriptCallFrame> topCallFrameNoScopes();
+    int frameCount();
 
     class Task {
     public:
@@ -97,9 +100,9 @@ public:
     v8::Handle<v8::Value> setFunctionVariableValue(v8::Handle<v8::Value> functionValue, int scopeNumber, const String& variableName, v8::Handle<v8::Value> newValue);
     v8::Local<v8::Value> callDebuggerMethod(const char* functionName, int argc, v8::Handle<v8::Value> argv[]);
 
-    virtual void compileScript(ScriptState*, const String& expression, const String& sourceURL, String* scriptId, String* exceptionMessage);
+    virtual void compileScript(ScriptState*, const String& expression, const String& sourceURL, String* scriptId, String* exceptionDetailsText, int* lineNumber, int* columnNumber, RefPtrWillBeRawPtr<ScriptCallStack>* stackTrace);
     virtual void clearCompiledScripts();
-    virtual void runScript(ScriptState*, const String& scriptId, ScriptValue* result, bool* wasThrown, String* exceptionMessage);
+    virtual void runScript(ScriptState*, const String& scriptId, ScriptValue* result, bool* wasThrown, String* exceptionDetailsText, int* lineNumber, int* columnNumber, RefPtrWillBeRawPtr<ScriptCallStack>* stackTrace);
     virtual void setPreprocessorSource(const String&) { }
     virtual void preprocessBeforeCompile(const v8::Debug::EventDetails&) { }
     virtual PassOwnPtr<ScriptSourceCode> preprocess(LocalFrame*, const ScriptSourceCode&);
@@ -117,8 +120,7 @@ protected:
     virtual void quitMessageLoopOnPause() = 0;
 
     static void breakProgramCallback(const v8::FunctionCallbackInfo<v8::Value>&);
-    void handleProgramBreak(v8::Handle<v8::Object> executionState, v8::Handle<v8::Value> exception, v8::Handle<v8::Array> hitBreakpoints);
-    void handleProgramBreak(const v8::Debug::EventDetails&, v8::Handle<v8::Value> exception, v8::Handle<v8::Array> hitBreakpointNumbers);
+    void handleProgramBreak(ScriptState* pausedScriptState, v8::Handle<v8::Object> executionState, v8::Handle<v8::Value> exception, v8::Handle<v8::Array> hitBreakpoints);
 
     static void v8DebugEventCallback(const v8::Debug::EventDetails& eventDetails);
     void handleV8DebugEvent(const v8::Debug::EventDetails& eventDetails);
@@ -126,11 +128,12 @@ protected:
     void dispatchDidParseSource(ScriptDebugListener* listener, v8::Handle<v8::Object> sourceObject);
 
     void ensureDebuggerScriptCompiled();
+    void discardDebuggerScript();
 
     PauseOnExceptionsState m_pauseOnExceptionsState;
     ScopedPersistent<v8::Object> m_debuggerScript;
-    ScopedPersistent<v8::Object> m_executionState;
-    v8::Handle<v8::Context> m_pausedContext;
+    v8::Local<v8::Object> m_executionState;
+    RefPtr<ScriptState> m_pausedScriptState;
     bool m_breakpointsActivated;
     ScopedPersistent<v8::FunctionTemplate> m_breakProgramCallbackTemplate;
     HashMap<String, OwnPtr<ScopedPersistent<v8::Script> > > m_compiledScripts;
@@ -145,9 +148,7 @@ private:
 
     ScriptValue currentCallFramesInner(ScopeInfoDetails);
 
-    void stepCommandWithFrame(const char* functionName, const ScriptValue& frame);
-    PassRefPtr<JavaScriptCallFrame> wrapCallFrames(v8::Handle<v8::Object> executionState, int maximumLimit, ScopeInfoDetails);
-    bool executeSkipPauseRequest(ScriptDebugListener::SkipPauseRequest, v8::Handle<v8::Object> executionState);
+    PassRefPtrWillBeRawPtr<JavaScriptCallFrame> wrapCallFrames(int maximumLimit, ScopeInfoDetails);
 
     bool m_runningNestedMessageLoop;
 };