diff options
| author | Steve Block <steveblock@google.com> | 2010-03-24 11:28:50 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-24 11:28:50 -0700 |
| commit | 563da89a732d0adeab1ebaf7997b51960219f98c (patch) | |
| tree | 80688f685a54676848279893d8f21d99a4ef211b /WebKit | |
| parent | 1c95c29b31ed45a394643094162e01796c0c5122 (diff) | |
| parent | 6a6881a3ff408ab630684ae1779f12b83a024044 (diff) | |
| download | external_webkit-563da89a732d0adeab1ebaf7997b51960219f98c.zip external_webkit-563da89a732d0adeab1ebaf7997b51960219f98c.tar.gz external_webkit-563da89a732d0adeab1ebaf7997b51960219f98c.tar.bz2 | |
Merge "Fixes XHR requests to use the username and password supplied from JavaScript"
Diffstat (limited to 'WebKit')
| -rw-r--r-- | WebKit/android/jni/WebCoreFrameBridge.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp index ff7e868..250ffc9 100644 --- a/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -68,6 +68,7 @@ #include "RenderTreeAsText.h" #include "RenderView.h" #include "ResourceHandle.h" +#include "ResourceHandleInternal.h" #include "ScriptController.h" #include "ScriptValue.h" #include "SecurityOrigin.h" @@ -209,7 +210,7 @@ WebFrame::WebFrame(JNIEnv* env, jobject obj, jobject historyList, WebCore::Page* mJavaFrame->mObj = env->NewWeakGlobalRef(obj); mJavaFrame->mHistoryList = env->NewWeakGlobalRef(historyList); mJavaFrame->mStartLoadingResource = env->GetMethodID(clazz, "startLoadingResource", - "(ILjava/lang/String;Ljava/lang/String;Ljava/util/HashMap;[BJIZZZ)Landroid/webkit/LoadListener;"); + "(ILjava/lang/String;Ljava/lang/String;Ljava/util/HashMap;[BJIZZZLjava/lang/String;Ljava/lang/String;)Landroid/webkit/LoadListener;"); mJavaFrame->mLoadStarted = env->GetMethodID(clazz, "loadStarted", "(Ljava/lang/String;Landroid/graphics/Bitmap;IZ)V"); mJavaFrame->mTransitionToCommitted = env->GetMethodID(clazz, "transitionToCommitted", @@ -475,18 +476,25 @@ WebFrame::startLoadingResource(WebCore::ResourceHandle* loader, LOGV("::WebCore:: startLoadingResource %s with cacheMode %d", urlStr.ascii().data(), cacheMode); + ResourceHandleInternal* loaderInternal = loader->getInternal(); + jstring jUsernameString = loaderInternal->m_user.isEmpty() ? + NULL : env->NewString(loaderInternal->m_user.characters(), loaderInternal->m_user.length()); + jstring jPasswordString = loaderInternal->m_pass.isEmpty() ? + NULL : env->NewString(loaderInternal->m_pass.characters(), loaderInternal->m_pass.length()); jobject jLoadListener = env->CallObjectMethod(obj.get(), mJavaFrame->mStartLoadingResource, (int)loader, jUrlStr, jMethodStr, jHeaderMap, jPostDataStr, formdata ? formdata->identifier(): 0, cacheMode, mainResource, request.getUserGesture(), - synchronous); + synchronous, jUsernameString, jPasswordString); env->DeleteLocalRef(jUrlStr); env->DeleteLocalRef(jMethodStr); env->DeleteLocalRef(jPostDataStr); env->DeleteLocalRef(jHeaderMap); + env->DeleteLocalRef(jUsernameString); + env->DeleteLocalRef(jPasswordString); if (checkException(env)) return NULL; |