diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2009-11-15 12:06:13 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2009-11-15 12:06:16 -0800 |
| commit | 19b276ff1f54bed5c687bef385cb6d8c33332d56 (patch) | |
| tree | 3f24d37c741607a2f8d4b8ba40d723047bc74456 /WebKit/android/jni/WebCoreFrameBridge.h | |
| parent | a2acdcdf0059d9926f5b53c6824fe16371dd04f2 (diff) | |
| parent | ca654d632f783143435336ddc4381fbda6340a65 (diff) | |
| download | external_webkit-19b276ff1f54bed5c687bef385cb6d8c33332d56.zip external_webkit-19b276ff1f54bed5c687bef385cb6d8c33332d56.tar.gz external_webkit-19b276ff1f54bed5c687bef385cb6d8c33332d56.tar.bz2 | |
merge from eclair
Diffstat (limited to 'WebKit/android/jni/WebCoreFrameBridge.h')
| -rw-r--r-- | WebKit/android/jni/WebCoreFrameBridge.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/WebKit/android/jni/WebCoreFrameBridge.h b/WebKit/android/jni/WebCoreFrameBridge.h index f554117..7b49981 100644 --- a/WebKit/android/jni/WebCoreFrameBridge.h +++ b/WebKit/android/jni/WebCoreFrameBridge.h @@ -54,6 +54,7 @@ class WebFrame : public WebCoreRefObject { enum RAW_RES_ID { NODOMAIN = 1, LOADERROR, + DRAWABLEDIR, }; WebFrame(JNIEnv* env, jobject obj, jobject historyList, WebCore::Page* page); ~WebFrame(); @@ -63,7 +64,6 @@ class WebFrame : public WebCoreRefObject { virtual WebCoreResourceLoader* startLoadingResource(WebCore::ResourceHandle*, const WebCore::ResourceRequest& request, - bool isHighPriority, bool synchronous); void reportError(int errorCode, const WebCore::String& description, @@ -90,6 +90,8 @@ class WebFrame : public WebCoreRefObject { const WebCore::String userAgentForURL(const WebCore::KURL* url); void didReceiveIcon(WebCore::Image* icon); + + void didReceiveTouchIconURL(const WebCore::String& url, bool precomposed); void updateVisitedHistory(const WebCore::KURL& url, bool reload); @@ -107,6 +109,8 @@ class WebFrame : public WebCoreRefObject { WebCore::String getRawResourceFilename(RAW_RES_ID) const; + float density() const; + /** * When the user initiates a click (via trackball, enter-press, or touch), * we set mUserInitiatedClick to true. If a load happens due to this click, |