diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-19 17:16:42 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-19 17:16:42 -0700 |
| commit | 25b3eb1cdb4b57a15a24a30384d296f5791c75e8 (patch) | |
| tree | 95a5d55c423f43a24014e1d09107f80e8c14014f /WebCore/loader | |
| parent | 905ad350f895412aaf672f9181ad8f47502dcce8 (diff) | |
| parent | 449ac9fc07581f9ab48d7931d3c0271c317794e9 (diff) | |
| download | external_webkit-25b3eb1cdb4b57a15a24a30384d296f5791c75e8.zip external_webkit-25b3eb1cdb4b57a15a24a30384d296f5791c75e8.tar.gz external_webkit-25b3eb1cdb4b57a15a24a30384d296f5791c75e8.tar.bz2 | |
Merge change 4804
* changes:
Ues loadFrameRequest instead of loadPostRequest so that we don't need to change WebKit any more.
Diffstat (limited to 'WebCore/loader')
| -rw-r--r-- | WebCore/loader/FrameLoader.h | 5 |
1 files changed, 0 insertions, 5 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 |