[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit ddbec6d938f7669d64ebdfc3c6e4f6a708eba6d1
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 5 17:30:35 2009 +0000

    2009-10-05  Ben Murdoch  <benm at google.com>
    
            Reviewed by Darin Adler.
    
            Add an ASSERT in updateGuidVersionMap.
            https://bugs.webkit.org/show_bug.cgi?id=30077
    
            * storage/Database.cpp:
            (WebCore::updateGuidVersionMap): ASSERT that the guidMutex() is locked.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49099 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index cc7bc02..72ddb11 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-10-05  Ben Murdoch  <benm at google.com>
+
+        Reviewed by Darin Adler.
+
+        Add an ASSERT in updateGuidVersionMap.
+        https://bugs.webkit.org/show_bug.cgi?id=30077
+
+        * storage/Database.cpp:
+        (WebCore::updateGuidVersionMap): ASSERT that the guidMutex() is locked.
+
 2009-10-05  Nate Chapin  <japhet at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/storage/Database.cpp b/WebCore/storage/Database.cpp
index be5cdcc..1515eb3 100644
--- a/WebCore/storage/Database.cpp
+++ b/WebCore/storage/Database.cpp
@@ -92,6 +92,9 @@ static GuidVersionMap& guidToVersionMap()
 // NOTE: Caller must lock guidMutex().
 static inline void updateGuidVersionMap(int guid, String newVersion)
 {
+    // Ensure the the mutex is locked.
+    ASSERT(!guidMutex().tryLock());
+
     // Note: It is not safe to put an empty string into the guidToVersionMap() map.
     // That's because the map is cross-thread, but empty strings are per-thread.
     // The copy() function makes a version of the string you can use on the current

-- 
WebKit Debian packaging