Title: [91457] trunk/Source/WebCore
- Revision
- 91457
- Author
- [email protected]
- Date
- 2011-07-21 03:12:39 -0700 (Thu, 21 Jul 2011)
Log Message
Web Inspector: Remove networkDataRemoved field from resource.
https://bugs.webkit.org/show_bug.cgi?id=64749
Reviewed by Pavel Feldman.
* inspector/front-end/NetworkManager.js:
(WebInspector.NetworkManager.prototype.requestContent):
(WebInspector.NetworkDispatcher.prototype._appendRedirect):
* inspector/front-end/NetworkPanel.js:
(WebInspector.NetworkLogView.prototype._frameNavigated):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (91456 => 91457)
--- trunk/Source/WebCore/ChangeLog 2011-07-21 10:06:02 UTC (rev 91456)
+++ trunk/Source/WebCore/ChangeLog 2011-07-21 10:12:39 UTC (rev 91457)
@@ -1,3 +1,16 @@
+2011-07-18 Vsevolod Vlasov <[email protected]>
+
+ Web Inspector: Remove networkDataRemoved field from resource.
+ https://bugs.webkit.org/show_bug.cgi?id=64749
+
+ Reviewed by Pavel Feldman.
+
+ * inspector/front-end/NetworkManager.js:
+ (WebInspector.NetworkManager.prototype.requestContent):
+ (WebInspector.NetworkDispatcher.prototype._appendRedirect):
+ * inspector/front-end/NetworkPanel.js:
+ (WebInspector.NetworkLogView.prototype._frameNavigated):
+
2011-07-21 Tommy Widenflycht <[email protected]>
MediaStream API: Merging MediaStreamContainer and MediaStreamList
Modified: trunk/Source/WebCore/inspector/front-end/NetworkManager.js (91456 => 91457)
--- trunk/Source/WebCore/inspector/front-end/NetworkManager.js 2011-07-21 10:06:02 UTC (rev 91456)
+++ trunk/Source/WebCore/inspector/front-end/NetworkManager.js 2011-07-21 10:12:39 UTC (rev 91457)
@@ -57,7 +57,7 @@
}
// FIXME: https://bugs.webkit.org/show_bug.cgi?id=61363 We should separate NetworkResource (NetworkPanel resource)
// from ResourceRevision (ResourcesPanel/ScriptsPanel resource) and request content accordingly.
- if (resource.identifier && !resource.networkDataRemoved)
+ if (resource.identifier)
NetworkAgent.getResourceContent(resource.identifier, callbackWrapper);
else
PageAgent.getResourceContent(resource.frameId, resource.url, callbackWrapper);
@@ -284,7 +284,6 @@
var previousRedirects = originalResource.redirects || [];
originalResource.identifier = "redirected:" + identifier + "." + previousRedirects.length;
delete originalResource.redirects;
- originalResource.networkDataRemoved = true;
this._finishResource(originalResource, time);
var newResource = this._createResource(identifier, originalResource.frameId, originalResource.loaderId,
redirectURL, originalResource.documentURL, originalResource.stackTrace);
Modified: trunk/Source/WebCore/inspector/front-end/NetworkPanel.js (91456 => 91457)
--- trunk/Source/WebCore/inspector/front-end/NetworkPanel.js 2011-07-21 10:06:02 UTC (rev 91456)
+++ trunk/Source/WebCore/inspector/front-end/NetworkPanel.js 2011-07-21 10:12:39 UTC (rev 91457)
@@ -770,14 +770,8 @@
var loaderId = event.data.loaderId;
// Main frame committed load.
- if (this._preserveLogToggle.toggled) {
- for (var i = 0; i < this._resources.length; ++i) {
- var resource = this._resources[i];
- if (resource.loaderId !== loaderId)
- resource.networkDataRemoved = true;
- }
+ if (this._preserveLogToggle.toggled)
return;
- }
// Preserve provisional load resources.
var resourcesToPreserve = [];
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
