Merge 91721

Source/WebCore/platform/leveldb/LevelDBDatabase.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 75 matching lines @@
 private:
     const LevelDBComparator* m_comparator;
 };
 
 LevelDBDatabase::LevelDBDatabase()
 {
 }
 
 LevelDBDatabase::~LevelDBDatabase()
 {
+    // m_db's destructor uses m_comparatorAdapter; order of deletion is important.
+    m_db.clear();
+    m_comparatorAdapter.clear();
 }
 
 PassOwnPtr<LevelDBDatabase> LevelDBDatabase::open(const String& fileName, const LevelDBComparator* comparator)
 {
     OwnPtr<ComparatorAdapter> comparatorAdapter = adoptPtr(new ComparatorAdapter(comparator));
 
     leveldb::Options options;
     options.comparator = comparatorAdapter.get();
     options.create_if_missing = true;
     options.paranoid_checks = true;
@@ skipping 156 matching lines @@
 }
 
 const LevelDBComparator* LevelDBDatabase::comparator() const
 {
     return m_comparator;
 }
 
 }
 
 #endif