[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[dumi at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 7169afccedc20f8738408ff2d0e6704ecf1696dc
Author: dumi at chromium.org <dumi at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 23 22:33:21 2009 +0000

    Remove pointers to a database that failed to open from the
    DatabaseTracker and Document.
    
    Reviewed by Dmitry Titov.
    
    https://bugs.webkit.org/show_bug.cgi?id=32885
    
    * storage/Database.cpp:
    (WebCore::Database::openDatabase):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52530 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6fc8ffc..7f6627c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2009-12-23  Dumitru Daniliuc  <dumi at chromium.org>
+
+        Reviewed by Dmitry Titov.
+
+        Remove pointers to a database that failed to open from the
+        DatabaseTracker and Document.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32885
+
+        * storage/Database.cpp:
+        (WebCore::Database::openDatabase):
+
 2009-12-23  Dan Bernstein  <mitz at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/storage/Database.cpp b/WebCore/storage/Database.cpp
index 72414b4..62d4039 100644
--- a/WebCore/storage/Database.cpp
+++ b/WebCore/storage/Database.cpp
@@ -132,6 +132,8 @@ PassRefPtr<Database> Database::openDatabase(Document* document, const String& na
 
     if (!database->openAndVerifyVersion(e)) {
        LOG(StorageAPI, "Failed to open and verify version (expected %s) of database %s", expectedVersion.ascii().data(), database->databaseDebugName().ascii().data());
+       document->removeOpenDatabase(database.get());
+       DatabaseTracker::tracker().removeOpenDatabase(database.get());
        return 0;
     }
 

-- 
WebKit Debian packaging