Merge WebKit at r66079 : Initial merge by git

Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7

1 files changed, 7 insertions, 0 deletions

diff --git a/WebCore/bindings/v8/ScriptDebugServer.h b/WebCore/bindings/v8/ScriptDebugServer.h
index a1e0a47..d1fd71f 100644
--- a/WebCore/bindings/v8/ScriptDebugServer.h
+++ b/WebCore/bindings/v8/ScriptDebugServer.h
@@ -71,6 +71,7 @@ public:
     void setPauseOnExceptionsState(PauseOnExceptionsState pauseOnExceptionsState);
 
     void pause();
+    void breakProgram();
     void continueProgram();
     void stepIntoStatement();
     void stepOverStatement();
@@ -111,6 +112,9 @@ private:
     ScriptDebugServer();
     ~ScriptDebugServer() { }
 
+    static v8::Handle<v8::Value> breakProgramCallback(const v8::Arguments& args);
+    void breakProgram(v8::Handle<v8::Object> executionState);
+
     static void v8DebugEventCallback(const v8::Debug::EventDetails& eventDetails);
     void handleV8DebugEvent(const v8::Debug::EventDetails& eventDetails);
 
@@ -128,7 +132,10 @@ private:
     OwnHandle<v8::Object> m_executionState;
     OwnPtr<ClientMessageLoop> m_clientMessageLoop;
     Page* m_pausedPage;
+    v8::Local<v8::Context> m_pausedPageContext;
     bool m_enabled;
+
+    bool m_breakpointsActivated;
 };
 
 } // namespace WebCore