[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
pfeldman at chromium.org
pfeldman at chromium.org
Wed Dec 22 15:33:24 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 306c4914f6c08b71c4df1d8d62cb44ef065c6ca8
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Nov 8 10:12:36 2010 +0000
2010-11-06 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Yury Semikhatsky.
Web Inspector: add more event listener breakpoint types, add support for regular breakpoint hit state, beautify hit rendering.
https://bugs.webkit.org/show_bug.cgi?id=49130
* English.lproj/localizedStrings.js:
* inspector/front-end/BreakpointManager.js:
(WebInspector.BreakpointManager.prototype.debuggerPaused):
(WebInspector.Breakpoint.jsBreakpointId):
(WebInspector.Breakpoint.prototype.get id):
* inspector/front-end/BreakpointsSidebarPane.js:
(WebInspector.EventListenerBreakpointsSidebarPane):
(WebInspector.EventListenerBreakpointsSidebarPane.prototype._createCategory):
* inspector/front-end/ScriptsPanel.js:
(WebInspector.ScriptsPanel):
* inspector/front-end/inspector.css:
(#elements-sidebar):
(.pane > .body):
(#scripts-sidebar):
(li.breakpoint-hit .breakpoint-hit-marker):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71506 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 879dae7..e41ab37 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,26 @@
+2010-11-06 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Yury Semikhatsky.
+
+ Web Inspector: add more event listener breakpoint types, add support for regular breakpoint hit state, beautify hit rendering.
+ https://bugs.webkit.org/show_bug.cgi?id=49130
+
+ * English.lproj/localizedStrings.js:
+ * inspector/front-end/BreakpointManager.js:
+ (WebInspector.BreakpointManager.prototype.debuggerPaused):
+ (WebInspector.Breakpoint.jsBreakpointId):
+ (WebInspector.Breakpoint.prototype.get id):
+ * inspector/front-end/BreakpointsSidebarPane.js:
+ (WebInspector.EventListenerBreakpointsSidebarPane):
+ (WebInspector.EventListenerBreakpointsSidebarPane.prototype._createCategory):
+ * inspector/front-end/ScriptsPanel.js:
+ (WebInspector.ScriptsPanel):
+ * inspector/front-end/inspector.css:
+ (#elements-sidebar):
+ (.pane > .body):
+ (#scripts-sidebar):
+ (li.breakpoint-hit .breakpoint-hit-marker):
+
2010-11-08 Adam Barth <abarth at webkit.org>
Reviewed by Antti Koivisto.
diff --git a/WebCore/English.lproj/localizedStrings.js b/WebCore/English.lproj/localizedStrings.js
index 02e2143..eae9749 100644
Binary files a/WebCore/English.lproj/localizedStrings.js and b/WebCore/English.lproj/localizedStrings.js differ
diff --git a/WebCore/inspector/front-end/BreakpointManager.js b/WebCore/inspector/front-end/BreakpointManager.js
index 221a777..3d51092 100644
--- a/WebCore/inspector/front-end/BreakpointManager.js
+++ b/WebCore/inspector/front-end/BreakpointManager.js
@@ -230,10 +230,17 @@ WebInspector.BreakpointManager.prototype = {
debuggerPaused: function(details)
{
- if (details.eventType !== WebInspector.DebuggerEventTypes.NativeBreakpoint)
+ if (details.eventType === WebInspector.DebuggerEventTypes.JavaScriptPause)
return;
- var breakpoint = this._breakpoints[details.eventData.breakpointId];
+ if (details.eventData && details.eventData.breakpointId)
+ var breakpointId = details.eventData.breakpointId;
+ else if (details.callFrames && details.callFrames.length)
+ var breakpointId = WebInspector.Breakpoint.jsBreakpointId(details.callFrames[0].sourceID, details.callFrames[0].line);
+ else
+ return;
+
+ var breakpoint = this._breakpoints[breakpointId];
if (!breakpoint)
return;
@@ -323,6 +330,11 @@ WebInspector.Breakpoint = function(breakpointManager, sourceID, url, line, enabl
this._breakpointManager = breakpointManager;
}
+WebInspector.Breakpoint.jsBreakpointId = function(sourceID, line)
+{
+ return sourceID + ":" + line;
+}
+
WebInspector.Breakpoint.prototype = {
get enabled()
{
@@ -352,7 +364,7 @@ WebInspector.Breakpoint.prototype = {
get id()
{
- return this.sourceID + ":" + this.line;
+ return WebInspector.Breakpoint.jsBreakpointId(this.sourceID, this.line);
},
get condition()
diff --git a/WebCore/inspector/front-end/BreakpointsSidebarPane.js b/WebCore/inspector/front-end/BreakpointsSidebarPane.js
index f010330..47194da 100644
--- a/WebCore/inspector/front-end/BreakpointsSidebarPane.js
+++ b/WebCore/inspector/front-end/BreakpointsSidebarPane.js
@@ -259,9 +259,16 @@ WebInspector.EventListenerBreakpointsSidebarPane = function()
WebInspector.breakpointManager.addEventListener("event-listener-breakpoint-added", this._breakpointAdded, this);
this._breakpointItems = {};
+ this._createCategory("Keyboard", "listener", ["keydown", "keyup", "keypress", "textInput"]);
this._createCategory("Mouse", "listener", ["click", "dblclick", "mousedown", "mouseup", "mouseover", "mousemove", "mouseout", "mousewheel"]);
- this._createCategory("Keyboard", "listener", ["keydown", "keypress", "keyup"]);
- this._createCategory("HTML frame/object", "listener", ["load", "error", "resize", "scroll"]);
+ // FIXME: uncomment following once inspector stops being drop targer in major ports.
+ // Otherwise, inspector page reacts on drop event and tries to load the event data.
+ // this._createCategory("Drag", "listener", ["drag", "drop", "dragstart", "dragend", "dragenter", "dragleave", "dragover"]);
+ this._createCategory("Control", "listener", ["resize", "scroll", "zoom", "focus", "blur", "select", "change", "submit", "reset"]);
+ this._createCategory("Clipboard", "listener", ["copy", "cut", "paste", "beforecopy", "beforecut", "beforepaste"]);
+ this._createCategory("Load", "listener", ["load", "unload", "abort", "error"]);
+ this._createCategory("DOM Mutation", "listener", ["DOMActivate", "DOMFocusIn", "DOMFocusOut", "DOMAttrModified", "DOMCharacterDataModified", "DOMNodeInserted", "DOMNodeInsertedIntoDocument", "DOMNodeRemoved", "DOMNodeRemovedFromDocument", "DOMSubtreeModified", "DOMContentLoaded"]);
+ this._createCategory("Device", "listener", ["deviceorientation", "devicemotion"]);
this._createCategory("Timer", "instrumentation", ["setTimer", "clearTimer", "timerFired"]);
}
@@ -285,6 +292,9 @@ WebInspector.EventListenerBreakpointsSidebarPane.prototype = {
var title = WebInspector.EventListenerBreakpoint.eventNameForUI(eventName);
breakpointItem.element = new TreeElement(title);
categoryItem.element.appendChild(breakpointItem.element);
+ var hitMarker = document.createElement("div");
+ hitMarker.className = "breakpoint-hit-marker";
+ breakpointItem.element.listItemElement.appendChild(hitMarker);
breakpointItem.element.listItemElement.addStyleClass("source-code");
breakpointItem.element.selectable = true;
diff --git a/WebCore/inspector/front-end/ScriptsPanel.js b/WebCore/inspector/front-end/ScriptsPanel.js
index 66260f9..1643325 100644
--- a/WebCore/inspector/front-end/ScriptsPanel.js
+++ b/WebCore/inspector/front-end/ScriptsPanel.js
@@ -135,8 +135,8 @@ WebInspector.ScriptsPanel = function()
if (Preferences.nativeInstrumentationEnabled) {
this.sidebarPanes.domBreakpoints = WebInspector.createDOMBreakpointsSidebarPane();
this.sidebarPanes.xhrBreakpoints = WebInspector.createXHRBreakpointsSidebarPane();
+ this.sidebarPanes.eventListenerBreakpoints = new WebInspector.EventListenerBreakpointsSidebarPane();
}
- this.sidebarPanes.eventListenerBreakpoints = new WebInspector.EventListenerBreakpointsSidebarPane();
this.sidebarPanes.workers = new WebInspector.WorkersSidebarPane();
diff --git a/WebCore/inspector/front-end/inspector.css b/WebCore/inspector/front-end/inspector.css
index b26b748..be0bcf7 100644
--- a/WebCore/inspector/front-end/inspector.css
+++ b/WebCore/inspector/front-end/inspector.css
@@ -1033,7 +1033,6 @@ body.platform-linux .monospace, body.platform-linux .source-code {
right: 0;
bottom: 0;
width: 325px;
- background-color: rgb(245, 245, 245);
border-left: 1px solid rgb(64%, 64%, 64%);
cursor: default;
overflow: auto;
@@ -1716,7 +1715,6 @@ li.editing .swatch, li.editing .enabled-button, li.editing-sub-part .delete-but
.pane > .body {
position: relative;
display: none;
- background-color: white;
overflow-y: auto;
overflow-x: hidden;
}
@@ -2632,7 +2630,6 @@ button.enable-toggle-status-bar-item.toggled-on .glyph {
right: 0;
bottom: 0;
width: 225px;
- background-color: rgb(245, 245, 245);
border-left: 1px solid rgb(64%, 64%, 64%);
cursor: default;
overflow: auto;
@@ -4125,6 +4122,16 @@ ol.breakpoint-list {
background-color: rgb(255, 255, 194);
}
+li.breakpoint-hit .breakpoint-hit-marker {
+ background-color: rgb(255, 255, 194);
+ height: 18px;
+ left: 0px;
+ margin-top: -16px;
+ position: absolute;
+ right: 0px;
+ z-index: -1;
+}
+
.webkit-html-js-node, .webkit-html-css-node {
white-space: pre;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list