[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
podivilov at chromium.org
podivilov at chromium.org
Wed Dec 22 18:43:31 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit de8254c252e812ea39a999e7f1db8fb077886844
Author: podivilov at chromium.org <podivilov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 16 15:57:47 2010 +0000
2010-12-16 Pavel Podivilov <podivilov at 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):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74191 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 99fc395..da514ce 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2010-12-16 Pavel Podivilov <podivilov at 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 at chromium.org>
Reviewed by Jeremy Orlow.
diff --git a/WebCore/inspector/front-end/BreakpointManager.js b/WebCore/inspector/front-end/BreakpointManager.js
index 4d9d3aa..604da60 100644
--- a/WebCore/inspector/front-end/BreakpointManager.js
+++ b/WebCore/inspector/front-end/BreakpointManager.js
@@ -54,7 +54,6 @@ WebInspector.BreakpointManager.Events = {
DOMBreakpointAdded: "dom-breakpoint-added",
EventListenerBreakpointAdded: "event-listener-breakpoint-added",
XHRBreakpointAdded: "xhr-breakpoint-added",
- NativeBreakpointHit: "native-breakpoint-hit",
ProjectChanged: "project-changed"
}
@@ -152,14 +151,8 @@ WebInspector.BreakpointManager.prototype = {
this._saveBreakpoints();
},
- _debuggerPaused: function(event)
+ breakpointViewForEventData: function(eventData)
{
- var eventType = event.data.eventType;
- var eventData = event.data.eventData;
-
- if (eventType !== WebInspector.DebuggerEventTypes.NativeBreakpoint)
- return;
-
var breakpointId;
if (eventData.breakpointType === WebInspector.BreakpointManager.NativeBreakpointTypes.DOM)
breakpointId = this._createDOMBreakpointId(eventData.nodeId, eventData.type);
@@ -167,22 +160,33 @@ WebInspector.BreakpointManager.prototype = {
breakpointId = this._createEventListenerBreakpointId(eventData.eventName);
else if (eventData.breakpointType === WebInspector.BreakpointManager.NativeBreakpointTypes.XHR)
breakpointId = this._createXHRBreakpointId(eventData.breakpointURL);
-
var breakpoint = this._nativeBreakpoints[breakpointId];
- if (!breakpoint)
+ 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;
- breakpoint.view.hit = true;
- this._lastHitBreakpoint = breakpoint;
- this.dispatchEventToListeners(WebInspector.BreakpointManager.Events.NativeBreakpointHit, { breakpoint: breakpoint.view, eventData: eventData });
+ breakpointView.hit = true;
+ this._lastHitBreakpointView = breakpointView;
},
_debuggerResumed: function(event)
{
- if (!this._lastHitBreakpoint)
+ if (!this._lastHitBreakpointView)
return;
- this._lastHitBreakpoint.view.hit = false;
- delete this._lastHitBreakpoint;
+ this._lastHitBreakpointView.hit = false;
+ delete this._lastHitBreakpointView;
},
_projectChanged: function(event)
diff --git a/WebCore/inspector/front-end/CallStackSidebarPane.js b/WebCore/inspector/front-end/CallStackSidebarPane.js
index 40b96f3..432260e 100644
--- a/WebCore/inspector/front-end/CallStackSidebarPane.js
+++ b/WebCore/inspector/front-end/CallStackSidebarPane.js
@@ -26,12 +26,10 @@
WebInspector.CallStackSidebarPane = function()
{
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();
@@ -82,6 +80,19 @@ WebInspector.CallStackSidebarPane.prototype = {
this.placards.push(placard);
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);
},
get selectedCallFrame()
@@ -169,23 +180,6 @@ WebInspector.CallStackSidebarPane.prototype = {
this._shortcuts[prevCallFrame.key] = this._selectPreviousCallFrameOnStack.bind(this);
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);
}
}
diff --git a/WebCore/inspector/front-end/DebuggerModel.js b/WebCore/inspector/front-end/DebuggerModel.js
index cc87755..31c75e5 100644
--- a/WebCore/inspector/front-end/DebuggerModel.js
+++ b/WebCore/inspector/front-end/DebuggerModel.js
@@ -42,7 +42,6 @@ WebInspector.DebuggerModel.Events = {
ParsedScriptSource: "parsed-script-source",
FailedToParseScriptSource: "failed-to-parse-script-source",
BreakpointAdded: "breakpoint-added",
- BreakpointHit: "breakpoint-hit"
}
WebInspector.DebuggerModel.prototype = {
@@ -171,13 +170,11 @@ WebInspector.DebuggerModel.prototype = {
if (details.eventType === WebInspector.DebuggerEventTypes.JavaScriptPause || details.eventType === WebInspector.DebuggerEventTypes.NativeBreakpoint)
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);
},
resumedScript: function()
diff --git a/WebCore/inspector/front-end/ScriptsPanel.js b/WebCore/inspector/front-end/ScriptsPanel.js
index 1409f74..b12e58a 100644
--- a/WebCore/inspector/front-end/ScriptsPanel.js
+++ b/WebCore/inspector/front-end/ScriptsPanel.js
@@ -378,7 +378,7 @@ WebInspector.ScriptsPanel.prototype = {
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];
window.focus();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list