Title: [90486] trunk/Source/WebCore
- Revision
- 90486
- Author
- [email protected]
- Date
- 2011-07-06 13:27:32 -0700 (Wed, 06 Jul 2011)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (90485 => 90486)
--- trunk/Source/WebCore/ChangeLog 2011-07-06 20:20:05 UTC (rev 90485)
+++ trunk/Source/WebCore/ChangeLog 2011-07-06 20:27:32 UTC (rev 90486)
@@ -1,3 +1,18 @@
+2011-07-06 John Sullivan <[email protected]>
+
+ 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 <[email protected]>
Reviewed by Eric Seidel.
Modified: trunk/Source/WebCore/loader/icon/IconDatabase.cpp (90485 => 90486)
--- trunk/Source/WebCore/loader/icon/IconDatabase.cpp 2011-07-06 20:20:05 UTC (rev 90485)
+++ trunk/Source/WebCore/loader/icon/IconDatabase.cpp 2011-07-06 20:27:32 UTC (rev 90486)
@@ -224,7 +224,7 @@
// We should go our of our way to only copy it if we have to store it
if (!isOpen() || !pageCanHaveIcon(pageURLOriginal))
- return defaultIcon(size);
+ return 0;
MutexLocker locker(m_urlAndIconLock);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
