[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
pfeldman at chromium.org
pfeldman at chromium.org
Wed Dec 22 16:32:22 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 51f5f10a892efa14e57f9be921727c15d50962bd
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 25 13:21:40 2010 +0000
2010-11-25 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Yury Semikhatsky.
Web Inspector: reuse code for recreating resource views.
https://bugs.webkit.org/show_bug.cgi?id=50066
* inspector/front-end/NetworkItemView.js:
(WebInspector.NetworkItemView):
* inspector/front-end/NetworkPanel.js:
(WebInspector.NetworkPanel.prototype.refreshResource):
* inspector/front-end/ResourceManager.js:
(WebInspector.ResourceManager.resourceViewTypeMatchesResource):
(WebInspector.ResourceManager.resourceViewForResource):
(WebInspector.ResourceManager.recreateResourceView):
* inspector/front-end/ResourcesPanel.js:
(WebInspector.FrameResourceTreeElement.prototype._contentChanged):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72725 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 070b2af..425e30a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2010-11-25 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Yury Semikhatsky.
+
+ Web Inspector: reuse code for recreating resource views.
+ https://bugs.webkit.org/show_bug.cgi?id=50066
+
+ * inspector/front-end/NetworkItemView.js:
+ (WebInspector.NetworkItemView):
+ * inspector/front-end/NetworkPanel.js:
+ (WebInspector.NetworkPanel.prototype.refreshResource):
+ * inspector/front-end/ResourceManager.js:
+ (WebInspector.ResourceManager.resourceViewTypeMatchesResource):
+ (WebInspector.ResourceManager.resourceViewForResource):
+ (WebInspector.ResourceManager.recreateResourceView):
+ * inspector/front-end/ResourcesPanel.js:
+ (WebInspector.FrameResourceTreeElement.prototype._contentChanged):
+
2010-11-25 Hans Wennborg <hans at chromium.org>
Reviewed by Jeremy Orlow.
diff --git a/WebCore/inspector/front-end/NetworkItemView.js b/WebCore/inspector/front-end/NetworkItemView.js
index 3679676..927e840 100644
--- a/WebCore/inspector/front-end/NetworkItemView.js
+++ b/WebCore/inspector/front-end/NetworkItemView.js
@@ -35,15 +35,16 @@ WebInspector.NetworkItemView = function(resource)
this.element.addStyleClass("network-item-view");
this._headersView = new WebInspector.ResourceHeadersView(resource);
- this._contentView = WebInspector.ResourceManager.resourceViewForResource(resource);
+ // Do not store reference to content view - it can be recreated.
+ var contentView = WebInspector.ResourceManager.resourceViewForResource(resource);
this._cookiesView = new WebInspector.ResourceCookiesView(resource);
this._tabbedPane = new WebInspector.TabbedPane(this.element);
this._tabbedPane.appendTab("headers", WebInspector.UIString("Headers"), this._headersView);
- if (this._contentView.hasContent()) {
+ if (contentView.hasContent()) {
// Reusing this view, so hide it at first.
- this._contentView.visible = false;
- this._tabbedPane.appendTab("content", WebInspector.UIString("Content"), this._contentView);
+ contentView.visible = false;
+ this._tabbedPane.appendTab("content", WebInspector.UIString("Content"), contentView);
}
this._tabbedPane.appendTab("cookies", WebInspector.UIString("Cookies"), this._cookiesView);
diff --git a/WebCore/inspector/front-end/NetworkPanel.js b/WebCore/inspector/front-end/NetworkPanel.js
index 84de548..75350ca 100644
--- a/WebCore/inspector/front-end/NetworkPanel.js
+++ b/WebCore/inspector/front-end/NetworkPanel.js
@@ -790,27 +790,20 @@ WebInspector.NetworkPanel.prototype = {
this._staleResources.push(resource);
this._scheduleRefresh();
-
- if (!resource || !resource._resourcesView)
+
+ if (!resource)
return;
- if (WebInspector.ResourceManager.resourceViewTypeMatchesResource(resource, resource._resourcesView))
+ var oldView = WebInspector.ResourceManager.existingResourceViewForResource(resource);
+ if (!oldView)
return;
- var newView = WebInspector.ResourceManager.createResourceView(resource);
-
- var oldView = resource._resourcesView;
- var oldViewParentNode = oldView.visible ? oldView.element.parentNode : null;
-
- resource._resourcesView.detach();
- delete resource._resourcesView;
-
- resource._resourcesView = newView;
-
- if (oldViewParentNode)
- newView.show(oldViewParentNode);
+ if (WebInspector.ResourceManager.resourceViewTypeMatchesResource(resource))
+ return;
- WebInspector.panels.scripts.viewRecreated(oldView, newView);
+ var newView = WebInspector.ResourceManager.recreateResourceView(resource);
+ if (this.visibleView === oldView)
+ this.visibleView = newView;
},
canShowSourceLine: function(url, line)
diff --git a/WebCore/inspector/front-end/ResourceManager.js b/WebCore/inspector/front-end/ResourceManager.js
index fa23764..55147d7 100644
--- a/WebCore/inspector/front-end/ResourceManager.js
+++ b/WebCore/inspector/front-end/ResourceManager.js
@@ -445,8 +445,9 @@ WebInspector.ResourceManager.createResourceView = function(resource)
}
}
-WebInspector.ResourceManager.resourceViewTypeMatchesResource = function(resource, resourceView)
+WebInspector.ResourceManager.resourceViewTypeMatchesResource = function(resource)
{
+ var resourceView = resource._resourcesView;
switch (resource.category) {
case WebInspector.resourceCategories.documents:
case WebInspector.resourceCategories.stylesheets:
@@ -471,6 +472,28 @@ WebInspector.ResourceManager.resourceViewForResource = function(resource)
return resource._resourcesView;
}
+WebInspector.ResourceManager.recreateResourceView = function(resource)
+{
+ var newView = WebInspector.ResourceManager.createResourceView(resource);
+
+ var oldView = resource._resourcesView;
+ var oldViewParentNode = oldView.visible ? oldView.element.parentNode : null;
+ var scrollTop = oldView.scrollTop;
+
+ resource._resourcesView.detach();
+ delete resource._resourcesView;
+
+ resource._resourcesView = newView;
+
+ if (oldViewParentNode)
+ newView.show(oldViewParentNode);
+ if (scrollTop)
+ newView.scrollTop = scrollTop;
+
+ WebInspector.panels.scripts.viewRecreated(oldView, newView);
+ return newView;
+}
+
WebInspector.ResourceManager.existingResourceViewForResource = function(resource)
{
if (!resource)
diff --git a/WebCore/inspector/front-end/ResourcesPanel.js b/WebCore/inspector/front-end/ResourcesPanel.js
index aa01ef8..a194f53 100644
--- a/WebCore/inspector/front-end/ResourcesPanel.js
+++ b/WebCore/inspector/front-end/ResourcesPanel.js
@@ -1070,23 +1070,12 @@ WebInspector.FrameResourceTreeElement.prototype = {
revisionResource.setInitialContent(event.data.oldContent);
this.insertChild(new WebInspector.ResourceRevisionTreeElement(this._storagePanel, revisionResource, event.data.oldContentTimestamp), 0);
- var oldView = this._resource._resourcesView;
+
+ var oldView = WebInspector.ResourceManager.existingResourceViewForResource(this._resource);
if (oldView) {
- var scrollTop = oldView.scrollTop;
- var newView = WebInspector.ResourceManager.createResourceView(this._resource);
- var oldViewParentNode = oldView.visible ? oldView.element.parentNode : null;
-
- this._resource._resourcesView.detach();
- delete this._resource._resourcesView;
- this._resource._resourcesView = newView;
-
- if (oldViewParentNode)
- newView.show(oldViewParentNode);
-
+ var newView = WebInspector.ResourceManager.recreateResourceView(this._resource);
if (oldView === this._storagePanel.visibleView)
this._storagePanel.visibleView = newView;
- if (scrollTop)
- newView.scrollTop = scrollTop;
}
}
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list