Title: [158904] trunk/Source/WebCore
- Revision
- 158904
- Author
- beid...@apple.com
- Date
- 2013-11-07 21:40:19 -0800 (Thu, 07 Nov 2013)
Log Message
Update an out-dated ASSERT in IconDatabase code.
<rdar://problem/15171118> and https://bugs.webkit.org/show_bug.cgi?id=124030.
Reviewed by Andreas Kling.
With the asynchronous interfaces that have been added and the support for WK2 that has been added,
this ASSERT can incorrectly fire if an icon is asked for before database cleanup is allowed.
* loader/icon/IconDatabase.cpp:
(WebCore::IconDatabase::synchronousIconForPageURL): Update an invalid ASSERT.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (158903 => 158904)
--- trunk/Source/WebCore/ChangeLog 2013-11-08 05:24:20 UTC (rev 158903)
+++ trunk/Source/WebCore/ChangeLog 2013-11-08 05:40:19 UTC (rev 158904)
@@ -1,3 +1,16 @@
+2013-11-07 Brady Eidson <beid...@apple.com>
+
+ Update an out-dated ASSERT in IconDatabase code.
+ <rdar://problem/15171118> and https://bugs.webkit.org/show_bug.cgi?id=124030.
+
+ Reviewed by Andreas Kling.
+
+ With the asynchronous interfaces that have been added and the support for WK2 that has been added,
+ this ASSERT can incorrectly fire if an icon is asked for before database cleanup is allowed.
+
+ * loader/icon/IconDatabase.cpp:
+ (WebCore::IconDatabase::synchronousIconForPageURL): Update an invalid ASSERT.
+
2013-11-07 Andreas Kling <akl...@apple.com>
RenderSVGResource helpers should take RenderStyle by const reference.
Modified: trunk/Source/WebCore/loader/icon/IconDatabase.cpp (158903 => 158904)
--- trunk/Source/WebCore/loader/icon/IconDatabase.cpp 2013-11-08 05:24:20 UTC (rev 158903)
+++ trunk/Source/WebCore/loader/icon/IconDatabase.cpp 2013-11-08 05:40:19 UTC (rev 158904)
@@ -261,10 +261,11 @@
// we can just bail now
if (!m_iconURLImportComplete && !iconRecord)
return 0;
+
+ // Assuming we're done initializing and cleanup is allowed,
+ // the only way we should *not* have an icon record is if this pageURL is retained but has no icon yet.
+ ASSERT(iconRecord || databaseCleanupCounter || m_retainedPageURLs.contains(pageURLOriginal));
- // The only way we should *not* have an icon record is if this pageURL is retained but has no icon yet - make sure of that
- ASSERT(iconRecord || m_retainedPageURLs.contains(pageURLOriginal));
-
if (!iconRecord)
return 0;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
