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/jni/WebCoreFrameBridge.h | |
| 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/jni/WebCoreFrameBridge.h')
| -rw-r--r-- | WebKit/android/jni/WebCoreFrameBridge.h | 2 |
1 files changed, 1 insertions, 1 deletions
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, |