Changeset 82223 in webkit

Timestamp:

Mar 29, 2011 3:38:11 AM (13 years ago)

Author:

yutak@chromium.org

Message:

2011-03-29 Yuta Kitamura <​yutak@chromium.org>

Unreviewed, rolling out r82195.
​http://trac.webkit.org/changeset/82195
​https://bugs.webkit.org/show_bug.cgi?id=56602

Broke Chromium Clang builds.

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

Location:

trunk/Source/WebKit/chromium

Files:

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

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-03-29  Yuta Kitamura  <yutak@chromium.org>
+
+        Unreviewed, rolling out r82195.
+        http://trac.webkit.org/changeset/82195
+        https://bugs.webkit.org/show_bug.cgi?id=56602
+
+        Broke Chromium Clang builds.
+
+        * public/WebDevToolsAgent.h:
+        * public/WebURLLoaderClient.h:
+        * src/AssociatedURLLoader.cpp:
+        (WebKit::AssociatedURLLoader::ClientAdapter::didReceiveData):
+        * src/ResourceHandle.cpp:
+        (WebCore::ResourceHandleInternal::didReceiveData):
+        * src/WebDevToolsAgentImpl.cpp:
+        (WebKit::WebDevToolsAgentImpl::didReceiveData):
+        * src/WebDevToolsAgentImpl.h:
+
 2011-03-29  Yuta Kitamura  <yutak@chromium.org>
 

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

@@ -95 +95 @@
 
     virtual void willSendRequest(unsigned long resourceId, WebFrame*, WebURLRequest&) = 0;
-    virtual void didReceiveData(unsigned long resourceId, int dataLength, int lengthReceived) = 0;
-
-    // FIXME(vsevik): remove once not used downstream
     virtual void didReceiveData(unsigned long resourceId, int length) = 0;
-
     virtual void didReceiveResponse(unsigned long resourceId, const WebURLResponse&) = 0;
     virtual void didFinishLoading(unsigned long resourceId) = 0;

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

@@ -59 +59 @@
 
     // Called when a chunk of response data is received.
-    virtual void didReceiveData(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 dataLength)
-{
-    if (!m_client)
-        return;
-
-    // FIXME(vsevik): add -1 to params once migrated.
-    m_client->didReceiveData(m_loader, data, dataLength);
-    m_downloadLength += dataLength;
+void AssociatedURLLoader::ClientAdapter::didReceiveData(const char* data, int lengthReceived)
+{
+    if (!m_client)
+        return;
+
+    m_client->didReceiveData(m_loader, data, lengthReceived);
+    m_downloadLength += lengthReceived;
 }
 

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 didReceiveData(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);
@@ -164 +160 @@
 }
 
-void ResourceHandleInternal::didReceiveData(WebURLLoader* webURLLoader, const char* data, int dataLength)
-{
-    didReceiveData(webURLLoader, data, dataLength, -1);
-}
-
-void ResourceHandleInternal::didReceiveData(WebURLLoader*, const char* data, int dataLength, int lengthReceived)
+void ResourceHandleInternal::didReceiveData(WebURLLoader*, const char* data, int dataLength)
 {
     ASSERT(m_client);
@@ -176 +167 @@
     m_state = ConnectionStateReceivingData;
 
-    m_client->didReceiveData(m_owner, data, dataLength, lengthReceived);
+    // 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);
 }
 

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

@@ -275 +275 @@
 }
 
-// FIXME(vsevik): remove once not used downstream
 void WebDevToolsAgentImpl::didReceiveData(unsigned long resourceId, int length)
 {
-    didReceiveData(resourceId, length, -1);
-}
-
-void WebDevToolsAgentImpl::didReceiveData(unsigned long resourceId, int length, int lengthReceived)
-{
-    InspectorInstrumentation::didReceiveContentLength(mainFrame(), resourceId, length, lengthReceived);
+    InspectorInstrumentation::didReceiveContentLength(mainFrame(), resourceId, length, -1);
 }
 

trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.h

@@ -85 +85 @@
 
     virtual void willSendRequest(unsigned long, WebFrame*, WebURLRequest&);
-    virtual void didReceiveData(unsigned long, int length, int lengthReceived);
-
-    // FIXME(vsevik): remove once not used downstream
     virtual void didReceiveData(unsigned long, int length);
-
     virtual void didReceiveResponse(unsigned long, const WebURLResponse&);
     virtual void didFinishLoading(unsigned long);