Changeset 83167 in webkit

Timestamp:

Apr 7, 2011 6:25:37 AM (13 years ago)

Author:

pfeldman@chromium.org

Message:

2011-04-07 Vsevolod Vlasov <​vsevik@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: [Chromium] Rename didReceiveData2 to didReceiveData as part of enabling transfer size support.
​https://bugs.webkit.org/show_bug.cgi?id=58036

Renamed didReceiveData2 to didReceiveData.

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

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) (2 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-04-07  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: [Chromium] Rename didReceiveData2 to didReceiveData as part of enabling transfer size support.
+        https://bugs.webkit.org/show_bug.cgi?id=58036
+
+        Renamed didReceiveData2 to didReceiveData.
+
+        * public/WebURLLoaderClient.h:
+        (WebKit::WebURLLoaderClient::didReceiveData):
+        * src/AssociatedURLLoader.cpp:
+        (WebKit::AssociatedURLLoader::ClientAdapter::didReceiveData):
+        * src/ResourceHandle.cpp:
+        (WebCore::ResourceHandleInternal::didReceiveData):
+
 2011-04-07  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) { }
+    virtual void didReceiveData(WebURLLoader*, const char* data, int dataLength, int lengthReceived) { }
 
     // Called when a chunk of renderer-generated metadata is received from the cache.

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

@@ -125 +125 @@
         return;
 
-    m_client->didReceiveData2(m_loader, data, dataLength, -1);
+    m_client->didReceiveData(m_loader, data, dataLength, -1);
     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 didReceiveData(WebURLLoader*, const char* data, int dataLength, int lengthReceived);
 
     virtual void didReceiveCachedMetadata(WebURLLoader*, const char* data, int dataLength);
@@ -164 +161 @@
 }
 
-// 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)
+void ResourceHandleInternal::didReceiveData(WebURLLoader*, const char* data, int dataLength, int lengthReceived)
 {
     ASSERT(m_client);