diff options
| author | Steve Block <steveblock@google.com> | 2010-09-22 12:53:55 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-09-29 17:45:50 +0100 |
| commit | df2bb7b59f8c44f1b1f8eadfb4b230830b5ef121 (patch) | |
| tree | 16c50cea64aa5067ba57ec61fe7662c19b501e33 /WebKit/android/jni/WebCoreResourceLoader.cpp | |
| parent | 49016a060b9b69330f1ba3bf3f4222bb84584e28 (diff) | |
| download | external_webkit-df2bb7b59f8c44f1b1f8eadfb4b230830b5ef121.zip external_webkit-df2bb7b59f8c44f1b1f8eadfb4b230830b5ef121.tar.gz external_webkit-df2bb7b59f8c44f1b1f8eadfb4b230830b5ef121.tar.bz2 | |
Merge WebKit at r67908: ResourceHandleClient::didFinishLoading() now takes finish time
See http://trac.webkit.org/changeset/67551
Change-Id: Ie8c470f86ee7919495ae24e460f81952f75a0f1f
Diffstat (limited to 'WebKit/android/jni/WebCoreResourceLoader.cpp')
| -rw-r--r-- | WebKit/android/jni/WebCoreResourceLoader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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, |