diff options
author | Kristian Monsen <kristianm@google.com> | 2010-11-01 14:28:16 +0000 |
---|---|---|
committer | Kristian Monsen <kristianm@google.com> | 2010-11-04 12:05:17 +0000 |
commit | abdfca3d9cf3a3d7728dd0b7a8ff35954fa7b8e4 (patch) | |
tree | ebda9439b356d49a89f467658d9cb9a82f7c945b /WebKit/android/jni | |
parent | d5a8aa497723e8ab3b77f0ecb8c9c6cc7ab5d7b0 (diff) | |
download | external_webkit-abdfca3d9cf3a3d7728dd0b7a8ff35954fa7b8e4.zip external_webkit-abdfca3d9cf3a3d7728dd0b7a8ff35954fa7b8e4.tar.gz external_webkit-abdfca3d9cf3a3d7728dd0b7a8ff35954fa7b8e4.tar.bz2 |
Add support for file uploads in WebKit
This also moves some of the android file handling to Java so it is not
duplicated in both places.
This CL needs https://android-git.corp.google.com/g/#change,77400
in frameworks/base
Change-Id: I90c1726e6c323a9de3fd64f2e6feef4b64171053
Diffstat (limited to 'WebKit/android/jni')
-rw-r--r-- | WebKit/android/jni/WebCoreFrameBridge.cpp | 6 | ||||
-rw-r--r-- | WebKit/android/jni/WebCoreFrameBridge.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp index 9cd5c79..c4d07a4 100644 --- a/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -234,7 +234,7 @@ WebFrame::WebFrame(JNIEnv* env, jobject obj, jobject historyList, WebCore::Page* mJavaFrame = new JavaBrowserFrame; mJavaFrame->mObj = env->NewWeakGlobalRef(obj); mJavaFrame->mHistoryList = env->NewWeakGlobalRef(historyList); - mJavaFrame->mInputStreamForAndroidResource = env->GetMethodID(clazz, "inputStreamForAndroidResource", "(Ljava/lang/String;I)Ljava/io/InputStream;"); + mJavaFrame->mInputStreamForAndroidResource = env->GetMethodID(clazz, "inputStreamForAndroidResource", "(Ljava/lang/String;)Ljava/io/InputStream;"); mJavaFrame->mStartLoadingResource = env->GetMethodID(clazz, "startLoadingResource", "(ILjava/lang/String;Ljava/lang/String;Ljava/util/HashMap;[BJIZZZLjava/lang/String;Ljava/lang/String;)Landroid/webkit/LoadListener;"); mJavaFrame->mLoadStarted = env->GetMethodID(clazz, "loadStarted", @@ -382,13 +382,13 @@ private: int m_size; }; -int WebFrame::inputStreamForAndroidResource(const char* url, int type) +int WebFrame::inputStreamForAndroidResource(const char* url) { JNIEnv* env = getJNIEnv(); AutoJObject obj = mJavaFrame->frame(env); jstring jUrlStr = env->NewStringUTF(url); - jobject jInputStream = env->CallObjectMethod(obj.get(), mJavaFrame->mInputStreamForAndroidResource, jUrlStr, type); + jobject jInputStream = env->CallObjectMethod(obj.get(), mJavaFrame->mInputStreamForAndroidResource, jUrlStr); env->DeleteLocalRef(jUrlStr); return (int)jInputStream; diff --git a/WebKit/android/jni/WebCoreFrameBridge.h b/WebKit/android/jni/WebCoreFrameBridge.h index 9e3b5db..2d2b571 100644 --- a/WebKit/android/jni/WebCoreFrameBridge.h +++ b/WebKit/android/jni/WebCoreFrameBridge.h @@ -60,7 +60,7 @@ class WebFrame : public WebCoreRefObject { // helper function static WebFrame* getWebFrame(const WebCore::Frame* frame); - int inputStreamForAndroidResource(const char* url, int type); + int inputStreamForAndroidResource(const char* url); virtual PassRefPtr<WebCore::ResourceLoaderAndroid> startLoadingResource(WebCore::ResourceHandle*, const WebCore::ResourceRequest& request, bool mainResource, |