Bug 124030 – Update an out-dated ASSERT in IconDatabase code

• Component: WebCore Misc.
• Status: RESOLVED FIXED

[Brady Eidson]

Update an out-dated ASSERT in IconDatabase code

The ASSERT in IconDatabase.cpp:
    ASSERT(iconRecord || m_retainedPageURLs.contains(pageURLOriginal));
... was added when the IconDatabase interface was largely synchronous and only about WebKit1

With the asynchronous interfaces that have been added and the support for WK2 that has been added, the ASSERT can incorrectly fire if an icon is asked for before database cleanup is allowed.

It should be updated to:
    ASSERT(iconRecord || databaseCleanupCounter || m_retainedPageURLs.contains(pageURLOriginal));

In radar as <rdar://problem/15171118>

[Brady Eidson]

Created attachment 216359 [details]
Patch v1

[Andreas Kling]

Comment on attachment 216359 [details]
Patch v1 

rs=me

[Brady Eidson]

http://trac.webkit.org/changeset/158904