[haiku-webkit-commits] r420 - webkit/trunk/WebCore/loader/icon
- From: webkit@xxxxxxxxxxxxxxx
- To: haiku-webkit-commits@xxxxxxxxxxxxx
- Date: Fri, 16 Apr 2010 16:05:39 +0000
Author: stippi
Date: Fri Apr 16 16:05:38 2010
New Revision: 420
URL: http://mmlr.dyndns.org/changeset/420
Log:
The problem in Haiku's pthread implementation has been fixed. Reenabled the
asserts for the debug build.
Modified:
webkit/trunk/WebCore/loader/icon/IconDatabase.cpp
Modified: webkit/trunk/WebCore/loader/icon/IconDatabase.cpp
==============================================================================
--- webkit/trunk/WebCore/loader/icon/IconDatabase.cpp Fri Apr 16 12:24:44
2010 (r419)
+++ webkit/trunk/WebCore/loader/icon/IconDatabase.cpp Fri Apr 16 16:05:38
2010 (r420)
@@ -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] r420 - webkit/trunk/WebCore/loader/icon - webkit
