Merge WebKit at r67908: ResourceHandleClient::didFinishLoading() now takes finish time

See http://trac.webkit.org/changeset/67551

Change-Id: Ie8c470f86ee7919495ae24e460f81952f75a0f1f

3 files changed, 4 insertions, 4 deletions

diff --git a/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp b/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp
index 626b7f4..6225413 100644
--- a/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp
+++ b/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp
@@ -327,7 +327,7 @@ void WebUrlLoaderClient::didFinishLoading(void* data)
     WebUrlLoaderClient* loader = loaderData->loader;
 
     if (loader->isActive())
-        loader->m_resourceHandle->client()->didFinishLoading(loader->m_resourceHandle.get());
+        loader->m_resourceHandle->client()->didFinishLoading(loader->m_resourceHandle.get(), 0);
 
     // Always finish a request, if not it will leak
     loader->finish();
diff --git a/WebKit/android/benchmark/Intercept.cpp b/WebKit/android/benchmark/Intercept.cpp
index 1ae6d6f..deffac2 100644
--- a/WebKit/android/benchmark/Intercept.cpp
+++ b/WebKit/android/benchmark/Intercept.cpp
@@ -113,7 +113,7 @@ void MyResourceLoader::loadData(const String& data)
             client->didReceiveData(m_handle, (const char*)base64.characters(),
                     base64.length() * sizeof(UChar), 0);
     }
-    client->didFinishLoading(m_handle);
+    client->didFinishLoading(m_handle, 0);
 }
 static String mimeTypeForExtension(const String& file)
 {
@@ -160,7 +160,7 @@ void MyResourceLoader::loadFile(const String& file)
             client->didReceiveData(m_handle, buf, res, 0);
         }
         fclose(f);
-        client->didFinishLoading(m_handle);
+        client->didFinishLoading(m_handle, 0);
     }
 }
 
diff --git a/WebKit/android/jni/WebCoreResourceLoader.cpp b/WebKit/android/jni/WebCoreResourceLoader.cpp
index e1048bc..b4dd6a9 100644
--- a/WebKit/android/jni/WebCoreResourceLoader.cpp
+++ b/WebKit/android/jni/WebCoreResourceLoader.cpp
@@ -233,7 +233,7 @@ void WebCoreResourceLoader::Finished(JNIEnv* env, jobject obj)
         return;
 
     LOG_ASSERT(handle->client(), "Why do we not have a client?");
-    handle->client()->didFinishLoading(handle);
+    handle->client()->didFinishLoading(handle, 0);
 }
 
 jstring WebCoreResourceLoader::RedirectedToUrl(JNIEnv* env, jobject obj,