Changeset 95593 in webkit

Timestamp:

Sep 20, 2011 6:49:03 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Support for multiple <link rel="icon"> favicon elements.
​https://bugs.webkit.org/show_bug.cgi?id=65564

Patch by Rachel Blum <​groby@chromium.org> on 2011-09-20
Reviewed by Darin Fisher.

No tests - purely an API change. (And API is not exposed to LayoutTests)

• dom/Document.cpp:

(WebCore::Document::iconURLs):
(WebCore::Document::addIconURL):

• dom/Document.h:
• dom/IconURL.cpp:

(WebCore::toIconIndex):

• dom/IconURL.h:

(WebCore::IconURL::IconURL):

• html/HTMLLinkElement.cpp:

(WebCore::HTMLLinkElement::process):

• loader/LinkLoader.cpp:

(WebCore::LinkLoader::loadLink):

• loader/LinkLoader.h:
• loader/icon/IconController.cpp:

(WebCore::IconController::urlsForTypes):
(WebCore::IconController::appendToIconURLs):
(WebCore::IconController::defaultURL):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (2 diffs)
• dom/Document.h (modified) (3 diffs)
• dom/IconURL.cpp (modified) (1 diff)
• dom/IconURL.h (modified) (1 diff)
• html/HTMLLinkElement.cpp (modified) (1 diff)
• loader/DocumentLoader.cpp (modified) (2 diffs)
• loader/DocumentLoader.h (modified) (5 diffs)
• loader/FrameLoader.cpp (modified) (2 diffs)
• loader/FrameLoader.h (modified) (2 diffs)
• loader/LinkLoader.cpp (modified) (2 diffs)
• loader/LinkLoader.h (modified) (1 diff)
• loader/icon/IconController.cpp (modified) (6 diffs)
• loader/icon/IconController.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-20  Rachel Blum  <groby@chromium.org>
+
+        Support for multiple <link rel="icon"> favicon elements.
+        https://bugs.webkit.org/show_bug.cgi?id=65564
+
+        Reviewed by Darin Fisher.
+
+        No tests - purely an API change. (And API is not exposed to LayoutTests)
+
+        * dom/Document.cpp:
+        (WebCore::Document::iconURLs):
+        (WebCore::Document::addIconURL):
+        * dom/Document.h:
+        * dom/IconURL.cpp:
+        (WebCore::toIconIndex):
+        * dom/IconURL.h:
+        (WebCore::IconURL::IconURL):
+        * html/HTMLLinkElement.cpp:
+        (WebCore::HTMLLinkElement::process):
+        * loader/LinkLoader.cpp:
+        (WebCore::LinkLoader::loadLink):
+        * loader/LinkLoader.h:
+        * loader/icon/IconController.cpp:
+        (WebCore::IconController::urlsForTypes):
+        (WebCore::IconController::appendToIconURLs):
+        (WebCore::IconController::defaultURL):
+
 2011-09-20  Ojan Vafai  <ojan@chromium.org>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -6 +6 @@
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
- * Copyright (C) 2008, 2009 Google Inc. All rights reserved.
+ * Copyright (C) 2008, 2009, 2011 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  *
@@ -4431 +4431 @@
 }
 
