Diff
Modified: trunk/Source/WebCore/ChangeLog (94293 => 94294)
--- trunk/Source/WebCore/ChangeLog 2011-09-01 14:09:41 UTC (rev 94293)
+++ trunk/Source/WebCore/ChangeLog 2011-09-01 14:20:03 UTC (rev 94294)
@@ -1,3 +1,17 @@
+2011-08-31 Pavel Podivilov <[email protected]>
+
+ Web Inspector: remove PresentationBreakpoint class.
+ https://bugs.webkit.org/show_bug.cgi?id=67275
+
+ Reviewed by Yury Semikhatsky.
+
+ * inspector/front-end/BreakpointsSidebarPane.js:
+ (WebInspector._javascript_BreakpointsSidebarPane.prototype.addBreakpoint.didRequestContent):
+ (WebInspector._javascript_BreakpointsSidebarPane.prototype.addBreakpoint):
+ * inspector/front-end/DebuggerPresentationModel.js:
+ (WebInspector.DebuggerPresentationModel.prototype._breakpointAdded):
+ (WebInspector.DebuggerPresentationModel.prototype._breakpointRemoved):
+
2011-08-31 Steve Block <[email protected]>
Clean up all mentions of Android in comments
Modified: trunk/Source/WebCore/inspector/front-end/BreakpointManager.js (94293 => 94294)
--- trunk/Source/WebCore/inspector/front-end/BreakpointManager.js 2011-09-01 14:09:41 UTC (rev 94293)
+++ trunk/Source/WebCore/inspector/front-end/BreakpointManager.js 2011-09-01 14:20:03 UTC (rev 94294)
@@ -233,6 +233,16 @@
}
}
this._forEachBreakpoint(resetOrDeleteBreakpoint.bind(this));
+
+ for (var id in this._breakpointsByUILocation) {
+ var empty = true;
+ for (var lineNumber in this._breakpointsByUILocation[id]) {
+ empty = false;
+ break;
+ }
+ if (empty)
+ delete this._breakpointsByUILocation[id];
+ }
}
}
Modified: trunk/Source/WebCore/inspector/front-end/BreakpointsSidebarPane.js (94293 => 94294)
--- trunk/Source/WebCore/inspector/front-end/BreakpointsSidebarPane.js 2011-09-01 14:09:41 UTC (rev 94293)
+++ trunk/Source/WebCore/inspector/front-end/BreakpointsSidebarPane.js 2011-09-01 14:20:03 UTC (rev 94294)
@@ -45,6 +45,10 @@
WebInspector._javascript_BreakpointsSidebarPane.prototype = {
addBreakpoint: function(breakpoint)
{
+ var breakpointItemId = this._createBreakpointItemId(breakpoint.uiSourceCode, breakpoint.lineNumber);
+ if (breakpointItemId in this._items)
+ return;
+
var element = document.createElement("li");
element.addStyleClass("cursor-pointer");
element.addEventListener("contextmenu", this._contextMenu.bind(this, breakpoint), true);
@@ -57,20 +61,21 @@
checkbox.addEventListener("click", this._breakpointCheckboxClicked.bind(this, breakpoint), false);
element.appendChild(checkbox);
- var displayName = breakpoint.url ? WebInspector.displayNameForURL(breakpoint.url) : WebInspector.UIString("(program)");
+ var url = ""
+ var displayName = url ? WebInspector.displayNameForURL(url) : WebInspector.UIString("(program)");
var labelElement = document.createTextNode(displayName + ":" + (breakpoint.lineNumber + 1));
element.appendChild(labelElement);
var snippetElement = document.createElement("div");
snippetElement.className = "source-text monospace";
element.appendChild(snippetElement);
- if (breakpoint.loadSnippet) {
- function didLoadSnippet(snippet)
- {
- snippetElement.textContent = snippet;
- }
- breakpoint.loadSnippet(didLoadSnippet);
+ function didRequestContent(mimeType, content)
+ {
+ var lineEndings = content.lineEndings();
+ if (breakpoint.lineNumber < lineEndings.length)
+ snippetElement.textContent = content.substring(lineEndings[breakpoint.lineNumber - 1], lineEndings[breakpoint.lineNumber]);
}
+ breakpoint.uiSourceCode.requestContent(didRequestContent.bind(this));
element._data = breakpoint;
var currentElement = this.listElement.firstChild;
@@ -84,7 +89,7 @@
var breakpointItem = {};
breakpointItem.element = element;
breakpointItem.checkbox = checkbox;
- this._items[this._createBreakpointItemId(breakpoint.uiSourceCode, breakpoint.lineNumber)] = breakpointItem;
+ this._items[breakpointItemId] = breakpointItem;
if (!this.expanded)
this.expanded = true;
Modified: trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js (94293 => 94294)
--- trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js 2011-09-01 14:09:41 UTC (rev 94293)
+++ trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js 2011-09-01 14:20:03 UTC (rev 94294)
@@ -357,17 +357,14 @@
_breakpointAdded: function(breakpoint)
{
- if (!breakpoint.uiSourceCode)
- return;
- var presentationBreakpoint = new WebInspector.PresentationBreakpoint(breakpoint.uiSourceCode, breakpoint.lineNumber, breakpoint.condition, breakpoint.enabled);
- this.dispatchEventToListeners(WebInspector.DebuggerPresentationModel.Events.BreakpointAdded, presentationBreakpoint);
+ if (breakpoint.uiSourceCode)
+ this.dispatchEventToListeners(WebInspector.DebuggerPresentationModel.Events.BreakpointAdded, breakpoint);
},
_breakpointRemoved: function(breakpoint)
{
- if (!breakpoint.uiSourceCode)
- return;
- this.dispatchEventToListeners(WebInspector.DebuggerPresentationModel.Events.BreakpointRemoved, { uiSourceCode: breakpoint.uiSourceCode, lineNumber: breakpoint.lineNumber });
+ if (breakpoint.uiSourceCode)
+ this.dispatchEventToListeners(WebInspector.DebuggerPresentationModel.Events.BreakpointRemoved, breakpoint);
},
_debuggerPaused: function()
@@ -449,42 +446,6 @@
/**
* @constructor
*/
-WebInspector.PresentationBreakpoint = function(uiSourceCode, lineNumber, condition, enabled)
-{
- this.uiSourceCode = uiSourceCode;
- this.lineNumber = lineNumber;
- this.condition = condition;
- this.enabled = enabled;
-}
-
-WebInspector.PresentationBreakpoint.prototype = {
- get url()
- {
- return this.uiSourceCode.url;
- },
-
- get resolved()
- {
- return !!this.location;
- },
-
- loadSnippet: function(callback)
- {
- function didRequestContent(mimeType, content)
- {
- var lineEndings = content.lineEndings();
- var snippet = "";
- if (this.lineNumber < lineEndings.length)
- snippet = content.substring(lineEndings[this.lineNumber - 1], lineEndings[this.lineNumber]);
- callback(snippet);
- }
- this.uiSourceCode.requestContent(didRequestContent.bind(this));
- }
-}
-
-/**
- * @constructor
- */
WebInspector.PresenationCallFrame = function(callFrame, index, model, uiSourceCode)
{
this._callFrame = callFrame;
