Changeset 90486 in webkit

Timestamp:

Jul 6, 2011, 1:27:32 PM (15 years ago)

Author:

sullivan@apple.com

Message:

IconDatabase::synchronousIconForPageURL() has inconsistent API when no custom icon is available
<​https://bugs.webkit.org/show_bug.cgi?id=64015>
<rdar://problem/9706277>

For some URLs it would return a particular size of default icon; for other
URLs it would return 0.

Reviewed by Ada Chan.

• loader/icon/IconDatabase.cpp:

(WebCore::IconDatabase::synchronousIconForPageURL):
Return 0 in all cases where there is no custom icon.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/icon/IconDatabase.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-06  John Sullivan  <sullivan@apple.com>
+
+        IconDatabase::synchronousIconForPageURL() has inconsistent API when no custom icon is available
+        <https://bugs.webkit.org/show_bug.cgi?id=64015>
+        <rdar://problem/9706277>
+
+        For some URLs it would return a particular size of default icon; for other
+        URLs it would return 0.
+
+        Reviewed by Ada Chan.
+
+        * loader/icon/IconDatabase.cpp:
+        (WebCore::IconDatabase::synchronousIconForPageURL):
+        Return 0 in all cases where there is no custom icon.
+
 2011-07-06  Emil A Eklund  <eae@chromium.org>
 

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

@@ -225 +225 @@
     
     if (!isOpen() || !pageCanHaveIcon(pageURLOriginal))
-        return defaultIcon(size);
+        return 0;
 
     MutexLocker locker(m_urlAndIconLock);