[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:46:01 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit d90383007038357a7f181892d406e92236837ecb
Author: podivilov at chromium.org <podivilov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Dec 17 14:47:45 2010 +0000
2010-12-17 Pavel Podivilov <podivilov at chromium.org>
Reviewed by Pavel Feldman.
Web Inspector: add scripts parsed after resource load to SourceFrame.
https://bugs.webkit.org/show_bug.cgi?id=51243
* inspector/front-end/ScriptsPanel.js:
(WebInspector.ScriptsPanel.prototype._addScript):
* inspector/front-end/SourceFrame.js:
(WebInspector.SourceFrame.prototype.addScript):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74261 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 75d8de1..834fb80 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-17 Pavel Podivilov <podivilov at chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ Web Inspector: add scripts parsed after resource load to SourceFrame.
+ https://bugs.webkit.org/show_bug.cgi?id=51243
+
+ * inspector/front-end/ScriptsPanel.js:
+ (WebInspector.ScriptsPanel.prototype._addScript):
+ * inspector/front-end/SourceFrame.js:
+ (WebInspector.SourceFrame.prototype.addScript):
+
2010-12-17 Anton Muhin <antonm at chromium.org>
Reviewed by Yury Semikhatsky.
diff --git a/WebCore/inspector/front-end/ScriptsPanel.js b/WebCore/inspector/front-end/ScriptsPanel.js
index 9d06304..7387964 100644
--- a/WebCore/inspector/front-end/ScriptsPanel.js
+++ b/WebCore/inspector/front-end/ScriptsPanel.js
@@ -256,6 +256,9 @@ WebInspector.ScriptsPanel.prototype = {
if (resource.finished) {
// Resource is finished, bind the script right away.
script.resource = 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) {
diff --git a/WebCore/inspector/front-end/SourceFrame.js b/WebCore/inspector/front-end/SourceFrame.js
index 97e0d9d..0a05991 100644
--- a/WebCore/inspector/front-end/SourceFrame.js
+++ b/WebCore/inspector/front-end/SourceFrame.js
@@ -114,6 +114,11 @@ WebInspector.SourceFrame.prototype = {
this._addMessageToSource(msg);
},
+ addScript: function(script)
+ {
+ this._scripts[script.sourceID] = script;
+ },
+
clearMessages: function()
{
for (var line in this._messageBubbles) {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list