Changeset 86452 in webkit

Timestamp:

May 13, 2011 12:28:53 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-05-13 Tao Bai <​michaelbai@chromium.org>

Reviewed by Darin Fisher.

Handle the touch icon.
​https://bugs.webkit.org/show_bug.cgi?id=60247

Added WebIconURL for the corresponding IconURL.
Added method iconURLs() to specify the type of icon need to return.
The favIconURL() is deprecated and will be removed later.

• WebKit.gyp:
• features.gypi:
• public/WebFrame.h:
• public/WebFrameClient.h: (WebKit::WebFrameClient::didChangeIcons):
• public/WebIconURL.h: Added. (WebKit::WebIconURL::WebIconURL): (WebKit::WebIconURL::iconType): (WebKit::WebIconURL::iconURL):
• src/AssertMatchingEnums.cpp:
• src/FrameLoaderClientImpl.cpp: (WebKit::FrameLoaderClientImpl::dispatchDidChangeIcons):
• src/WebFrameImpl.cpp: (WebKit::WebFrameImpl::favIconURL):
• src/WebFrameImpl.h:

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (2 diffs)
• WebKit.gyp (modified) (1 diff)
• features.gypi (modified) (1 diff)
• public/WebFrame.h (modified) (2 diffs)
• public/WebFrameClient.h (modified) (2 diffs)
• public/WebIconURL.h (added)
• src/AssertMatchingEnums.cpp (modified) (3 diffs)
• src/FrameLoaderClientImpl.cpp (modified) (1 diff)
• src/WebFrameImpl.cpp (modified) (3 diffs)
• src/WebFrameImpl.h (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-05-13  Tao Bai  <michaelbai@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Handle the touch icon.
+        https://bugs.webkit.org/show_bug.cgi?id=60247
+
+        Added WebIconURL for the corresponding IconURL.
+        Added method iconURLs() to specify the type of icon need to return.
+        The favIconURL() is deprecated and will be removed later. 
+
+        * WebKit.gyp:
+        * features.gypi:
+        * public/WebFrame.h:
+        * public/WebFrameClient.h:
+        (WebKit::WebFrameClient::didChangeIcons):
+        * public/WebIconURL.h: Added.
+        (WebKit::WebIconURL::WebIconURL):
+        (WebKit::WebIconURL::iconType):
+        (WebKit::WebIconURL::iconURL):
+        * src/AssertMatchingEnums.cpp:
+        * src/FrameLoaderClientImpl.cpp:
+        (WebKit::FrameLoaderClientImpl::dispatchDidChangeIcons):
+        * src/WebFrameImpl.cpp:
+        (WebKit::WebFrameImpl::favIconURL):
+        * src/WebFrameImpl.h:
+
 2011-05-13  Sam Weinig  <sam@webkit.org>
 
@@ -265 +292 @@
 
         Added WebIconURL for the corresponding IconURL.
-        Added a parameter to favIconURL() to specify the type of icon need to
-        return.
+        Added method iconURLs() to specify the type of icon need to return.
+        The favIconURL() is deprecated.
 
         * WebKit.gyp:

trunk/Source/WebKit/chromium/WebKit.gyp

@@ -186 +186 @@
                 'public/WebHTTPLoadInfo.h',
                 'public/WebIconLoadingCompletion.h',
+                'public/WebIconURL.h',
                 'public/WebImage.h',
                 'public/WebImageDecoder.h',

trunk/Source/WebKit/chromium/features.gypi

@@ -89 +89 @@
         'ENABLE_SVG_USE=1',
         'ENABLE_TOUCH_EVENTS=1',
+        'ENABLE_TOUCH_ICON_LOADING=1',
         'ENABLE_V8_SCRIPT_DEBUG_SERVER=1',
         'ENABLE_VIDEO=1',

trunk/Source/WebKit/chromium/public/WebFrame.h

@@ -34 +34 @@
 #include "WebCanvas.h"
 #include "WebFileSystem.h"
+#include "WebIconURL.h"
 #include "WebNode.h"
 #include "WebURL.h"
+// FIXME : Remove this file when transient done.
+#include "WebVector.h"
 
 struct NPObject;
@@ -130 +133 @@
     virtual WebURL url() const = 0;
 
-    // The url of the favicon (if any) specified by the document loaded in
-    // this frame.
+    // DEPRECATED: Use iconIRLs instead.
     virtual WebURL favIconURL() const = 0;
+
+    // The urls of the given combination types of favicon (if any) specified by
+    // the document loaded in this frame. The iconTypes is a bit-mask of
+    // WebIconURL::Type values, used to select from the available set of icon
+    // URLs
+    virtual WebVector<WebIconURL> iconURLs(int iconTypes) const
+    {
+        // FIXME : Remove the implementation, this make buildbot happy during
+        //         the transient.
+        return WebVector<WebIconURL>();
+    }
 
     // The url of the OpenSearch Desription Document (if any) specified by

trunk/Source/WebKit/chromium/public/WebFrameClient.h

@@ -34 +34 @@
 #include "WebCommon.h"
 #include "WebFileSystem.h"
+#include "WebIconURL.h"
 #include "WebNavigationPolicy.h"
 #include "WebNavigationType.h"
@@ -202 +203 @@
     }
 
