summaryrefslogtreecommitdiffstats
path: root/WebKit
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2010-07-22 17:07:51 +0100
committerBen Murdoch <benm@google.com>2010-07-27 10:20:27 +0100
commit5471622589f2ee724aa562d07d71fd2d40df53a2 (patch)
tree758ee4423e60516653388fb03677fcf5e6c66e9a /WebKit
parent8442e31d83ef390f46627b7fe09ed76a5e64e6d7 (diff)
downloadexternal_webkit-5471622589f2ee724aa562d07d71fd2d40df53a2.zip
external_webkit-5471622589f2ee724aa562d07d71fd2d40df53a2.tar.gz
external_webkit-5471622589f2ee724aa562d07d71fd2d40df53a2.tar.bz2
Merge Webkit at r63859 : ResourceHandleInternal::m_request has been renamed. See http://trac.webkit.org/changeset/63332
Change-Id: Id019ee222d0b7dcfa464f97cfffdd5c08e2d0ee8
Diffstat (limited to 'WebKit')
-rw-r--r--WebKit/android/jni/WebCoreResourceLoader.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/WebKit/android/jni/WebCoreResourceLoader.cpp b/WebKit/android/jni/WebCoreResourceLoader.cpp
index 32e8cd8..74f59a5 100644
--- a/WebKit/android/jni/WebCoreResourceLoader.cpp
+++ b/WebKit/android/jni/WebCoreResourceLoader.cpp
@@ -250,7 +250,7 @@ jstring WebCoreResourceLoader::RedirectedToUrl(JNIEnv* env, jobject obj,
return NULL;
LOG_ASSERT(handle->client(), "Why do we not have a client?");
- WebCore::ResourceRequest r = handle->request();
+ WebCore::ResourceRequest r = handle->firstRequest();
WebCore::KURL url(WebCore::KURL(WebCore::ParsedURLString, to_string(env, baseUrl)),
to_string(env, redirectTo));
WebCore::ResourceResponse* response = (WebCore::ResourceResponse*)nativeResponse;