Changeset 190542 in webkit for trunk/Source/JavaScriptCore/debugger/Breakpoint.h

Timestamp:

Oct 2, 2015, 8:18:19 PM (10 years ago)

Author:

Matt Baker

Message:

Web Inspector: Add breakpoint option to ignore n times before stopping
​https://bugs.webkit.org/show_bug.cgi?id=147664

Reviewed by Timothy Hatcher.

Source/JavaScriptCore:

• debugger/Breakpoint.h:

(JSC::Breakpoint::Breakpoint):
Added ignoreCount and hitCount fields. Cleaned up initializers.

• debugger/Debugger.cpp:

(JSC::Debugger::hasBreakpoint):
If a breakpoint matches the current text position, increment breakpoint hit count and
compare with ignore count before testing the breakpoint condition.

• inspector/ScriptBreakpoint.h:

(Inspector::ScriptBreakpoint::ScriptBreakpoint):
Added ignoreCount field. Cleaned up initializers.

• inspector/ScriptDebugServer.cpp:

(Inspector::ScriptDebugServer::setBreakpoint):
Added ignoreCount field.

• inspector/agents/InspectorDebuggerAgent.cpp:

(Inspector::buildObjectForBreakpointCookie):
(Inspector::InspectorDebuggerAgent::setBreakpointByUrl):
(Inspector::InspectorDebuggerAgent::setBreakpoint):
(Inspector::InspectorDebuggerAgent::continueToLocation):
(Inspector::InspectorDebuggerAgent::didParseSource):
Plumbing for ignoreCount property.

• inspector/protocol/Debugger.json:

Added optional ignoreCount property to BreakpointOptions object.

Source/WebInspectorUI:

• Localizations/en.lproj/localizedStrings.js:

New strings for breakpoint popover labels.

• UserInterface/Controllers/BreakpointPopoverController.js:

(WebInspector.BreakpointPopoverController.prototype._createPopoverContent):
Add ignoreCount UI to popover, if backend support exists. UI based on same
feature in Xcode's breakpoint editing dialog.
(WebInspector.BreakpointPopoverController.prototype._popoverIgnoreInputChanged):
User input sanity checks on numeric input.

• UserInterface/Controllers/DebuggerManager.js:

Listen for changes to breakpoint ignoreCount property.

• UserInterface/Models/Breakpoint.js:

(WebInspector.Breakpoint):
(WebInspector.Breakpoint.prototype.get ignoreCount):
(WebInspector.Breakpoint.prototype.set ignoreCount):
New property for ignoreCount.
(WebInspector.Breakpoint.prototype.get options):
Added ignoreCount to options object.
(WebInspector.Breakpoint.prototype.get info):
Added ignoreCount to info object.

• UserInterface/Views/BreakpointPopoverController.css:

(#edit-breakpoint-popover-ignore):
New styles for breakpoint popover.

File:

• trunk/Source/JavaScriptCore/debugger/Breakpoint.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/debugger/Breakpoint.h

@@ -36 +36 @@
 struct Breakpoint : public DoublyLinkedListNode<Breakpoint> {
     Breakpoint()
-        : id(noBreakpointID)
-        , sourceID(noSourceID)
-        , line(0)
-        , column(0)
-        , autoContinue(false)
     {
     }
 
-    Breakpoint(SourceID sourceID, unsigned line, unsigned column, const String& condition, bool autoContinue)
-        : id(noBreakpointID)
-        , sourceID(sourceID)
+    Breakpoint(SourceID sourceID, unsigned line, unsigned column, const String& condition, bool autoContinue, unsigned ignoreCount)
+        : sourceID(sourceID)
         , line(line)
         , column(column)
         , condition(condition)
         , autoContinue(autoContinue)
+        , ignoreCount(ignoreCount)
     {
     }
@@ -61 +56 @@
         , condition(other.condition)
         , autoContinue(other.autoContinue)
+        , ignoreCount(other.ignoreCount)
+        , hitCount(other.hitCount)
     {
     }
 
-    BreakpointID id;
-    SourceID sourceID;
-    unsigned line;
-    unsigned column;
+    BreakpointID id { noBreakpointID };
+    SourceID sourceID { noSourceID };
+    unsigned line { 0 };
+    unsigned column { 0 };
     String condition;
-    bool autoContinue;
+    bool autoContinue { false };
+    unsigned ignoreCount { 0 };
+    unsigned hitCount { 0 };
 
     static const unsigned unspecifiedColumn = UINT_MAX;