diff options
author | Grace Kloba <klobag@google.com> | 2009-06-10 11:55:52 -0700 |
---|---|---|
committer | Grace Kloba <klobag@google.com> | 2009-06-10 11:55:52 -0700 |
commit | 631d8e4fbc7ac931b40f563559699e18b3992153 (patch) | |
tree | 9c1e6aa4983afe627d320bb9a8b5936e00b205ba | |
parent | ecc88dcc9bcc917892396ed149e0c254b4b177a3 (diff) | |
download | external_webkit-631d8e4fbc7ac931b40f563559699e18b3992153.zip external_webkit-631d8e4fbc7ac931b40f563559699e18b3992153.tar.gz external_webkit-631d8e4fbc7ac931b40f563559699e18b3992153.tar.bz2 |
DO NOT MERGE.
Merge 2390 from master to donut.
Added postUrl() to WebView so that we can pass lat/lon for the search.
-rw-r--r-- | WebKit/android/jni/WebCoreFrameBridge.cpp | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp index 8c34354..e2299c8 100644 --- a/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -795,6 +795,29 @@ static void LoadUrl(JNIEnv *env, jobject obj, jstring url) pFrame->loader()->load(request, false); } +static void PostUrl(JNIEnv *env, jobject obj, jstring url, jbyteArray postData) +{ +#ifdef ANDROID_INSTRUMENT + TimeCounterAuto counter(TimeCounter::NativeCallbackTimeCounter); +#endif + WebCore::Frame* pFrame = GET_NATIVE_FRAME(env, obj); + LOG_ASSERT(pFrame, "nativePostUrl must take a valid frame pointer!"); + + WebCore::KURL kurl(WebCore::KURL(), to_string(env, url)); + WebCore::ResourceRequest request(kurl); + request.setHTTPContentType("application/x-www-form-urlencoded"); + + if (postData) { + jsize size = env->GetArrayLength(postData); + jbyte* bytes = env->GetByteArrayElements(postData, NULL); + request.setHTTPBody(WebCore::FormData::create((const void*)bytes, size)); + env->ReleaseByteArrayElements(postData, bytes, 0); + } + + LOGV("PostUrl %s", kurl.string().latin1().data()); + pFrame->loader()->loadPostRequest(request, String(), String(), false, + WebCore::FrameLoadTypeStandard, 0, 0, true); +} static void LoadData(JNIEnv *env, jobject obj, jstring baseUrl, jstring data, jstring mimeType, jstring encoding, jstring failUrl) @@ -1252,6 +1275,8 @@ static JNINativeMethod gBrowserFrameNativeMethods[] = { (void*) StopLoading }, { "nativeLoadUrl", "(Ljava/lang/String;)V", (void*) LoadUrl }, + { "nativePostUrl", "(Ljava/lang/String;[B)V", + (void*) PostUrl }, { "nativeLoadData", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V", (void*) LoadData }, { "externalRepresentation", "()Ljava/lang/String;", |