[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9
eric at webkit.org
eric at webkit.org
Thu Feb 4 21:35:38 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit cc04df678cddfb1edccd6fbeb9aed3c2838ae9b3
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Feb 1 22:02:59 2010 +0000
2010-02-01 Alexander Pavlov <apavlov at chromium.org>
Reviewed by Pavel Feldman.
Web Inspector: lazy-load textual resources to avoid UI hangup
https://bugs.webkit.org/show_bug.cgi?id=34332
* inspector/front-end/ResourceView.js:
(WebInspector.ResourceView.prototype._innerSelectContentTab):
* inspector/front-end/SourceView.js:
(WebInspector.SourceView.prototype.show):
(WebInspector.SourceView.prototype.contentTabSelected):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54148 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d2b4ed6..8dcea8d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-02-01 Alexander Pavlov <apavlov at chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ Web Inspector: lazy-load textual resources to avoid UI hangup
+ https://bugs.webkit.org/show_bug.cgi?id=34332
+
+ * inspector/front-end/ResourceView.js:
+ (WebInspector.ResourceView.prototype._innerSelectContentTab):
+ * inspector/front-end/SourceView.js:
+ (WebInspector.SourceView.prototype.show):
+ (WebInspector.SourceView.prototype.contentTabSelected):
+
2010-02-01 Brady Eidson <beidson at apple.com>
Reviewed by Adele Peterson.
diff --git a/WebCore/inspector/front-end/ResourceView.js b/WebCore/inspector/front-end/ResourceView.js
index 334847e..b7b01ac 100644
--- a/WebCore/inspector/front-end/ResourceView.js
+++ b/WebCore/inspector/front-end/ResourceView.js
@@ -183,6 +183,8 @@ WebInspector.ResourceView.prototype = {
this.headersElement.addStyleClass("hidden");
if ("resize" in this)
this.resize();
+ if ("contentTabSelected" in this)
+ this.contentTabSelected();
},
_refreshURL: function()
diff --git a/WebCore/inspector/front-end/SourceView.js b/WebCore/inspector/front-end/SourceView.js
index 292b8af..d2eb699 100644
--- a/WebCore/inspector/front-end/SourceView.js
+++ b/WebCore/inspector/front-end/SourceView.js
@@ -41,7 +41,6 @@ WebInspector.SourceView.prototype = {
show: function(parentElement)
{
WebInspector.ResourceView.prototype.show.call(this, parentElement);
- this.setupSourceFrameIfNeeded();
this.sourceFrame.visible = true;
this.resize();
},
@@ -79,7 +78,12 @@ WebInspector.SourceView.prototype = {
delete this._frameNeedsSetup;
WebInspector.getResourceContent(this.resource.identifier, this._contentLoaded.bind(this));
},
-
+
+ contentTabSelected: function()
+ {
+ this.setupSourceFrameIfNeeded();
+ },
+
_contentLoaded: function(content)
{
this.sourceFrame.setContent(this.resource.mimeType, content);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list