Ues loadFrameRequest instead of loadPostRequest so that we don't need to change WebKit any more.

2 files changed, 4 insertions, 10 deletions

diff --git a/WebCore/loader/FrameLoader.h b/WebCore/loader/FrameLoader.h
index 07e530e..24e7d96 100644
--- a/WebCore/loader/FrameLoader.h
+++ b/WebCore/loader/FrameLoader.h
@@ -513,13 +513,8 @@ namespace WebCore {
             bool lockHistory, FrameLoadType, PassRefPtr<FormState>);
 
 #ifdef ANDROID_USER_GESTURE
-// FIXME (klobag): WebKit/android/jni/WebCoreFrameBridge.cpp uses
-// loadPostRequest, figure out if we can use load(...) instead of
-// making loadPostRequest public.
-public:
         void loadPostRequest(const ResourceRequest&, const String& referrer,                // Called by loadFrameRequest, calls loadWithNavigationAction
             const String& frameName, bool lockHistory, FrameLoadType, PassRefPtr<Event>, PassRefPtr<FormState>, bool userGesture);
-private:
         void loadURL(const KURL&, const String& referrer, const String& frameName,          // Called by loadFrameRequest, calls loadWithNavigationAction or dispatches to navigation policy delegate
             bool lockHistory, FrameLoadType, PassRefPtr<Event>, PassRefPtr<FormState>, bool userGesture);
 #endif // ANDROID_USER_GESTURE
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp
index 7860b8c..091417b 100644
--- a/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -45,6 +45,7 @@
 #include "Frame.h"
 #include "FrameLoader.h"
 #include "FrameLoaderClientAndroid.h"
+#include "FrameLoadRequest.h"
 #include "FrameTree.h"
 #include "FrameView.h"
 #include "GraphicsContext.h"
@@ -821,6 +822,7 @@ static void PostUrl(JNIEnv *env, jobject obj, jstring url, jbyteArray postData)
 
     WebCore::KURL kurl(WebCore::KURL(), to_string(env, url));
     WebCore::ResourceRequest request(kurl);
+    request.setHTTPMethod("POST");
     request.setHTTPContentType("application/x-www-form-urlencoded");
 
     if (postData) {
@@ -831,11 +833,8 @@ static void PostUrl(JNIEnv *env, jobject obj, jstring url, jbyteArray postData)
     }
 
     LOGV("PostUrl %s", kurl.string().latin1().data());
-    // FIXME klobag, WebCore changed FrameLoader::loadPostRequest to private,
-    // I temporarily made it public in FrameLoader.h, please figure out
-    // if we can use FrameLoader::load(...) to send POST request.
-    pFrame->loader()->loadPostRequest(request, String(), String(), false,
-            WebCore::FrameLoadTypeStandard, 0, 0, true);
+    WebCore::FrameLoadRequest frameRequest(request);
+    pFrame->loader()->loadFrameRequest(frameRequest, false, false, 0, 0);
 }
 
 static void LoadData(JNIEnv *env, jobject obj, jstring baseUrl, jstring data,