[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[eric at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit c2ef1d1e49c5c5fef7a2c63479d054bd69d40008
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Aug 8 06:58:14 2010 +0000

    2010-08-07  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Sam Weinig.
    
            Empty strings can have more than one ref
            https://bugs.webkit.org/show_bug.cgi?id=43666
    
            These asserts are trying to say that we have a thread-safe copy of the
            string, but they're not accurate for empty strings because we use a
            special static empty string that magically has infinite refs.
    
            * storage/OriginUsageRecord.cpp:
            (WebCore::OriginUsageRecord::addDatabase):
            (WebCore::OriginUsageRecord::markDatabase):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64942 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index acbc1d6..437cbd2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-07  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Sam Weinig.
+
+        Empty strings can have more than one ref
+        https://bugs.webkit.org/show_bug.cgi?id=43666
+
+        These asserts are trying to say that we have a thread-safe copy of the
+        string, but they're not accurate for empty strings because we use a
+        special static empty string that magically has infinite refs.
+
+        * storage/OriginUsageRecord.cpp:
+        (WebCore::OriginUsageRecord::addDatabase):
+        (WebCore::OriginUsageRecord::markDatabase):
+
 2010-08-07  Gyuyoung Kim  <gyuyoung.kim at samsung.com>
         Reviewed by Eric Seidel.
 
diff --git a/WebCore/storage/OriginUsageRecord.cpp b/WebCore/storage/OriginUsageRecord.cpp
index 8128a1b..eac08fd 100644
--- a/WebCore/storage/OriginUsageRecord.cpp
+++ b/WebCore/storage/OriginUsageRecord.cpp
@@ -42,8 +42,8 @@ OriginUsageRecord::OriginUsageRecord()
 void OriginUsageRecord::addDatabase(const String& identifier, const String& fullPath)
 {
     ASSERT(!m_databaseMap.contains(identifier));
-    ASSERT_ARG(identifier, identifier.impl()->hasOneRef());
-    ASSERT_ARG(fullPath, fullPath.impl()->hasOneRef());
+    ASSERT_ARG(identifier, identifier.impl()->hasOneRef() || identifier.isEmpty());
+    ASSERT_ARG(fullPath, fullPath.impl()->hasOneRef() || fullPath.isEmpty());
 
     m_databaseMap.set(identifier, DatabaseEntry(fullPath));
     m_unknownSet.add(identifier);
@@ -63,7 +63,7 @@ void OriginUsageRecord::removeDatabase(const String& identifier)
 void OriginUsageRecord::markDatabase(const String& identifier)
 {
     ASSERT(m_databaseMap.contains(identifier));
-    ASSERT_ARG(identifier, identifier.impl()->hasOneRef());
+    ASSERT_ARG(identifier, identifier.impl()->hasOneRef() || identifier.isEmpty());
 
     m_unknownSet.add(identifier);
     m_cachedDiskUsageIsValid = false;

-- 
WebKit Debian packaging