Changeset 76690 in webkit

Timestamp:

Jan 26, 2011 8:06:28 AM (13 years ago)

Author:

caseq@chromium.org

Message:

2011-01-26 Andrey Kosyakov <​caseq@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: summary bar is not resized properly with the rest of network panel

• Set the size for 304/not modified resources from cached resource.
• Add response headers size to resource transfer size. ​https://bugs.webkit.org/show_bug.cgi?id=52886

• inspector/InspectorResourceAgent.cpp: (WebCore::InspectorResourceAgent::didReceiveResponse):
• inspector/front-end/Resource.js: (WebInspector.Resource): (WebInspector.Resource.prototype.get transferSize): (WebInspector.Resource.prototype.set responseHeaders): (WebInspector.Resource.prototype._headersSize): (WebInspector.Resource.prototype._mimeTypeIsConsistentWithType):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorResourceAgent.cpp (modified) (1 diff)
• inspector/front-end/Resource.js (modified) (6 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-26  Andrey Kosyakov  <caseq@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: summary bar is not resized properly with the rest of network panel
+        - Set the size for 304/not modified resources from cached resource.
+        - Add response headers size to resource transfer size.
+        https://bugs.webkit.org/show_bug.cgi?id=52886
+
+        * inspector/InspectorResourceAgent.cpp:
+        (WebCore::InspectorResourceAgent::didReceiveResponse):
+        * inspector/front-end/Resource.js:
+        (WebInspector.Resource):
+        (WebInspector.Resource.prototype.get transferSize):
+        (WebInspector.Resource.prototype.set responseHeaders):
+        (WebInspector.Resource.prototype._headersSize):
+        (WebInspector.Resource.prototype._mimeTypeIsConsistentWithType):
+
 2011-01-26  Carol Szabo  <carol.szabo@nokia.com>
 

trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp

@@ -317 +317 @@
     RefPtr<InspectorObject> resourceResponse = buildObjectForResourceResponse(response);
     String type = "Other";
+    long cachedResourceSize = 0;
+
     if (loader) {
+        CachedResource* cachedResource = InspectorResourceAgent::cachedResource(loader->frame(), response.url());
+        if (cachedResource) {
+            type = cachedResourceTypeString(*cachedResource);
+            cachedResourceSize = cachedResource->encodedSize();
+            // Use mime type from cached resource in case the one in response is empty.
+            if (response.mimeType().isEmpty())
+                resourceResponse->setString("mimeType", cachedResource->response().mimeType());
+        }
         if (equalIgnoringFragmentIdentifier(response.url(), loader->frameLoader()->iconURL()))
             type = "Image";
-        else {
-            CachedResource* cachedResource = InspectorResourceAgent::cachedResource(loader->frame(), response.url());
-            if (cachedResource)
-                type = cachedResourceTypeString(*cachedResource);
-
-            if (equalIgnoringFragmentIdentifier(response.url(), loader->url()) && type == "Other")
-                type = "Document";
-
-            // Use mime type from cached resource in case the one in response is empty.
-            if (response.mimeType().isEmpty() && cachedResource)
-                resourceResponse->setString("mimeType", cachedResource->response().mimeType());
-        }
+        else if (equalIgnoringFragmentIdentifier(response.url(), loader->url()) && type == "Other")
+            type = "Document";
     }
     m_frontend->didReceiveResponse(identifier, currentTime(), type, resourceResponse);
+    // If we revalidated the resource and got Not modified, send content length following didReceiveResponse
+    // as there will be no calls to didReceiveContentLength from the network stack.
+    if (cachedResourceSize && response.httpStatusCode() == 304)
+        didReceiveContentLength(identifier, cachedResourceSize);
 }
 

trunk/Source/WebCore/inspector/front-end/Resource.js

@@ -35 +35 @@
     this._category = WebInspector.resourceCategories.other;
     this._pendingContentCallbacks = [];
+    this._responseHeadersSize = 0;
 }
 
@@ -238 +239 @@
     get transferSize()
     {
-        // FIXME: this is wrong for chunked-encoding resources.
-        return this.cached ? 0 : Number(this.responseHeaders["Content-Length"] || this.resourceSize || 0);
+        if (this.cached)
+            return 0;
+        if (this.statusCode === 304) // Not modified
+            return this._responseHeadersSize;
+        // FIXME: We prefer using Content-Length over resourceSize as
+        // resourceSize may differ from actual transfer size if platform's
+        // network stack performed decoding (e.g. gzip decompression).
+        // The Content-Length, though, is expected to come from raw
+        // response headers and will reflect actual transfer length.
+        // This won't work for chunked content encoding, so fall back to
+        // resourceSize when we don't have Content-Length. This still won't
+        // work for chunks with non-trivial encodings. We need a way to
+        // get actaul transfer size from the network stack.
+        var bodySize = Number(this.responseHeaders["Content-Length"] || this.resourceSize);
+        return this._responseHeadersSize + bodySize;
     },
 
@@ -304 +318 @@
     },
 
-
     get timing()
     {
@@ -432 +445 @@
     {
         this._responseHeaders = x;
+        // FIXME: we should take actual headers size from network stack, when possible.
+        this._responseHeadersSize = this._headersSize(x);
         delete this._sortedResponseHeaders;
         delete this._responseCookies;
@@ -513 +528 @@
     },
 
+    _headersSize: function(headers)
+    {
+        var size = 0;
+        for (var header in headers)
+            size += header.length + headers[header].length + 3; // _typical_ overhead per herader is ": ".length + "\n".length.
+        return size;
+    },
+
     get errors()
     {
@@ -551 +574 @@
 
         if (typeof this.type === "undefined"
-         || this.type === WebInspector.Resource.Type.Other
-         || this.type === WebInspector.Resource.Type.XHR
-         || this.type === WebInspector.Resource.Type.WebSocket)
+            || this.type === WebInspector.Resource.Type.Other
+            || this.type === WebInspector.Resource.Type.XHR
+            || this.type === WebInspector.Resource.Type.WebSocket)
             return true;