1 files changed, 4 insertions, 7 deletions
diff --git a/Source/WebCore/bindings/js/ScriptDebugServer.h b/Source/WebCore/bindings/js/ScriptDebugServer.h
index bde4736..428b254 100644
--- a/Source/WebCore/bindings/js/ScriptDebugServer.h
+++ b/Source/WebCore/bindings/js/ScriptDebugServer.h
@@ -64,7 +64,7 @@ public:
     void addListener(ScriptDebugListener*, Page*);
     void removeListener(ScriptDebugListener*, Page*);
 
-    String setBreakpoint(const String& sourceID, unsigned lineNumber, const String& condition, bool enabled, unsigned* actualLineNumber);
+    String setBreakpoint(const String& sourceID, const ScriptBreakpoint&, int* actualLineNumber, int* actualColumnNumber);
     void removeBreakpoint(const String& breakpointId);
     void clearBreakpoints();
     void setBreakpointsActivated(bool activated);
@@ -93,10 +93,6 @@ public:
 
     JavaScriptCallFrame* currentCallFrame();
 
-    void pageCreated(Page*);
-
-    bool isDebuggerAlwaysEnabled();
-
 private:
     typedef HashSet<ScriptDebugListener*> ListenerSet;
     typedef void (ScriptDebugServer::*JavaScriptExecutionCallback)(ScriptDebugListener*);
@@ -138,7 +134,8 @@ private:
     void didRemoveListener(Page*);
 
     typedef HashMap<Page*, ListenerSet*> PageListenersMap;
-    typedef HashMap<intptr_t, SourceBreakpoints> BreakpointsMap;
+    typedef HashMap<long, ScriptBreakpoint> LineToBreakpointMap;
+    typedef HashMap<intptr_t, LineToBreakpointMap> SourceIdToBreakpointsMap;
 
     PageListenersMap m_pageListenersMap;
     bool m_callingListeners;
@@ -150,7 +147,7 @@ private:
     bool m_breakpointsActivated;
     JavaScriptCallFrame* m_pauseOnCallFrame;
     RefPtr<JavaScriptCallFrame> m_currentCallFrame;
-    BreakpointsMap m_breakpoints;
+    SourceIdToBreakpointsMap m_sourceIdToBreakpoints;
     Timer<ScriptDebugServer> m_recompileTimer;
 };