[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[podivilov at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 4cdcdc71bd25996224dd5ed83e815dd4a74325a1
Author: podivilov at chromium.org <podivilov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 30 15:28:57 2010 +0000

    2010-12-30  Pavel Podivilov  <podivilov at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Web Inspector: call stack shows "Paused on a JavaScript breakpoint" when stepping.
            https://bugs.webkit.org/show_bug.cgi?id=51748
    
            * inspector/front-end/CallStackSidebarPane.js:
            (WebInspector.CallStackSidebarPane.prototype.update):
            (WebInspector.CallStackSidebarPane.prototype.registerShortcuts):
            (WebInspector.CallStackSidebarPane.prototype._scriptBreakpointHit):
            (WebInspector.CallStackSidebarPane.prototype._nativeBreakpointHit):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74797 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0b10796..ebd1cd7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-30  Pavel Podivilov  <podivilov at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: call stack shows "Paused on a JavaScript breakpoint" when stepping.
+        https://bugs.webkit.org/show_bug.cgi?id=51748
+
+        * inspector/front-end/CallStackSidebarPane.js:
+        (WebInspector.CallStackSidebarPane.prototype.update):
+        (WebInspector.CallStackSidebarPane.prototype.registerShortcuts):
+        (WebInspector.CallStackSidebarPane.prototype._scriptBreakpointHit):
+        (WebInspector.CallStackSidebarPane.prototype._nativeBreakpointHit):
+
 2010-12-30  Mikhail Naganov  <mnaganov at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebCore/inspector/front-end/CallStackSidebarPane.js b/WebCore/inspector/front-end/CallStackSidebarPane.js
index 432260e..503e5f4 100644
--- a/WebCore/inspector/front-end/CallStackSidebarPane.js
+++ b/WebCore/inspector/front-end/CallStackSidebarPane.js
@@ -81,18 +81,10 @@ WebInspector.CallStackSidebarPane.prototype = {
             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);
+        if (WebInspector.debuggerModel.findBreakpoint(callFrames[0].sourceID, callFrames[0].line))
+            this._scriptBreakpointHit();
+        else if (eventType === WebInspector.DebuggerEventTypes.NativeBreakpoint)
+            this._nativeBreakpointHit(eventData);
     },
 
     get selectedCallFrame()
@@ -180,6 +172,26 @@ WebInspector.CallStackSidebarPane.prototype = {
         this._shortcuts[prevCallFrame.key] = this._selectPreviousCallFrameOnStack.bind(this);
 
         section.addRelatedKeys([ nextCallFrame.name, prevCallFrame.name ], WebInspector.UIString("Next/previous call frame"));
+    },
+
+    _scriptBreakpointHit: function()
+    {
+        var statusMessageElement = document.createElement("div");
+        statusMessageElement.className = "info";
+        statusMessageElement.appendChild(document.createTextNode(WebInspector.UIString("Paused on a JavaScript breakpoint.")));
+        this.bodyElement.appendChild(statusMessageElement);
+    },
+
+    _nativeBreakpointHit: function(eventData)
+    {
+        var breakpoint = WebInspector.breakpointManager.breakpointViewForEventData(eventData);
+        if (!breakpoint)
+            return;
+
+        var statusMessageElement = document.createElement("div");
+        statusMessageElement.className = "info";
+        breakpoint.populateStatusMessageElement(statusMessageElement, eventData);
+        this.bodyElement.appendChild(statusMessageElement);
     }
 }
 

-- 
WebKit Debian packaging