-IconURL Document::iconURL(IconType iconType) const
-{
-    return m_iconURLs[toIconIndex(iconType)];
-}
-
-void Document::setIconURL(const String& url, const String& mimeType, IconType iconType)
-{
+const Vector<IconURL>& Document::iconURLs() const
+{
+    return m_iconURLs;
+}
+
+void Document::addIconURL(const String& url, const String& mimeType, const String& sizes, IconType iconType)
+{
+    if (url.isEmpty())
+        return;
+
     // FIXME - <rdar://problem/4727645> - At some point in the future, we might actually honor the "mimeType"
-    IconURL newURL(KURL(ParsedURLString, url), iconType);
-    if (iconURL(iconType).m_iconURL.isEmpty())
-        setIconURL(newURL);
-    else if (!mimeType.isEmpty())
-        setIconURL(newURL);
-    if (Frame* f = frame())
-        f->loader()->icon()->setURL(newURL);
-}
-
-void Document::setIconURL(const IconURL& iconURL)
-{
-    m_iconURLs[toIconIndex(iconURL.m_iconType)] = iconURL;
+    IconURL newURL(KURL(ParsedURLString, url), sizes, mimeType, iconType);
+    m_iconURLs.append(newURL);
+
+    if (Frame* f = frame()) {
+        IconURL iconURL = f->loader()->icon()->iconURL(iconType);
+        if (iconURL == newURL)
+            f->loader()->didChangeIcons(iconType);
+    }
 }
 

trunk/Source/WebCore/dom/Document.h

@@ -7 +7 @@
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
+ * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -918 +919 @@
     void setHasNodesWithPlaceholderStyle() { m_hasNodesWithPlaceholderStyle = true; }
 
-    IconURL iconURL(IconType) const;
-    void setIconURL(const String&, const String&, IconType);
-    void setIconURL(const IconURL&);
+    const Vector<IconURL>& iconURLs() const;
+    void addIconURL(const String& url, const String& mimeType, const String& size, IconType);
 
     void setUseSecureKeyboardEntryWhenActive(bool);
@@ -1350 +1350 @@
     bool m_createRenderers;
     bool m_inPageCache;
-    IconURL m_iconURLs[ICON_COUNT];
+    Vector<IconURL> m_iconURLs;
 
     HashSet<Element*> m_documentActivationCallbackElements;

trunk/Source/WebCore/dom/IconURL.cpp

@@ -55 +55 @@
 }
 
+IconURL IconURL::defaultIconURL(const KURL& url, IconType type)
+{
+    IconURL result(url, emptyString(), emptyString(), type);
+    result.m_isDefaultIcon = true;
+    return result;
 }
 
+bool operator==(const IconURL& lhs, const IconURL& rhs)
+{
+    return lhs.m_iconType == rhs.m_iconType
+           && lhs.m_isDefaultIcon == rhs.m_isDefaultIcon
+           && lhs.m_iconURL == rhs.m_iconURL
+           && lhs.m_sizes == rhs.m_sizes
+           && lhs.m_mimeType == rhs.m_mimeType;
+}
+
+}
+

trunk/Source/WebCore/dom/IconURL.h

@@ -46 +46 @@
     Favicon = 1,
     TouchIcon = 1 << 1,
-    TouchPrecomposedIcon = 1 << 2
+    TouchPrecomposedIcon = 1 << 2,
 };
 
 struct IconURL {
     IconType m_iconType;
+    String m_sizes;
+    String m_mimeType;
     KURL m_iconURL;
+    bool m_isDefaultIcon;
 
     IconURL()
         : m_iconType(InvalidIcon)
+        , m_isDefaultIcon(false)
     {
     }
 
-    IconURL(const KURL& url, IconType type)
+    IconURL(const KURL& url, const String& sizes, const String& mimeType, IconType type)
         : m_iconType(type)
+        , m_sizes(sizes)
+        , m_mimeType(mimeType)
         , m_iconURL(url)
+        , m_isDefaultIcon(false)
     {
     }
+    
+    static IconURL defaultIconURL(const KURL&, IconType);
 };
+
+bool operator==(const IconURL&, const IconURL&);
 
 typedef Vector<IconURL, ICON_COUNT> IconURLs;

trunk/Source/WebCore/html/HTMLLinkElement.cpp

@@ -180 +180 @@
     String type = m_type.lower();
 
-    if (!m_linkLoader.loadLink(m_relAttribute, type, m_url, document()))
+    if (!m_linkLoader.loadLink(m_relAttribute, type, m_sizes->toString(), m_url, document()))
         return;
 

trunk/Source/WebCore/loader/DocumentLoader.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -683 +684 @@
 }
 
