Changeset 86091 in webkit

Timestamp:

May 9, 2011 3:04:34 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

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

Reviewed by David Levin.

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

Added WebIconURL for the corresponding IconURL.
Added a parameter to favIconURL() to specify the type of icon need to
return.

• WebKit.gyp:
• features.gypi:
• public/WebFrame.h:
• public/WebFrameClient.h: (WebKit::WebFrameClient::didChangeIcons):
• public/WebIconURL.h: Added. (WebKit::WebIconURL::WebIconURL):
• 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) (1 diff)
• 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) (4 diffs)
• src/WebFrameImpl.h (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-05-09  Tao Bai  <michaelbai@chromium.org>
+
+        Reviewed by David Levin.
+
+        Handle the touch icon.
+        https://bugs.webkit.org/show_bug.cgi?id=60247
+
+        Added WebIconURL for the corresponding IconURL.
+        Added a parameter to favIconURL() to specify the type of icon need to
+        return.
+
+        * WebKit.gyp:
+        * features.gypi:
+        * public/WebFrame.h:
+        * public/WebFrameClient.h:
+        (WebKit::WebFrameClient::didChangeIcons):
+        * public/WebIconURL.h: Added.
+        (WebKit::WebIconURL::WebIconURL):
+        * src/AssertMatchingEnums.cpp:
+        * src/FrameLoaderClientImpl.cpp:
+        (WebKit::FrameLoaderClientImpl::dispatchDidChangeIcons):
+        * src/WebFrameImpl.cpp:
+        (WebKit::WebFrameImpl::favIconURL):
+        * src/WebFrameImpl.h:
+
 2011-05-09  Evan Martin  <evan@chromium.org>
 

trunk/Source/WebKit/chromium/WebKit.gyp

@@ -186 +186 @@
                 'public/WebHTTPLoadInfo.h',
                 'public/WebIconLoadingCompletion.h',
+                'public/WebIconType.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"
@@ -130 +131 @@
     virtual WebURL url() const = 0;
 
-    // The url of the favicon (if any) specified by the document loaded in
-    // this frame.
-    virtual WebURL favIconURL() const = 0;
+    // The urls of the given combination types of favicon (if any) specified by
+    // the document loaded in this frame.
+    virtual WebVector<WebIconURL> favIconURL(int iconTypes) const = 0;
 
     // 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"
@@ -203 +204 @@
 
     // The icons for the page have changed.
-    virtual void didChangeIcons(WebFrame*) { }
+    virtual void didChangeIcons(WebFrame*, WebIconURL::WebIconType) { }
 
     // 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::WebIconTypeInvalid, InvalidIcon);
+COMPILE_ASSERT_MATCHING_ENUM(WebIconURL::WebIconTypeFavicon, Favicon);
+COMPILE_ASSERT_MATCHING_ENUM(WebIconURL::WebIconTypeTouch, TouchIcon);
+COMPILE_ASSERT_MATCHING_ENUM(WebIconURL::WebIconTypeTouchPrecomposed, 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

@@ -761 +761 @@
 {
     if (m_webFrame->client())
-        m_webFrame->client()->didChangeIcons(m_webFrame);
+        m_webFrame->client()->didChangeIcons(m_webFrame, static_cast<WebIconURL::WebIconType>(type));
 }
 

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"
@@ -519 +521 @@
 }
 
-WebURL WebFrameImpl::favIconURL() const
+WebVector<WebIconURL> WebFrameImpl::favIconURL(int webIconTypes) const
 {
     FrameLoader* frameLoader = m_frame->loader();
@@ -525 +527 @@
     // 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();
+        WTF::Vector<WebCore::IconURL> iconURLs = frameLoader->iconURLs(webIconTypes);
+        WebVector<WebIconURL> webIconURLs(iconURLs.size());
+        for (size_t i = 0; i < iconURLs.size(); i++)
+            webIconURLs[i] = WebIconURL(iconURLs[i].m_iconURL, static_cast<WebIconURL::WebIconType>(iconURLs[i].m_iconType));
+        return webIconURLs;
+    }
+    return WebVector<WebIconURL>();
 }
 

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

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