DevTools: report correct content length for resources

webkit/api/src/ResourceHandle.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 51 matching lines @@
     void start();
     void cancel();
     void setDefersLoading(bool);
     bool allowStoredCredentials() const;
 
     // WebURLLoaderClient methods:
     virtual void willSendRequest(WebURLLoader*, WebURLRequest&, const WebURLResponse&);
     virtual void didSendData(
         WebURLLoader*, unsigned long long bytesSent, unsigned long long totalBytesToBeSent);
     virtual void didReceiveResponse(WebURLLoader*, const WebURLResponse&);
-    virtual void didReceiveData(
-        WebURLLoader*, const char* data, int dataLength, long long totalDataLength);
+    virtual void didReceiveData(WebURLLoader*, const char* data, int dataLength);
     virtual void didFinishLoading(WebURLLoader*);
     virtual void didFail(WebURLLoader*, const WebURLError&);
 
     ResourceRequest m_request;
     ResourceHandle* m_owner;
     ResourceHandleClient* m_client;
     OwnPtr<WebURLLoader> m_loader;
 };
 
 void ResourceHandleInternal::start()
@@ skipping 41 matching lines @@
 }
 
 void ResourceHandleInternal::didReceiveResponse(WebURLLoader*, const WebURLResponse& response)
 {
     ASSERT(m_client);
     ASSERT(!response.isNull());
     m_client->didReceiveResponse(m_owner, response.toResourceResponse());
 }
 
 void ResourceHandleInternal::didReceiveData(
-    WebURLLoader*, const char* data, int dataLength, long long totalDataLength)
+    WebURLLoader*, const char* data, int dataLength)
 {
     ASSERT(m_client);
 
-    // FIXME: ResourceHandleClient::didReceiveData should take a 'long long'
-    int lengthReceived = static_cast<int>(totalDataLength);
-    if (lengthReceived != totalDataLength)  // overflow occurred
-      lengthReceived = -1;
-
-    m_client->didReceiveData(m_owner, data, dataLength, lengthReceived);
+    // FIXME(yurys): it looks like lengthReceived is always the same as
+    // dataLength and that the latter parameter can be eliminated.
+    // See WebKit bug: https://bugs.webkit.org/show_bug.cgi?id=31019
+    m_client->didReceiveData(m_owner, data, dataLength, dataLength);
 }
 
 void ResourceHandleInternal::didFinishLoading(WebURLLoader*)
 {
     ASSERT(m_client);
     m_client->didFinishLoading(m_owner);
 }
 
 void ResourceHandleInternal::didFail(WebURLLoader*, const WebURLError& error)
 {
@@ skipping 123 matching lines @@
     // if the request cannot be serviced from cache.  We force the 'DontLoad'
     // cache policy at this point to ensure that we never hit the network for
     // this request.
     //
     ASSERT(request.httpMethod() == "POST");
     request.setCachePolicy(ReturnCacheDataDontLoad);
     return true;
 }
 
 } // namespace WebCore