Add apple-touch-icon-precomposed processing.

Send up a boolean to indicate if the touch icon url is precomposed.

4 files changed, 7 insertions, 7 deletions

diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
index 74b62dd..71d5048 100644
--- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
@@ -243,12 +243,12 @@ void FrameLoaderClientAndroid::dispatchDidReceiveIcon() {
     }
 }
 
-void FrameLoaderClientAndroid::dispatchDidReceiveTouchIconURL(const String& url) {
+void FrameLoaderClientAndroid::dispatchDidReceiveTouchIconURL(const String& url, bool precomposed) {
     ASSERT(m_frame);
     // Do not report sub frame touch icons
     if (m_frame->tree() && m_frame->tree()->parent())
         return;
-    m_webFrame->didReceiveTouchIconURL(url);
+    m_webFrame->didReceiveTouchIconURL(url, precomposed);
 }
 
 void FrameLoaderClientAndroid::dispatchDidStartProvisionalLoad() {
diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h
index c04a28f..176c8be 100644
--- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h
+++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h
@@ -192,7 +192,7 @@ namespace android {
         
         virtual void registerForIconNotification(bool listen = true);
 
-        virtual void dispatchDidReceiveTouchIconURL(const String& url);
+        virtual void dispatchDidReceiveTouchIconURL(const String& url, bool precomposed);
 
         // WebIconDatabaseClient api
         virtual void didAddIconForPageUrl(const String& pageUrl);
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp
index f768fd0..2d5c3f0 100644
--- a/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -186,7 +186,7 @@ WebFrame::WebFrame(JNIEnv* env, jobject obj, jobject historyList, WebCore::Page*
     mJavaFrame->mDidReceiveIcon = env->GetMethodID(clazz, "didReceiveIcon",
             "(Landroid/graphics/Bitmap;)V");
     mJavaFrame->mDidReceiveTouchIconUrl = env->GetMethodID(clazz, "didReceiveTouchIconUrl",
-            "(Ljava/lang/String;)V");
+            "(Ljava/lang/String;Z)V");
     mJavaFrame->mUpdateVisitedHistory = env->GetMethodID(clazz, "updateVisitedHistory",
             "(Ljava/lang/String;Z)V");
     mJavaFrame->mHandleUrl = env->GetMethodID(clazz, "handleUrl",
@@ -596,7 +596,7 @@ WebFrame::didReceiveIcon(WebCore::Image* icon)
 }
 
 void
-WebFrame::didReceiveTouchIconURL(const WebCore::String& url)
+WebFrame::didReceiveTouchIconURL(const WebCore::String& url, bool precomposed)
 {
 #ifdef ANDROID_INSTRUMENT
     TimeCounterAuto counter(TimeCounter::JavaCallbackTimeCounter);
@@ -606,7 +606,7 @@ WebFrame::didReceiveTouchIconURL(const WebCore::String& url)
             url.length());
 
     env->CallVoidMethod(mJavaFrame->frame(env).get(),
-            mJavaFrame->mDidReceiveTouchIconUrl, jUrlStr);
+            mJavaFrame->mDidReceiveTouchIconUrl, jUrlStr, precomposed);
     checkException(env);
 }
 
diff --git a/WebKit/android/jni/WebCoreFrameBridge.h b/WebKit/android/jni/WebCoreFrameBridge.h
index 609aecc..7b49981 100644
--- a/WebKit/android/jni/WebCoreFrameBridge.h
+++ b/WebKit/android/jni/WebCoreFrameBridge.h
@@ -91,7 +91,7 @@ class WebFrame : public WebCoreRefObject {
 
     void didReceiveIcon(WebCore::Image* icon);
 
-    void didReceiveTouchIconURL(const WebCore::String& url);
+    void didReceiveTouchIconURL(const WebCore::String& url, bool precomposed);
     
     void updateVisitedHistory(const WebCore::KURL& url, bool reload);