Changeset 157885 in webkit

Timestamp:

Oct 23, 2013 2:05:30 PM (11 years ago)

Author:

mark.lam@apple.com

Message:

Fix assertion in DatabaseManager::detailsForNameAndOrigin() to be iOS friendly.
​https://bugs.webkit.org/show_bug.cgi?id=123218.

Reviewed by Joseph Pecoraro.

No new tests.

• Modules/webdatabase/DatabaseManager.cpp:

(WebCore::DatabaseManager::detailsForNameAndOrigin):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/webdatabase/DatabaseManager.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-23  Mark Lam  <mark.lam@apple.com>
+
+        Fix assertion in DatabaseManager::detailsForNameAndOrigin() to be iOS friendly.
+        https://bugs.webkit.org/show_bug.cgi?id=123218.
+
+        Reviewed by Joseph Pecoraro.
+
+        No new tests.
+
+        * Modules/webdatabase/DatabaseManager.cpp:
+        (WebCore::DatabaseManager::detailsForNameAndOrigin):
+
 2013-10-23  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp

@@ -395 +395 @@
     ProposedDatabase* db = m_proposedDatabase;
     if (db && db->details().name() == name && db->origin()->equal(origin)) {
-        ASSERT(db->details().thread() == currentThread());
+        ASSERT(db->details().thread() == currentThread() || isMainThread());
         return db->details();
     }