From ca9cb53ed1119a3fd98fafa0972ffeb56dee1c24 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Thu, 8 Jul 2010 12:51:48 +0100 Subject: Merge WebKit at r62496: Initial merge by git Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2 --- WebCore/inspector/front-end/ScriptsPanel.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'WebCore/inspector/front-end/ScriptsPanel.js') diff --git a/WebCore/inspector/front-end/ScriptsPanel.js b/WebCore/inspector/front-end/ScriptsPanel.js index c23db14..5563b93 100644 --- a/WebCore/inspector/front-end/ScriptsPanel.js +++ b/WebCore/inspector/front-end/ScriptsPanel.js @@ -224,9 +224,9 @@ WebInspector.ScriptsPanel.prototype = { hide: function() { - WebInspector.Panel.prototype.hide.call(this); if (this.visibleView) this.visibleView.hide(); + WebInspector.Panel.prototype.hide.call(this); }, get searchableViews() @@ -364,9 +364,10 @@ WebInspector.ScriptsPanel.prototype = { } for (var i = 0; i < breakpoints.length; ++i) { var breakpoint = breakpoints[i]; + var newLine = breakpoint.line; if (success && breakpoint.line >= line) - breakpoint.line += linesCountToShift; - WebInspector.breakpointManager.addBreakpoint(breakpoint); + newLine += linesCountToShift; + WebInspector.breakpointManager.setBreakpoint(sourceID, breakpoint.url, newLine, breakpoint.enabled, breakpoint.condition); } }; var callbackId = WebInspector.Callback.wrap(mycallback.bind(this)) -- cgit v1.1