diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 08:15:24 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-25 08:15:24 -0700 |
| commit | fa91a01aee5d4a80ca6c80f722116b850f09996c (patch) | |
| tree | f72740e60d3c3d4f0ab144e88c03d1f134944ce3 /Source/WebCore/bindings/js/ScriptDebugServer.h | |
| parent | 96f37d6d1b390f6690858789706ee6ec25bc1677 (diff) | |
| parent | feebf8e7a79ad68b04a1a948e2b8078d6e5f0048 (diff) | |
| download | external_webkit-fa91a01aee5d4a80ca6c80f722116b850f09996c.zip external_webkit-fa91a01aee5d4a80ca6c80f722116b850f09996c.tar.gz external_webkit-fa91a01aee5d4a80ca6c80f722116b850f09996c.tar.bz2 | |
Merge changes I78ff6a85,Ic85c6405,Ibf903baa,I3a0459db,I35140385,I54790419,I6bfe5d24,Ia9f39b83,I5bcecd5a,I1de96683,I543c6810,I8a5b0878,I0ae670bf,Ide4d58dc,I28ebaf3d,I499d6631,Ie5090e0d,I6d3e5f1f
* changes:
Merge WebKit at r78450: Update ThirdPartyProject.prop
Merge WebKit at r78450: Add new Font::canExpandAroundIdeographsInComplexText()
Merge WebKit at r78450: Add new ChromeClient::selectItemAlignmentFollowsMenuWritingDirection()
Merge WebKit at r78450: FrameLoaderClient::didRunInsecureContent() signature changed
Merge WebKit at r78450: HTMLAreaElement::getRect() renamed
Merge WebKit at r78450: FrameLoader::url() removed
Merge WebKit at r78450: HTMLParserQuirks removed
Merge WebKit at r78450: TextRun::padding() renamed
Merge WebKit at r78450: Use new FontMetrics
Merge WebKit at r78450: GraphicsContext current path removed
Merge WebKit at r78450: TransformationMatrix multiply methods renamed and meaning changed
Merge WebKit at r78450: FontCustomPlatformData::fontPlatformData() signature changed
Merge WebKit at r78450: IntRect::bottom()/right() renamed
Merge WebKit at r78450: Fix remaining conflicts
Merge WebKit at r78450: Fix conflicts due to new ENABLE_WEB_ARCHIVE guard
Merge WebKit at r78450: Fix conflicts in media controls
Merge WebKit at r78450: Fix Makefiles
Merge WebKit at r78450: Initial merge by git.
Diffstat (limited to 'Source/WebCore/bindings/js/ScriptDebugServer.h')
| -rw-r--r-- | Source/WebCore/bindings/js/ScriptDebugServer.h | 11 |
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; }; |