From 99791c639dd95c082f551a62034d8959ce2cf15a Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Mon, 28 Feb 2011 17:44:23 +0000 Subject: Merge WebKit at Chromium 9.0.597.107: Initial merge by git. Note that we are tracking the Chromium 9.0.597 release branch, which is WebKit r72805 + stability cherry picks. This corresponds to r78920 on the 597 release branch. Change-Id: I610ebdbcba92cfa788b229ee207a405789d45e67 --- WebCore/inspector/front-end/ScriptsPanel.js | 5 +---- WebCore/inspector/front-end/SourceFrame.js | 5 ----- 2 files changed, 1 insertion(+), 9 deletions(-) (limited to 'WebCore/inspector') diff --git a/WebCore/inspector/front-end/ScriptsPanel.js b/WebCore/inspector/front-end/ScriptsPanel.js index 2a216cc..30bd513 100644 --- a/WebCore/inspector/front-end/ScriptsPanel.js +++ b/WebCore/inspector/front-end/ScriptsPanel.js @@ -245,9 +245,6 @@ WebInspector.ScriptsPanel.prototype = { // Resource is finished, bind the script right away. resource.addScript(script); this._sourceIDMap[sourceID] = resource; - var view = WebInspector.ResourceManager.existingResourceViewForResource(resource); - if (view && view.sourceFrame) - view.sourceFrame.addScript(script); } else { // Resource is not finished, bind the script later. if (!resource._scriptsPendingResourceLoad) { @@ -315,7 +312,7 @@ WebInspector.ScriptsPanel.prototype = { return; // Need to clear breakpoints and re-create them later when editing source. - var breakpoints = WebInspector.breakpointManager.breakpointsForSourceID(sourceID); + var breakpoints = WebInspector.breakpointManager.breakpointsForSourceID(editData.sourceID); for (var i = 0; i < breakpoints.length; ++i) breakpoints[i].remove(); diff --git a/WebCore/inspector/front-end/SourceFrame.js b/WebCore/inspector/front-end/SourceFrame.js index 6cf226b..8e077cd 100644 --- a/WebCore/inspector/front-end/SourceFrame.js +++ b/WebCore/inspector/front-end/SourceFrame.js @@ -132,11 +132,6 @@ WebInspector.SourceFrame.prototype = { this._addMessageToSource(msg); }, - addScript: function(script) - { - this._scripts[script.sourceID] = script; - }, - clearMessages: function() { for (var line in this._messageBubbles) { -- cgit v1.1