Changeset 74191 in webkit

Timestamp:

Dec 16, 2010 7:57:47 AM (13 years ago)

Author:

podivilov@chromium.org

Message:

2010-12-16 Pavel Podivilov <​podivilov@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: update CallStackSidebarPane placards and status message in the same event handler.
​https://bugs.webkit.org/show_bug.cgi?id=51174

• inspector/front-end/BreakpointManager.js: (WebInspector.BreakpointManager.prototype.breakpointViewForEventData): (WebInspector.BreakpointManager.prototype._debuggerPaused): (WebInspector.BreakpointManager.prototype._debuggerResumed):
• inspector/front-end/CallStackSidebarPane.js: (WebInspector.CallStackSidebarPane): (WebInspector.CallStackSidebarPane.prototype.update): (WebInspector.CallStackSidebarPane.prototype.registerShortcuts):
• inspector/front-end/DebuggerModel.js: (WebInspector.DebuggerModel.prototype.pausedScript):
• inspector/front-end/ScriptsPanel.js: (WebInspector.ScriptsPanel.prototype._debuggerPaused):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/BreakpointManager.js (modified) (3 diffs)
• inspector/front-end/CallStackSidebarPane.js (modified) (3 diffs)
• inspector/front-end/DebuggerModel.js (modified) (2 diffs)
• inspector/front-end/ScriptsPanel.js (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-16  Pavel Podivilov  <podivilov@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: update CallStackSidebarPane placards and status message in the same event handler.
+        https://bugs.webkit.org/show_bug.cgi?id=51174
+
+        * inspector/front-end/BreakpointManager.js:
+        (WebInspector.BreakpointManager.prototype.breakpointViewForEventData):
+        (WebInspector.BreakpointManager.prototype._debuggerPaused):
+        (WebInspector.BreakpointManager.prototype._debuggerResumed):
+        * inspector/front-end/CallStackSidebarPane.js:
+        (WebInspector.CallStackSidebarPane):
+        (WebInspector.CallStackSidebarPane.prototype.update):
+        (WebInspector.CallStackSidebarPane.prototype.registerShortcuts):
+        * inspector/front-end/DebuggerModel.js:
+        (WebInspector.DebuggerModel.prototype.pausedScript):
+        * inspector/front-end/ScriptsPanel.js:
+        (WebInspector.ScriptsPanel.prototype._debuggerPaused):
+
 2010-12-16  Hans Wennborg  <hans@chromium.org>
 

trunk/WebCore/inspector/front-end/BreakpointManager.js

@@ -55 +55 @@
     EventListenerBreakpointAdded: "event-listener-breakpoint-added",
     XHRBreakpointAdded: "xhr-breakpoint-added",
-    NativeBreakpointHit: "native-breakpoint-hit",
     ProjectChanged: "project-changed"
 }
@@ -153 +152 @@
     },
 
