[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 15:15:45 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 226f46f723790920d11a3af5c565c8bb315c8acb
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 29 15:25:35 2010 +0000
2010-10-29 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Timothy Hatcher.
Web Inspector: add close button to network view, make tests pass for
resource manager on all ports.
https://bugs.webkit.org/show_bug.cgi?id=48628
* inspector/InspectorController.cpp:
(WebCore::InspectorController::didCommitLoad):
(WebCore::InspectorController::frameDetachedFromParent):
(WebCore::InspectorController::didLoadResourceFromMemoryCache):
(WebCore::InspectorController::identifierForInitialRequest):
(WebCore::InspectorController::willSendRequest):
(WebCore::InspectorController::markResourceAsCached):
(WebCore::InspectorController::didReceiveResponse):
(WebCore::InspectorController::didReceiveContentLength):
(WebCore::InspectorController::didFinishLoading):
(WebCore::InspectorController::didFailLoading):
(WebCore::InspectorController::resourceRetrievedByXMLHttpRequest):
(WebCore::InspectorController::scriptImported):
(WebCore::InspectorController::didCreateWebSocket):
(WebCore::InspectorController::willSendWebSocketHandshakeRequest):
(WebCore::InspectorController::didReceiveWebSocketHandshakeResponse):
(WebCore::InspectorController::didCloseWebSocket):
* inspector/front-end/NetworkPanel.js:
(WebInspector.NetworkPanel):
* inspector/front-end/ResourceManager.js:
(WebInspector.ResourceTreeModel.prototype.didCommitLoadForFrame):
* inspector/front-end/StoragePanel.js:
(WebInspector.StoragePanel.prototype.addResourceToFrame):
* inspector/front-end/inspector.js:
(WebInspector._createPanels):
* inspector/front-end/networkPanel.css:
(.network-close-button):
2010-10-29 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Timothy Hatcher.
Web Inspector: add close button to network view, make tests pass
for resource manager on all ports.
https://bugs.webkit.org/show_bug.cgi?id=48628
* src/js/Tests.js:
2010-10-29 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Timothy Hatcher.
Web Inspector: add close button to network view, make tests pass
for resource manager on all ports.
https://bugs.webkit.org/show_bug.cgi?id=48628
* inspector/audits-panel-functional.html:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70879 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e419995..54e8b72 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-29 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Timothy Hatcher.
+
+ Web Inspector: add close button to network view, make tests pass
+ for resource manager on all ports.
+ https://bugs.webkit.org/show_bug.cgi?id=48628
+
+ * inspector/audits-panel-functional.html:
+
2010-10-29 Mikhail Naganov <mnaganov at chromium.org>
[Chromium] Unreviewed test expectations update.
diff --git a/LayoutTests/inspector/audits-panel-functional.html b/LayoutTests/inspector/audits-panel-functional.html
index 2c27441..e020855 100644
--- a/LayoutTests/inspector/audits-panel-functional.html
+++ b/LayoutTests/inspector/audits-panel-functional.html
@@ -59,11 +59,14 @@ function frontend_runAudits(testController)
// Audits are done, check results.
var output = frontend_collectAuditResults();
// Avoid influencing tests that require resource tracking to be disabled.
- if (!Preferences.networkPanelEnabled)
- WebInspector.panels.resources.toggleResourceTracking();
- testController.runAfterPendingDispatches(function() {
+ if (Preferences.networkPanelEnabled) {
testController.notifyDone(output.join("\n"));
- });
+ } else {
+ WebInspector.panels.resources.toggleResourceTracking();
+ testController.runAfterPendingDispatches(function() {
+ testController.notifyDone(output.join("\n"));
+ });
+ }
});
} catch(e) {
testController.notifyDone("Exception: " + e.toString());
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2ea97df..dfab932 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,39 @@
+2010-10-29 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Timothy Hatcher.
+
+ Web Inspector: add close button to network view, make tests pass for
+ resource manager on all ports.
+ https://bugs.webkit.org/show_bug.cgi?id=48628
+
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::didCommitLoad):
+ (WebCore::InspectorController::frameDetachedFromParent):
+ (WebCore::InspectorController::didLoadResourceFromMemoryCache):
+ (WebCore::InspectorController::identifierForInitialRequest):
+ (WebCore::InspectorController::willSendRequest):
+ (WebCore::InspectorController::markResourceAsCached):
+ (WebCore::InspectorController::didReceiveResponse):
+ (WebCore::InspectorController::didReceiveContentLength):
+ (WebCore::InspectorController::didFinishLoading):
+ (WebCore::InspectorController::didFailLoading):
+ (WebCore::InspectorController::resourceRetrievedByXMLHttpRequest):
+ (WebCore::InspectorController::scriptImported):
+ (WebCore::InspectorController::didCreateWebSocket):
+ (WebCore::InspectorController::willSendWebSocketHandshakeRequest):
+ (WebCore::InspectorController::didReceiveWebSocketHandshakeResponse):
+ (WebCore::InspectorController::didCloseWebSocket):
+ * inspector/front-end/NetworkPanel.js:
+ (WebInspector.NetworkPanel):
+ * inspector/front-end/ResourceManager.js:
+ (WebInspector.ResourceTreeModel.prototype.didCommitLoadForFrame):
+ * inspector/front-end/StoragePanel.js:
+ (WebInspector.StoragePanel.prototype.addResourceToFrame):
+ * inspector/front-end/inspector.js:
+ (WebInspector._createPanels):
+ * inspector/front-end/networkPanel.css:
+ (.network-close-button):
+
2010-10-29 Nikolas Zimmermann <nzimmermann at rim.com>
Reviewed by Dirk Schulze.
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index e08f324..61ebf72 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -754,7 +754,8 @@ void InspectorController::didCommitLoad(DocumentLoader* loader)
return;
#if !LEGACY_RESOURCE_TRACKING_ENABLED
- m_resourceAgent->didCommitLoad(loader);
+ if (m_resourceAgent)
+ m_resourceAgent->didCommitLoad(loader);
#endif
ASSERT(m_inspectedPage);
@@ -841,7 +842,8 @@ void InspectorController::frameDetachedFromParent(Frame* rootFrame)
if (ResourcesMap* resourceMap = m_frameResources.get(frame))
removeAllResources(resourceMap);
#else
- m_resourceAgent->frameDetachedFromParent(rootFrame);
+ if (m_resourceAgent)
+ m_resourceAgent->frameDetachedFromParent(rootFrame);
#endif
}
@@ -931,7 +933,8 @@ void InspectorController::didLoadResourceFromMemoryCache(DocumentLoader* loader,
if (m_frontend)
resource->updateScriptObject(m_frontend.get());
#else
- m_resourceAgent->didLoadResourceFromMemoryCache(loader, cachedResource);
+ if (m_resourceAgent)
+ m_resourceAgent->didLoadResourceFromMemoryCache(loader, cachedResource);
#endif
}
@@ -963,7 +966,8 @@ void InspectorController::identifierForInitialRequest(unsigned long identifier,
if (m_frontend && loader->frameLoader()->isLoadingFromCachedPage() && resource == m_mainResource)
resource->updateScriptObject(m_frontend.get());
#else
- m_resourceAgent->identifierForInitialRequest(identifier, request.url(), loader);
+ if (m_resourceAgent)
+ m_resourceAgent->identifierForInitialRequest(identifier, request.url(), loader);
#endif
}
@@ -1043,7 +1047,8 @@ void InspectorController::willSendRequest(unsigned long identifier, ResourceRequ
if (resource != m_mainResource && m_frontend)
resource->updateScriptObject(m_frontend.get());
#else
- m_resourceAgent->willSendRequest(identifier, request, redirectResponse);
+ if (m_resourceAgent)
+ m_resourceAgent->willSendRequest(identifier, request, redirectResponse);
#endif
}
@@ -1056,7 +1061,8 @@ void InspectorController::markResourceAsCached(unsigned long identifier)
if (RefPtr<InspectorResource> resource = getTrackedResource(identifier))
resource->markAsCached();
#else
- m_resourceAgent->markResourceAsCached(identifier);
+ if (m_resourceAgent)
+ m_resourceAgent->markResourceAsCached(identifier);
#endif
}
@@ -1074,7 +1080,8 @@ void InspectorController::didReceiveResponse(unsigned long identifier, DocumentL
}
UNUSED_PARAM(loader);
#else
- m_resourceAgent->didReceiveResponse(identifier, loader, response);
+ if (m_resourceAgent)
+ m_resourceAgent->didReceiveResponse(identifier, loader, response);
#endif
if (response.httpStatusCode() >= 400) {
@@ -1098,7 +1105,8 @@ void InspectorController::didReceiveContentLength(unsigned long identifier, int
if (resource != m_mainResource && m_frontend)
resource->updateScriptObject(m_frontend.get());
#else
- m_resourceAgent->didReceiveContentLength(identifier, lengthReceived);
+ if (m_resourceAgent)
+ m_resourceAgent->didReceiveContentLength(identifier, lengthReceived);
#endif
}
@@ -1121,7 +1129,8 @@ void InspectorController::didFinishLoading(unsigned long identifier, double fini
if (m_frontend)
resource->updateScriptObject(m_frontend.get());
#else
- m_resourceAgent->didFinishLoading(identifier, finishTime);
+ if (m_resourceAgent)
+ m_resourceAgent->didFinishLoading(identifier, finishTime);
#endif
}
@@ -1150,7 +1159,8 @@ void InspectorController::didFailLoading(unsigned long identifier, const Resourc
if (m_frontend)
resource->updateScriptObject(m_frontend.get());
#else
- m_resourceAgent->didFailLoading(identifier, error);
+ if (m_resourceAgent)
+ m_resourceAgent->didFailLoading(identifier, error);
#endif
}
@@ -1175,7 +1185,8 @@ void InspectorController::resourceRetrievedByXMLHttpRequest(unsigned long identi
if (m_frontend)
resource->updateScriptObject(m_frontend.get());
#else
- m_resourceAgent->setOverrideContent(identifier, sourceString, InspectorResource::XHR);
+ if (m_resourceAgent)
+ m_resourceAgent->setOverrideContent(identifier, sourceString, InspectorResource::XHR);
#endif
}
@@ -1197,7 +1208,8 @@ void InspectorController::scriptImported(unsigned long identifier, const String&
if (m_frontend)
resource->updateScriptObject(m_frontend.get());
#else
- m_resourceAgent->setOverrideContent(identifier, sourceString, InspectorResource::Script);
+ if (m_resourceAgent)
+ m_resourceAgent->setOverrideContent(identifier, sourceString, InspectorResource::Script);
#endif
}
@@ -1564,7 +1576,8 @@ void InspectorController::didCreateWebSocket(unsigned long identifier, const KUR
if (m_frontend)
resource->updateScriptObject(m_frontend.get());
#else
- m_resourceAgent->didCreateWebSocket(identifier, requestURL);
+ if (m_resourceAgent)
+ m_resourceAgent->didCreateWebSocket(identifier, requestURL);
UNUSED_PARAM(documentURL);
#endif
}
@@ -1580,7 +1593,8 @@ void InspectorController::willSendWebSocketHandshakeRequest(unsigned long identi
if (m_frontend)
resource->updateScriptObject(m_frontend.get());
#else
- m_resourceAgent->willSendWebSocketHandshakeRequest(identifier, request);
+ if (m_resourceAgent)
+ m_resourceAgent->willSendWebSocketHandshakeRequest(identifier, request);
#endif
}
@@ -1597,7 +1611,8 @@ void InspectorController::didReceiveWebSocketHandshakeResponse(unsigned long ide
if (m_frontend)
resource->updateScriptObject(m_frontend.get());
#else
- m_resourceAgent->didReceiveWebSocketHandshakeResponse(identifier, response);
+ if (m_resourceAgent)
+ m_resourceAgent->didReceiveWebSocketHandshakeResponse(identifier, response);
#endif
}
@@ -1612,7 +1627,8 @@ void InspectorController::didCloseWebSocket(unsigned long identifier)
if (m_frontend)
resource->updateScriptObject(m_frontend.get());
#else
- m_resourceAgent->didCloseWebSocket(identifier);
+ if (m_resourceAgent)
+ m_resourceAgent->didCloseWebSocket(identifier);
#endif
}
#endif // ENABLE(WEB_SOCKETS)
diff --git a/WebCore/inspector/front-end/NetworkPanel.js b/WebCore/inspector/front-end/NetworkPanel.js
index 80456ba..c666e54 100644
--- a/WebCore/inspector/front-end/NetworkPanel.js
+++ b/WebCore/inspector/front-end/NetworkPanel.js
@@ -53,9 +53,13 @@ WebInspector.NetworkPanel = function()
this._viewsContainerElement = document.createElement("div");
this._viewsContainerElement.id = "network-views";
this._viewsContainerElement.className = "hidden";
-
this.element.appendChild(this._viewsContainerElement);
+ var closeButtonElement = document.createElement("button");
+ closeButtonElement.className = "network-close-button";
+ closeButtonElement.addEventListener("click", this._toggleGridMode.bind(this), false);
+ this._viewsContainerElement.appendChild(closeButtonElement);
+
this._createSortingFunctions();
this._createTable();
this._createTimelineGrid();
diff --git a/WebCore/inspector/front-end/ResourceManager.js b/WebCore/inspector/front-end/ResourceManager.js
index 43a655e..62273ee 100644
--- a/WebCore/inspector/front-end/ResourceManager.js
+++ b/WebCore/inspector/front-end/ResourceManager.js
@@ -498,7 +498,8 @@ WebInspector.ResourceTreeModel.prototype = {
didCommitLoadForFrame: function(parentFrameId, loader)
{
- this._clearChildFramesAndResources(loader.frameId, loader.loaderId);
+ // parentFrameId === 0 is when main frame navigation happens.
+ this._clearChildFramesAndResources(parentFrameId ? loader.frameId : 0, loader.loaderId);
var tmpResource = new WebInspector.Resource(null, loader.url);
this.addOrUpdateFrame(parentFrameId, loader.frameId, tmpResource.displayName);
diff --git a/WebCore/inspector/front-end/StoragePanel.js b/WebCore/inspector/front-end/StoragePanel.js
index f90f40e..2fa54c2 100644
--- a/WebCore/inspector/front-end/StoragePanel.js
+++ b/WebCore/inspector/front-end/StoragePanel.js
@@ -167,7 +167,8 @@ WebInspector.StoragePanel.prototype = {
{
var frameTreeElement = this._treeElementForFrameId[frameId];
if (!frameTreeElement) {
- console.error("No frame to add resource to");
+ // This is a frame's main resource, it will be retained
+ // and re-added by the resource manager;
return;
}
diff --git a/WebCore/inspector/front-end/inspector.js b/WebCore/inspector/front-end/inspector.js
index 7e777f2..f5b12c1 100644
--- a/WebCore/inspector/front-end/inspector.js
+++ b/WebCore/inspector/front-end/inspector.js
@@ -225,8 +225,6 @@ var WebInspector = {
var hiddenPanels = (InspectorFrontendHost.hiddenPanels() || "").split(',');
if (hiddenPanels.indexOf("elements") === -1)
this.panels.elements = new WebInspector.ElementsPanel();
- if (Preferences.networkPanelEnabled && hiddenPanels.indexOf("network") === -1)
- this.panels.network = new WebInspector.NetworkPanel();
if (Preferences.networkPanelEnabled) {
if (hiddenPanels.indexOf("storage") === -1 && hiddenPanels.indexOf("databases") === -1)
@@ -236,6 +234,8 @@ var WebInspector = {
} else if (hiddenPanels.indexOf("resources") === -1)
this.panels.resources = new WebInspector.ResourcesPanel();
+ if (Preferences.networkPanelEnabled && hiddenPanels.indexOf("network") === -1)
+ this.panels.network = new WebInspector.NetworkPanel();
if (hiddenPanels.indexOf("scripts") === -1)
this.panels.scripts = new WebInspector.ScriptsPanel();
if (hiddenPanels.indexOf("timeline") === -1)
diff --git a/WebCore/inspector/front-end/networkPanel.css b/WebCore/inspector/front-end/networkPanel.css
index 0bb617f..215681f 100644
--- a/WebCore/inspector/front-end/networkPanel.css
+++ b/WebCore/inspector/front-end/networkPanel.css
@@ -544,6 +544,19 @@
left: 0;
}
+.network-close-button {
+ position: absolute;
+ width: 14px;
+ height: 14px;
+ background-image: url(Images/closeButtons.png);
+ background-position: 0 0;
+ background-color: transparent;
+ border: 0 none transparent;
+ top: 4px;
+ right: 5px;
+ z-index: 10;
+}
+
.network.panel .data-grid.full-grid-mode .viewer-column {
display: none;
}
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 14a66b2..55c03fa 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-29 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Timothy Hatcher.
+
+ Web Inspector: add close button to network view, make tests pass
+ for resource manager on all ports.
+ https://bugs.webkit.org/show_bug.cgi?id=48628
+
+ * src/js/Tests.js:
+
2010-10-29 Csaba Osztrogonác <ossy at webkit.org>
Reviewed by Adam Roben and David Kilzer.
diff --git a/WebKit/chromium/src/js/Tests.js b/WebKit/chromium/src/js/Tests.js
index 5cebb52..2b264ee 100644
--- a/WebKit/chromium/src/js/Tests.js
+++ b/WebKit/chromium/src/js/Tests.js
@@ -245,146 +245,6 @@ TestSuite.prototype.testEnableResourcesTab = function()
/**
- * Tests that correct content length is reported for resources.
- */
-TestSuite.prototype.testResourceContentLength = function()
-{
- this.showPanel("resources");
- var test = this;
-
- var png = false;
- var html = false;
- this.addSniffer(WebInspector, "updateResource",
- function(payload) {
- if (!payload.didLengthChange)
- return;
- var resource = WebInspector.resources[payload.id];
- if (!resource || !resource.url)
- return;
- if (resource.url.search("image.html") !== -1) {
- var expectedLength = 87;
- test.assertTrue(
- resource.resourceSize <= expectedLength,
- "image.html content length is greater thatn expected.");
- if (expectedLength === resource.resourceSize)
- html = true;
- } else if (resource.url.search("image.png") !== -1) {
- var expectedLength = 257796;
- test.assertTrue(
- resource.resourceSize <= expectedLength,
- "image.png content length is greater than expected.");
- if (expectedLength === resource.resourceSize)
- png = true;
- }
- if (html && png) {
- // Wait 1 second before releasing control to check that the content
- // lengths are not updated anymore.
- setTimeout(function() {
- test.releaseControl();
- }, 1000);
- }
- }, true);
-
- // Make sure resource tracking is on.
- WebInspector.panels.resources._enableResourceTracking();
- // Reload inspected page to update all resources.
- test.evaluateInConsole_(
- "window.location.reload(true);",
- function(resultText) {
- test.assertEquals("undefined", resultText, "Unexpected result of reload().");
- });
-
- // We now have some time to report results to controller.
- this.takeControl();
-};
-
-
-/**
- * Tests resource headers.
- */
-TestSuite.prototype.testResourceHeaders = function()
-{
- this.showPanel("resources");
-
- var test = this;
-
- var responseOk = false;
- var timingOk = false;
-
- this.addSniffer(WebInspector, "updateResource",
- function(payload) {
- var resource = this.resources[payload.id];
- if (!resource || resource.mainResource) {
- // We are only interested in secondary resources in this test.
- return;
- }
-
- var requestHeaders = JSON.stringify(resource.requestHeaders);
- test.assertContains(requestHeaders, "Accept");
-
- if (payload.didResponseChange) {
- var responseHeaders = JSON.stringify(resource.responseHeaders);
- test.assertContains(responseHeaders, "Content-type");
- test.assertContains(responseHeaders, "Content-Length");
- test.assertTrue(typeof resource.responseReceivedTime !== "undefined");
- responseOk = true;
- }
-
- if (payload.didTimingChange) {
- test.assertTrue(typeof resource.startTime !== "undefined");
- timingOk = true;
- }
-
- if (payload.didCompletionChange) {
- test.assertTrue(responseOk);
- test.assertTrue(timingOk);
- test.assertTrue(typeof resource.endTime !== "undefined");
- test.releaseControl();
- }
- }, true);
-
- WebInspector.panels.resources._enableResourceTracking();
- this.takeControl();
-};
-
-
-/**
- * Tests the mime type of a cached (HTTP 304) resource.
- */
-TestSuite.prototype.testCachedResourceMimeType = function()
-{
- this.showPanel("resources");
-
- var test = this;
- var hasReloaded = false;
-
- this.addSniffer(WebInspector, "updateResource",
- function(payload) {
- var resource = this.resources[payload.id];
- if (!resource || resource.mainResource) {
- // We are only interested in secondary resources in this test.
- return;
- }
-
- if (payload.didResponseChange) {
- // Test server uses a default mime type for JavaScript files.
- test.assertEquals("text/html", payload.mimeType);
- if (!hasReloaded) {
- hasReloaded = true;
- // Reload inspected page to update all resources.
- test.evaluateInConsole_("window.location.reload(true);", function() {});
- } else
- test.releaseControl();
- }
-
- }, true);
-
- WebInspector.panels.resources._enableResourceTracking();
- this.takeControl();
-};
-
-
-/**
* Tests that profiler works.
*/
TestSuite.prototype.testProfilerTab = function()
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list