Changeset 25604 in webkit

Timestamp:

Sep 17, 2007 4:38:14 PM (17 years ago)

Author:

beidson

Message:

Reviewed by John Sullivan

Fix for ​http://bugs.webkit.org/show_bug.cgi?id=15178
and
<rdar://problem/5474001>

The stress test proves that this was an overzealous ASSERT. It is very possible to mark and icon
for addition to the on-disk database and then mark it for removal before it is ever added. This
is not an error and was already handled gracefully

• loader/icon/IconDatabase.cpp: (WebCore::IconDatabase::removeIconFromSQLDatabase): Don't ASSERT of log if the icon wasn't on disk

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-09-17  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by John Sullivan
+
+        Fix for http://bugs.webkit.org/show_bug.cgi?id=15178
+        and
+        <rdar://problem/5474001>
+
+        The stress test proves that this was an overzealous ASSERT.  It is very possible to mark and icon
+        for addition to the on-disk database and then mark it for removal before it is ever added.  This
+        is not an error and was already handled gracefully
+
+        * loader/icon/IconDatabase.cpp:
+        (WebCore::IconDatabase::removeIconFromSQLDatabase): Don't ASSERT of log if the icon wasn't on disk
+
 2007-09-17  Brady Eidson  <beidson@apple.com>
 

trunk/WebCore/loader/icon/IconDatabase.cpp

@@ -1954 +1954 @@
     // In practice the only caller of this method is always wrapped in a transaction itself so placing another here is unnecessary
     
+    // It's possible this icon is not in the database because of certain rapid browsing patterns (such as a stress test) where the
+    // icon is marked to be added then marked for removal before it is ever written to disk.  No big deal, early return
     int64_t iconID = getIconIDForIconURLFromSQLDatabase(iconURL);
-    ASSERT(iconID);
-    if (!iconID) {
-        LOG_ERROR("Unable to get iconID for icon URL %s to delete it from the database", urlForLogging(iconURL).utf8().data());
-        return;
-    }
+    if (!iconID)
+        return;
     
     readySQLStatement(m_deletePageURLsForIconURLStatement, m_syncDB, "DELETE FROM PageURL WHERE PageURL.iconID = (?);");