-IconURL DocumentLoader::iconURL(IconType iconType) const
-{
-    return m_iconURLs[toIconIndex(iconType)];
-}
-
-void DocumentLoader::setIconURL(const IconURL& url)
-{
-    if (url.m_iconURL.isEmpty())
-        return;
-
-    if (iconURL(url.m_iconType).m_iconURL != url.m_iconURL) {
-        m_iconURLs[toIconIndex(url.m_iconType)] = url;
-        frameLoader()->didChangeIcons(this, url.m_iconType);
-    }
-}
-
 KURL DocumentLoader::urlForHistory() const
 {

trunk/Source/WebCore/loader/DocumentLoader.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33 +34 @@
 #include "DocumentWriter.h"
 #include "IconDatabaseBase.h"
-#include "IconURL.h"
 #include "NavigationAction.h"
 #include "ResourceError.h"
@@ -129 +129 @@
         void setPrimaryLoadComplete(bool);
         void setTitle(const StringWithDirection&);
-        void setIconURL(const IconURL&);
         const String& overrideEncoding() const { return m_overrideEncoding; }
 
@@ -176 +175 @@
         void stopRecordingResponses();
         const StringWithDirection& title() const { return m_pageTitle; }
-        IconURL iconURL(IconType) const;
 
         KURL urlForHistory() const;
@@ -315 +313 @@
 
         StringWithDirection m_pageTitle;
-        IconURL m_iconURLs[ICON_COUNT];
 
         String m_overrideEncoding;

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -6 +6 @@
  * Copyright (C) Research In Motion Limited 2009. All rights reserved.
  * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
+ * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -3229 +3230 @@
 }
 
-void FrameLoader::didChangeIcons(DocumentLoader* loader, IconType type)
-{
-    if (loader == m_documentLoader)
-        m_client->dispatchDidChangeIcons(type);
+void FrameLoader::didChangeIcons(IconType type)
+{
+    m_client->dispatchDidChangeIcons(type);
 }
 

trunk/Source/WebCore/loader/FrameLoader.h

@@ -3 +3 @@
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) Research In Motion Limited 2009. All rights reserved.
+ * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -170 +171 @@
     void willChangeTitle(DocumentLoader*);
     void didChangeTitle(DocumentLoader*);
-    void didChangeIcons(DocumentLoader*, IconType);
+    void didChangeIcons(IconType);
 
     FrameLoadType loadType() const;

trunk/Source/WebCore/loader/LinkLoader.cpp

@@ -86 +86 @@
 
 bool LinkLoader::loadLink(const LinkRelAttribute& relAttribute, const String& type,
-                          const KURL& href, Document* document)
+                          const String& sizes, const KURL& href, Document* document)
 {
     // We'll record this URL per document, even if we later only use it in top level frames
@@ -92 +92 @@
         if (!m_client->shouldLoadLink()) 
             return false;
-        document->setIconURL(href.string(), type, relAttribute.m_iconType);
+        document->addIconURL(href.string(), type, sizes, relAttribute.m_iconType);
     }
 

trunk/Source/WebCore/loader/LinkLoader.h

@@ -51 +51 @@
     virtual void notifyFinished(CachedResource*);
     
-    bool loadLink(const LinkRelAttribute&, const String& type, const KURL&, Document*);
+    bool loadLink(const LinkRelAttribute&, const String& type, const String& sizes, const KURL&, Document*);
 
 private:

trunk/Source/WebCore/loader/icon/IconController.cpp

@@ -6 +6 @@
  * Copyright (C) Research In Motion Limited 2009. All rights reserved.
  * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
+ * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -65 +66 @@
 }
 
