diff options
| author | Patrick Scott <phanna@android.com> | 2009-12-04 11:12:59 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-04 11:12:59 -0800 |
| commit | c8da3d7ceeda9d568eba6c9bc2029f7d5a75e6d2 (patch) | |
| tree | e251eb9ea280eae090e26eda43dd9747859a234d /WebKit/android | |
| parent | e485ea2278f2b1a30c54b46aa21ad7458bbbf9eb (diff) | |
| parent | 2a2524d2c288155a0e88d67257f6428b79efda7f (diff) | |
| download | external_webkit-c8da3d7ceeda9d568eba6c9bc2029f7d5a75e6d2.zip external_webkit-c8da3d7ceeda9d568eba6c9bc2029f7d5a75e6d2.tar.gz external_webkit-c8da3d7ceeda9d568eba6c9bc2029f7d5a75e6d2.tar.bz2 | |
am 2a2524d2: Merge change If686b999 into eclair-mr2
Merge commit '2a2524d2c288155a0e88d67257f6428b79efda7f' into eclair-mr2-plus-aosp
* commit '2a2524d2c288155a0e88d67257f6428b79efda7f':
Pass up flags for the main resource and user gesture.
Diffstat (limited to 'WebKit/android')
| -rw-r--r-- | WebKit/android/jni/WebCoreFrameBridge.cpp | 6 | ||||
| -rw-r--r-- | WebKit/android/jni/WebCoreFrameBridge.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp index 4255422..c420b4c 100644 --- a/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -170,7 +170,7 @@ WebFrame::WebFrame(JNIEnv* env, jobject obj, jobject historyList, WebCore::Page* mJavaFrame->mObj = adoptGlobalRef(env, obj); mJavaFrame->mHistoryList = adoptGlobalRef(env, historyList); mJavaFrame->mStartLoadingResource = env->GetMethodID(clazz, "startLoadingResource", - "(ILjava/lang/String;Ljava/lang/String;Ljava/util/HashMap;[BJIZ)Landroid/webkit/LoadListener;"); + "(ILjava/lang/String;Ljava/lang/String;Ljava/util/HashMap;[BJIZZZ)Landroid/webkit/LoadListener;"); mJavaFrame->mLoadStarted = env->GetMethodID(clazz, "loadStarted", "(Ljava/lang/String;Landroid/graphics/Bitmap;IZ)V"); mJavaFrame->mTransitionToCommitted = env->GetMethodID(clazz, "transitionToCommitted", @@ -323,6 +323,7 @@ private: WebCoreResourceLoader* WebFrame::startLoadingResource(WebCore::ResourceHandle* loader, const WebCore::ResourceRequest& request, + bool mainResource, bool synchronous) { #ifdef ANDROID_INSTRUMENT @@ -443,7 +444,8 @@ WebFrame::startLoadingResource(WebCore::ResourceHandle* loader, env->CallObjectMethod(obj.get(), mJavaFrame->mStartLoadingResource, (int)loader, jUrlStr, jMethodStr, jHeaderMap, jPostDataStr, formdata ? formdata->identifier(): 0, - cacheMode, synchronous); + cacheMode, mainResource, request.getUserGesture(), + synchronous); env->DeleteLocalRef(jUrlStr); env->DeleteLocalRef(jMethodStr); diff --git a/WebKit/android/jni/WebCoreFrameBridge.h b/WebKit/android/jni/WebCoreFrameBridge.h index 51ed9a6..1fdf140 100644 --- a/WebKit/android/jni/WebCoreFrameBridge.h +++ b/WebKit/android/jni/WebCoreFrameBridge.h @@ -63,7 +63,7 @@ class WebFrame : public WebCoreRefObject { static WebFrame* getWebFrame(const WebCore::Frame* frame); virtual WebCoreResourceLoader* startLoadingResource(WebCore::ResourceHandle*, - const WebCore::ResourceRequest& request, + const WebCore::ResourceRequest& request, bool mainResource, bool synchronous); void reportError(int errorCode, const WebCore::String& description, |