Changeset 82257 in webkit

Timestamp:

Mar 29, 2011 8:33:31 AM (13 years ago)

Author:

pfeldman@chromium.org

Message:

2011-03-29 Vsevolod Vlasov <​vsevik@chromium.org>

Reviewed by Pavel Feldman.

[Chromium] Inspector does not always shows transferred size correctly (e.g. gzipped/chunked content)
​https://bugs.webkit.org/show_bug.cgi?id=56602

Added new methods to interface while keeping the old ones to keep
chromium working until it is also patched.

• public/WebURLLoaderClient.h: (WebKit::WebURLLoaderClient::didReceiveData2):
• src/AssociatedURLLoader.cpp: (WebKit::AssociatedURLLoader::ClientAdapter::didReceiveData):
• src/ResourceHandle.cpp: (WebCore::ResourceHandleInternal::didReceiveData): (WebCore::ResourceHandleInternal::didReceiveData2):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebURLLoaderClient.h (modified) (1 diff)
• src/AssociatedURLLoader.cpp (modified) (1 diff)
• src/ResourceHandle.cpp (modified) (3 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-03-29  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        [Chromium] Inspector does not always shows transferred size correctly (e.g. gzipped/chunked content)
+        https://bugs.webkit.org/show_bug.cgi?id=56602
+
+        Added new methods to interface while keeping the old ones to keep
+        chromium working until it is also patched.
+
+        * public/WebURLLoaderClient.h:
+        (WebKit::WebURLLoaderClient::didReceiveData2):
+        * src/AssociatedURLLoader.cpp:
+        (WebKit::AssociatedURLLoader::ClientAdapter::didReceiveData):
+        * src/ResourceHandle.cpp:
+        (WebCore::ResourceHandleInternal::didReceiveData):
+        (WebCore::ResourceHandleInternal::didReceiveData2):
+
 2011-03-29  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebKit/chromium/public/WebURLLoaderClient.h

@@ -59 +59 @@
 
     // Called when a chunk of response data is received.
+    // FIXME(vsevik): rename once original didReceiveData() is removed.
+    virtual void didReceiveData2(WebURLLoader*, const char* data, int dataLength, int lengthReceived) { }
+
+    // FIXME(vsevik): remove once not used downstream
     virtual void didReceiveData(WebURLLoader*, const char* data, int dataLength) { }
 

trunk/Source/WebKit/chromium/src/AssociatedURLLoader.cpp

@@ -120 +120 @@
 }
 
-void AssociatedURLLoader::ClientAdapter::didReceiveData(const char* data, int lengthReceived)
-{
-    if (!m_client)
-        return;
-
-    m_client->didReceiveData(m_loader, data, lengthReceived);
-    m_downloadLength += lengthReceived;
+void AssociatedURLLoader::ClientAdapter::didReceiveData(const char* data, int dataLength)
+{
+    if (!m_client)
+        return;
+
+    // FIXME(vsevik): add -1 to params once migrated.
+    m_client->didReceiveData(m_loader, data, dataLength);
+    m_downloadLength += dataLength;
 }
 

trunk/Source/WebKit/chromium/src/ResourceHandle.cpp

@@ -73 +73 @@
         WebURLLoader*, unsigned long long bytesSent, unsigned long long totalBytesToBeSent);
     virtual void didReceiveResponse(WebURLLoader*, const WebURLResponse&);
+    virtual void didReceiveData2(WebURLLoader*, const char* data, int dataLength, int lengthReceived);
+
+    // FIXME(vsevik): remove once not used downstream
     virtual void didReceiveData(WebURLLoader*, const char* data, int dataLength);
+
     virtual void didReceiveCachedMetadata(WebURLLoader*, const char* data, int dataLength);
     virtual void didFinishLoading(WebURLLoader*, double finishTime);
@@ -160 +164 @@
 }
 
-void ResourceHandleInternal::didReceiveData(WebURLLoader*, const char* data, int dataLength)
+// FIXME(vsevik): remove once not used
+void ResourceHandleInternal::didReceiveData(WebURLLoader* webURLLoader, const char* data, int dataLength)
+{
+    didReceiveData2(webURLLoader, data, dataLength, -1);
+}
+
+void ResourceHandleInternal::didReceiveData2(WebURLLoader*, const char* data, int dataLength, int lengthReceived)
 {
     ASSERT(m_client);
@@ -167 +177 @@
     m_state = ConnectionStateReceivingData;
 
-    // FIXME(vsevik): Add transfer size support to chromium port
-    // See WebKit bug: https://bugs.webkit.org/show_bug.cgi?id=56602
-    m_client->didReceiveData(m_owner, data, dataLength, -1);
+    m_client->didReceiveData(m_owner, data, dataLength, lengthReceived);
 }