-    // The icons for the page have changed.
+    // DEPRECATED: Implement didChangeIcon instead.
     virtual void didChangeIcons(WebFrame*) { }
+
+    // The icon for the page have changed.
+    virtual void didChangeIcon(WebFrame*, WebIconURL::Type) { }
 
     // The frame's document finished loading.

trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp

@@ -47 +47 @@
 #include "GeolocationPosition.h"
 #include "HTMLInputElement.h"
+#include "IconURL.h"
 #include "IDBFactoryBackendInterface.h"
 #include "IDBKey.h"
@@ -74 +75 @@
 #include "WebIDBFactory.h"
 #include "WebIDBKey.h"
+#include "WebIconURL.h"
 #include "WebInputElement.h"
 #include "WebMediaPlayer.h"
@@ -305 +307 @@
 COMPILE_ASSERT_MATCHING_ENUM(WebFontDescription::WeightBold, FontWeightBold);
 
+COMPILE_ASSERT_MATCHING_ENUM(WebIconURL::TypeInvalid, InvalidIcon);
+COMPILE_ASSERT_MATCHING_ENUM(WebIconURL::TypeFavicon, Favicon);
+COMPILE_ASSERT_MATCHING_ENUM(WebIconURL::TypeTouch, TouchIcon);
+COMPILE_ASSERT_MATCHING_ENUM(WebIconURL::TypeTouchPrecomposed, TouchPrecomposedIcon);
+
 COMPILE_ASSERT_MATCHING_ENUM(WebNode::ElementNode, Node::ELEMENT_NODE);
 COMPILE_ASSERT_MATCHING_ENUM(WebNode::AttributeNode, Node::ATTRIBUTE_NODE);

trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp

@@ -760 +760 @@
 void FrameLoaderClientImpl::dispatchDidChangeIcons(WebCore::IconType type)
 {
-    if (m_webFrame->client())
-        m_webFrame->client()->didChangeIcons(m_webFrame);
+    if (m_webFrame->client()) {
+        m_webFrame->client()->didChangeIcon(m_webFrame, static_cast<WebIconURL::Type>(type));
+        // FIXME : Keep the API work in the transient.
+        if (type == WebCore::Favicon)
+            m_webFrame->client()->didChangeIcons(m_webFrame);
+    }
 }
 

trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp

@@ -102 +102 @@
 #include "HistoryItem.h"
 #include "HitTestResult.h"
+#include "IconURL.h"
 #include "InspectorController.h"
 #include "Page.h"
@@ -138 +139 @@
 #include "WebFrameClient.h"
 #include "WebHistoryItem.h"
+#include "WebIconURL.h"
 #include "WebInputElement.h"
 #include "WebNode.h"
@@ -521 +523 @@
 WebURL WebFrameImpl::favIconURL() const
 {
+    WebVector<WebIconURL> urls = iconURLs(WebIconURL::TypeFavicon);
+    if (urls.size())
+        return urls[0].iconURL();
+    return WebURL();
+}
+
+WebVector<WebIconURL> WebFrameImpl::iconURLs(int iconTypes) const
+{
     FrameLoader* frameLoader = m_frame->loader();
-    // The URL to the favicon may be in the header. As such, only
-    // ask the loader for the favicon if it's finished loading.
-    if (frameLoader->state() == FrameStateComplete) {
-        const KURL& url = frameLoader->iconURL();
-        if (!url.isEmpty())
-            return url;
-    }
-    return WebURL();
+    // The URL to the icon may be in the header. As such, only
+    // ask the loader for the icon if it's finished loading.
+    if (frameLoader->state() == FrameStateComplete)
+        return frameLoader->iconURLs(iconTypes);
+    return WebVector<WebIconURL>();
 }
 

trunk/Source/WebKit/chromium/src/WebFrameImpl.h

@@ -72 +72 @@
     virtual WebURL url() const;
     virtual WebURL favIconURL() const;
+    virtual WebVector<WebIconURL> iconURLs(int iconTypes) const;
     virtual WebURL openSearchDescriptionURL() const;
     virtual WebString encoding() const;