Changeset 86279 in webkit

Timestamp:

May 11, 2011 3:58:41 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

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

Reviewed by David Kilzer.

Return empty Favicon URL instead of default one when the frame isn't top level one
​https://bugs.webkit.org/show_bug.cgi?id=60527
This issue was discovered by chromium browser test.

• dom/Document.cpp: (WebCore::Document::setIconURL): Restored original logic which was inadvertently flipped by ​http://trac.webkit.org/changeset/85785.
• loader/FrameLoader.cpp: (WebCore::FrameLoader::iconURLs): (WebCore::FrameLoader::fillIconURL): Restored original logic, the empty URL should be returned instead of default one. The client (at least chromium) may rely on the returned value to decided whether the favicon should be changed.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-11  Tao Bai  <michaelbai@chromium.org>
+
+        Reviewed by David Kilzer.
+
+        Return empty Favicon URL instead of default one when the frame isn't top level one
+        https://bugs.webkit.org/show_bug.cgi?id=60527
+        This issue was discovered by chromium browser test.
+
+        * dom/Document.cpp:
+        (WebCore::Document::setIconURL):
+        Restored original logic which was inadvertently flipped by http://trac.webkit.org/changeset/85785.
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::iconURLs):
+        (WebCore::FrameLoader::fillIconURL):
+        Restored original logic, the empty URL should be returned instead of default one. The client (at
+        least chromium) may rely on the returned value to decided whether the favicon should be changed.
+
 2011-05-11  Nat Duca  <nduca@chromium.org>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -4423 +4423 @@
     // 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())
+    if (iconURL(iconType).m_iconURL.isEmpty())
         setIconURL(newURL);
     else if (!mimeType.isEmpty())

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -477 +477 @@
 {
     IconURLs iconURLs;
+    // If this isn't a top level frame, return
+    if (m_frame->tree() && m_frame->tree()->parent())
+        return iconURLs;
+
     if (iconTypes & Favicon && !fillIconURL(Favicon, &iconURLs))
         iconURLs.append(getDefaultIconURL(Favicon));
@@ -500 +504 @@
 bool FrameLoader::fillIconURL(IconType iconType, IconURLs* iconURLs)
 {
-    // If this isn't a top level frame, return
-    if (m_frame->tree() && m_frame->tree()->parent())
-        return false;
-
     // If we have an iconURL from a Link element, return that
     IconURL url = m_frame->document()->iconURL(iconType);