-    _debuggerPaused: function(event)
-    {
-        var eventType = event.data.eventType;
-        var eventData = event.data.eventData;
-
-        if (eventType !== WebInspector.DebuggerEventTypes.NativeBreakpoint)
-            return;
-
+    breakpointViewForEventData: function(eventData)
+    {
         var breakpointId;
         if (eventData.breakpointType === WebInspector.BreakpointManager.NativeBreakpointTypes.DOM)
@@ -168 +161 @@
         else if (eventData.breakpointType === WebInspector.BreakpointManager.NativeBreakpointTypes.XHR)
             breakpointId = this._createXHRBreakpointId(eventData.breakpointURL);
-
         var breakpoint = this._nativeBreakpoints[breakpointId];
-        if (!breakpoint)
-            return;
-
-        breakpoint.view.hit = true;
-        this._lastHitBreakpoint = breakpoint;
-        this.dispatchEventToListeners(WebInspector.BreakpointManager.Events.NativeBreakpointHit, { breakpoint: breakpoint.view, eventData: eventData });
+        if (breakpoint)
+            return breakpoint.view;
+    },
+
+    _debuggerPaused: function(event)
+    {
+        var eventType = event.data.eventType;
+        var eventData = event.data.eventData;
+
+        if (eventType !== WebInspector.DebuggerEventTypes.NativeBreakpoint)
+            return;
+
+        var breakpointView = this.breakpointViewForEventData(eventData);
+        if (!breakpointView)
+            return;
+
+        breakpointView.hit = true;
+        this._lastHitBreakpointView = breakpointView;
     },
 
     _debuggerResumed: function(event)
     {
-        if (!this._lastHitBreakpoint)
-            return;
-        this._lastHitBreakpoint.view.hit = false;
-        delete this._lastHitBreakpoint;
+        if (!this._lastHitBreakpointView)
+            return;
+        this._lastHitBreakpointView.hit = false;
+        delete this._lastHitBreakpointView;
     },
 

trunk/WebCore/inspector/front-end/CallStackSidebarPane.js

@@ -27 +27 @@
 {
     WebInspector.SidebarPane.call(this, WebInspector.UIString("Call Stack"));
-    WebInspector.breakpointManager.addEventListener(WebInspector.BreakpointManager.Events.NativeBreakpointHit, this._nativeBreakpointHit, this);
-    WebInspector.debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.BreakpointHit, this._scriptBreakpointHit, this);
 }
 
 WebInspector.CallStackSidebarPane.prototype = {
-    update: function(callFrames)
+    update: function(callFrames, eventType, eventData)
     {
         this.bodyElement.removeChildren();
@@ -83 +81 @@
             this.bodyElement.appendChild(placard.element);
         }
+
+        if (eventType === WebInspector.DebuggerEventTypes.JavaScriptPause)
+            return;
+
+        var statusMessageElement = document.createElement("div");
+        statusMessageElement.className = "info";
+        if (eventType === WebInspector.DebuggerEventTypes.NativeBreakpoint) {
+            var breakpoint = WebInspector.breakpointManager.breakpointViewForEventData(eventData);
+            if (breakpoint)
+                breakpoint.populateStatusMessageElement(statusMessageElement, eventData);
+        } else
+            statusMessageElement.appendChild(document.createTextNode(WebInspector.UIString("Paused on a JavaScript breakpoint.")));
+        this.bodyElement.appendChild(statusMessageElement);
     },
 
@@ -170 +181 @@
 
         section.addRelatedKeys([ nextCallFrame.name, prevCallFrame.name ], WebInspector.UIString("Next/previous call frame"));
-    },
-
-    _nativeBreakpointHit:  function(event)
-    {
-        var breakpoint = event.data.breakpoint;
-        var statusMessageElement = document.createElement("div");
-        statusMessageElement.className = "info";
-        breakpoint.populateStatusMessageElement(statusMessageElement, event.data.eventData);
-        this.bodyElement.appendChild(statusMessageElement);
-    },
-
-    _scriptBreakpointHit:  function(event)
-    {
-        var statusMessageElement = document.createElement("div");
-        statusMessageElement.className = "info";
-        statusMessageElement.appendChild(document.createTextNode(WebInspector.UIString("Paused on a JavaScript breakpoint.")));
-        this.bodyElement.appendChild(statusMessageElement);
     }
 }

trunk/WebCore/inspector/front-end/DebuggerModel.js

@@ -43 +43 @@
     FailedToParseScriptSource: "failed-to-parse-script-source",
     BreakpointAdded: "breakpoint-added",
-    BreakpointHit: "breakpoint-hit"
 }
 
@@ -172 +171 @@
             return;
 
-        var breakpointId = WebInspector.Breakpoint.jsBreakpointId(details.callFrames[0].sourceID, details.callFrames[0].line);
-        var breakpoint = this._breakpoints[breakpointId];
+        var breakpoint = this.findBreakpoint(details.callFrames[0].sourceID, details.callFrames[0].line);
         if (!breakpoint)
             return;
         breakpoint.hit = true;
         this._lastHitBreakpoint = breakpoint;
-        this.dispatchEventToListeners(WebInspector.DebuggerModel.Events.BreakpointHit, breakpoint);
     },
 

trunk/WebCore/inspector/front-end/ScriptsPanel.js

@@ -379 +379 @@
         WebInspector.currentPanel = this;
 
-        this.sidebarPanes.callstack.update(callFrames);
+        this.sidebarPanes.callstack.update(callFrames, event.data.eventType, event.data.eventData);
         this.sidebarPanes.callstack.selectedCallFrame = callFrames[0];