[haiku-webkit-commits] r411 - webkit/trunk/WebCore/loader/icon
- From: webkit@xxxxxxxxxxxxxxx
- To: haiku-webkit-commits@xxxxxxxxxxxxx
- Date: Tue, 13 Apr 2010 23:07:33 +0000
Author: stippi
Date: Tue Apr 13 23:07:33 2010
New Revision: 411
URL: http://mmlr.dyndns.org/changeset/411
Log:
Temporarily disable these tryLock() asserts, until Haiku's pthread
implementation
is fixed. (Ingo is already working on this...)
Modified:
webkit/trunk/WebCore/loader/icon/IconDatabase.cpp
Modified: webkit/trunk/WebCore/loader/icon/IconDatabase.cpp
==============================================================================
--- webkit/trunk/WebCore/loader/icon/IconDatabase.cpp Tue Apr 13 22:51:56
2010 (r410)
+++ webkit/trunk/WebCore/loader/icon/IconDatabase.cpp Tue Apr 13 23:07:33
2010 (r411)
@@ -860,7 +860,7 @@
PassRefPtr<IconRecord> IconDatabase::getOrCreateIconRecord(const String&
iconURL)
{
// Clients of getOrCreateIconRecord() are required to acquire the
m_urlAndIconLock before calling this method
- ASSERT(!m_urlAndIconLock.tryLock());
+// ASSERT(!m_urlAndIconLock.tryLock());
if (IconRecord* icon = m_iconURLToRecordMap.get(iconURL))
return icon;
@@ -875,7 +875,7 @@
PageURLRecord* IconDatabase::getOrCreatePageURLRecord(const String& pageURL)
{
// Clients of getOrCreatePageURLRecord() are required to acquire the
m_urlAndIconLock before calling this method
- ASSERT(!m_urlAndIconLock.tryLock());
+// ASSERT(!m_urlAndIconLock.tryLock());
if (pageURL.isEmpty())
return 0;
Other related posts:
- » [haiku-webkit-commits] r411 - webkit/trunk/WebCore/loader/icon - webkit
