Merge 91721

Source/WebCore/storage/IDBLevelDBBackingStore.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 108 matching lines @@
     : m_identifier(identifier)
     , m_factory(factory)
     , m_db(db)
 {
     m_factory->addIDBBackingStore(identifier, this);
 }
 
 IDBLevelDBBackingStore::~IDBLevelDBBackingStore()
 {
     m_factory->removeIDBBackingStore(m_identifier);
+
+    // m_db's destructor uses m_comparator. The order of destruction is important.
+    m_db.clear();
+    m_comparator.clear();
 }
 
 PassRefPtr<IDBBackingStore> IDBLevelDBBackingStore::open(SecurityOrigin* securityOrigin, const String& pathBaseArg, int64_t maximumSize, const String& fileIdentifier, IDBFactoryBackendImpl* factory)
 {
     String pathBase = pathBaseArg;
 
     if (pathBase.isEmpty()) {
         ASSERT_NOT_REACHED(); // FIXME: We need to handle this case for incognito and DumpRenderTree.
         return PassRefPtr<IDBBackingStore>();
     }
@@ skipping 1208 matching lines @@
     // FIXME: this is checking for presence of the domain, not the database itself
     return fileExists(path+"/CURRENT");
 }
 
 // FIXME: deleteDatabase should be part of IDBBackingStore.
 
 } // namespace WebCore
 
 #endif // ENABLE(LEVELDB)
 #endif // ENABLE(INDEXED_DATABASE)