1 files changed, 50 insertions, 3 deletions

diff --git a/src/3rdparty/webkit/JavaScriptCore/debugger/Debugger.h b/src/3rdparty/webkit/JavaScriptCore/debugger/Debugger.h
index 98d09358c..1ed39ec73 100644
--- a/src/3rdparty/webkit/JavaScriptCore/debugger/Debugger.h
+++ b/src/3rdparty/webkit/JavaScriptCore/debugger/Debugger.h
@@ -22,11 +22,11 @@
 #ifndef Debugger_h
 #define Debugger_h
 
+#include <debugger/DebuggerCallFrame.h>
 #include "Protect.h"
 
 namespace JSC {
 
-    class DebuggerCallFrame;
     class ExecState;
     class JSGlobalObject;
     class SourceCode;
@@ -40,15 +40,62 @@ namespace JSC {
         void attach(JSGlobalObject*);
         virtual void detach(JSGlobalObject*);
 
+#if PLATFORM(QT)
+#ifdef QT_BUILD_SCRIPT_LIB
+        virtual void scriptUnload(qint64 id)
+        {
+            UNUSED_PARAM(id);
+        };
+        virtual void scriptLoad(qint64 id, const UString &program,
+                            const UString &fileName, int baseLineNumber)
+        {
+            UNUSED_PARAM(id);
+            UNUSED_PARAM(program);
+            UNUSED_PARAM(fileName);
+            UNUSED_PARAM(baseLineNumber);
+        };
+        virtual void contextPush() {};
+        virtual void contextPop() {};
+
+        virtual void evaluateStart(intptr_t sourceID)
+        {
+            UNUSED_PARAM(sourceID);
+        }
+        virtual void evaluateStop(const JSC::JSValue& returnValue, intptr_t sourceID)
+        {
+            UNUSED_PARAM(sourceID);
+            UNUSED_PARAM(returnValue);
+        }
+
+        virtual void exceptionThrow(const JSC::DebuggerCallFrame& frame, intptr_t sourceID, bool hasHandler)
+        {
+            UNUSED_PARAM(frame);
+            UNUSED_PARAM(sourceID);
+            UNUSED_PARAM(hasHandler);
+        };
+        virtual void exceptionCatch(const JSC::DebuggerCallFrame& frame, intptr_t sourceID)
+        {
+            UNUSED_PARAM(frame);
+            UNUSED_PARAM(sourceID);
+        };
+
+        virtual void functionExit(const JSC::JSValue& returnValue, intptr_t sourceID)
+        {
+            UNUSED_PARAM(returnValue);
+            UNUSED_PARAM(sourceID);
+        };
+#endif
+#endif
+
         virtual void sourceParsed(ExecState*, const SourceCode&, int errorLine, const UString& errorMsg) = 0;
         virtual void exception(const DebuggerCallFrame&, intptr_t sourceID, int lineno) = 0;
-        virtual void atStatement(const DebuggerCallFrame&, intptr_t sourceID, int lineno) = 0;
+        virtual void atStatement(const DebuggerCallFrame&, intptr_t sourceID, int lineno, int column) = 0;
         virtual void callEvent(const DebuggerCallFrame&, intptr_t sourceID, int lineno) = 0;
         virtual void returnEvent(const DebuggerCallFrame&, intptr_t sourceID, int lineno) = 0;
 
         virtual void willExecuteProgram(const DebuggerCallFrame&, intptr_t sourceID, int lineno) = 0;
         virtual void didExecuteProgram(const DebuggerCallFrame&, intptr_t sourceID, int lineno) = 0;
-        virtual void didReachBreakpoint(const DebuggerCallFrame&, intptr_t sourceID, int lineno) = 0;
+        virtual void didReachBreakpoint(const DebuggerCallFrame&, intptr_t sourceID, int lineno, int column) = 0;
 
     private:
         HashSet<JSGlobalObject*> m_globalObjects;