+IconURL IconController::iconURL(IconType iconType) const
+{
+    IconURL result;
+    const Vector<IconURL>& iconURLs = m_frame->document()->iconURLs();
+    Vector<IconURL>::const_iterator iter(iconURLs.begin());
+    for (; iter != iconURLs.end(); ++iter) {
+        if (iter->m_iconType == iconType) {
+            if (result.m_iconURL.isEmpty() || !iter->m_mimeType.isEmpty())
+                result = *iter;
+        }
+    }
+
+    return result;
+}
+
 IconURLs IconController::urlsForTypes(int iconTypes)
 {
@@ -70 +86 @@
     if (m_frame->tree() && m_frame->tree()->parent())
         return iconURLs;
-
+        
     if (iconTypes & Favicon && !appendToIconURLs(Favicon, &iconURLs))
         iconURLs.append(defaultURL(Favicon));
 
 #if ENABLE(TOUCH_ICON_LOADING)
-    bool havePrecomposedIcon = false;
+    int missedIcons = 0;
     if (iconTypes & TouchPrecomposedIcon)
-        havePrecomposedIcon = appendToIconURLs(TouchPrecomposedIcon, &iconURLs);
-
-    bool haveTouchIcon = false;
+        missedIcons += appendToIconURLs(TouchPrecomposedIcon, &iconURLs) ? 0:1;
+
     if (iconTypes & TouchIcon)
-        haveTouchIcon = appendToIconURLs(TouchIcon, &iconURLs);
+      missedIcons += appendToIconURLs(TouchIcon, &iconURLs) ? 0:1;
 
     // Only return the default touch icons when the both were required and neither was gotten.
-    if (iconTypes & TouchPrecomposedIcon && iconTypes & TouchIcon && !havePrecomposedIcon && !haveTouchIcon) {
+    if (missedIcons == 2) {
         iconURLs.append(defaultURL(TouchPrecomposedIcon));
         iconURLs.append(defaultURL(TouchIcon));
     }
 #endif
+
+    // Finally, append all remaining icons of this type.
+    const Vector<IconURL>& allIconURLs = m_frame->document()->iconURLs();
+    for (Vector<IconURL>::const_iterator iter = allIconURLs.begin(); iter != allIconURLs.end(); ++iter) {
+        if (!(iter->m_iconType & iconTypes))
+            continue;
+
+        int i;
+        int iconCount = iconURLs.size();
+        for (i = 0; i < iconCount; ++i) {
+            if (*iter == iconURLs.at(i))
+                break;
+        }
+        if (i == iconCount)
+            iconURLs.append(*iter);
+    }
+
     return iconURLs;
 }
@@ -97 +129 @@
     iconDatabase().setIconURLForPageURL(icon.string(), m_frame->document()->url().string());
     iconDatabase().setIconURLForPageURL(icon.string(), m_frame->loader()->initialRequest().url().string());
-}
-
-void IconController::setURL(const IconURL& iconURL)
-{
-    m_frame->loader()->documentLoader()->setIconURL(iconURL);
 }
 
@@ -219 +246 @@
 bool IconController::appendToIconURLs(IconType iconType, IconURLs* iconURLs)
 {
-    IconURL url = m_frame->document()->iconURL(iconType);
-    if (url.m_iconURL.isEmpty())
+    IconURL faviconURL = iconURL(iconType);
+    if (faviconURL.m_iconURL.isEmpty())
         return false;
 
-    iconURLs->append(url);
+    iconURLs->append(faviconURL);
     return true;
 }
@@ -240 +267 @@
     if (documentURL.hasPort())
         url.setPort(documentURL.port());
+
     if (iconType == Favicon) {
         url.setPath("/favicon.ico");
-        return IconURL(url, Favicon);
+        return IconURL::defaultIconURL(url, Favicon);
     }
 #if ENABLE(TOUCH_ICON_LOADING)
     if (iconType == TouchPrecomposedIcon) {
         url.setPath("/apple-touch-icon-precomposed.png");
-        return IconURL(url, TouchPrecomposedIcon);
+        return IconURL::defaultIconURL(url, TouchPrecomposedIcon);
     }
     if (iconType == TouchIcon) {
         url.setPath("/apple-touch-icon.png");
-        return IconURL(url, TouchIcon);
+        return IconURL::defaultIconURL(url, TouchIcon);
     }
 #endif

trunk/Source/WebCore/loader/icon/IconController.h

@@ -50 +50 @@
     KURL url();
     IconURLs urlsForTypes(int iconTypes);
-
-    // FIXME: We should inline this function into its one caller!
-    void setURL(const IconURL&);
+    IconURL iconURL(IconType) const;
 
     void startLoader();