Title: [139556] trunk/Source/WebCore
- Revision
- 139556
- Author
- dgro...@chromium.org
- Date
- 2013-01-12 17:44:04 -0800 (Sat, 12 Jan 2013)
Log Message
IndexedDB: Provide LevelDB with IDBEnv instead of Env::Default
https://bugs.webkit.org/show_bug.cgi?id=106135
Reviewed by Tony Chang.
IDBEnv only changes the name of the histogram where errors are logged.
* platform/leveldb/LevelDBDatabase.cpp:
(WebCore::LevelDBDatabase::destroy):
(WebCore::LevelDBDatabase::open):
(WebCore::LevelDBDatabase::openInMemory):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (139555 => 139556)
--- trunk/Source/WebCore/ChangeLog 2013-01-13 01:19:27 UTC (rev 139555)
+++ trunk/Source/WebCore/ChangeLog 2013-01-13 01:44:04 UTC (rev 139556)
@@ -1,3 +1,17 @@
+2013-01-12 David Grogan <dgro...@chromium.org>
+
+ IndexedDB: Provide LevelDB with IDBEnv instead of Env::Default
+ https://bugs.webkit.org/show_bug.cgi?id=106135
+
+ Reviewed by Tony Chang.
+
+ IDBEnv only changes the name of the histogram where errors are logged.
+
+ * platform/leveldb/LevelDBDatabase.cpp:
+ (WebCore::LevelDBDatabase::destroy):
+ (WebCore::LevelDBDatabase::open):
+ (WebCore::LevelDBDatabase::openInMemory):
+
2013-01-12 Gavin Peters <gav...@chromium.org>
Regression(r119759): Heap-use-after-free in webkit_glue::WebURLLoaderImpl::Context::OnReceivedResponse
Modified: trunk/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp (139555 => 139556)
--- trunk/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp 2013-01-13 01:19:27 UTC (rev 139555)
+++ trunk/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp 2013-01-13 01:44:04 UTC (rev 139556)
@@ -33,6 +33,7 @@
#include "LevelDBSlice.h"
#include "LevelDBWriteBatch.h"
#include "Logging.h"
+#include <env_idb.h>
#include <helpers/memenv/memenv.h>
#include <leveldb/comparator.h>
#include <leveldb/db.h>
@@ -126,6 +127,7 @@
bool LevelDBDatabase::destroy(const String& fileName)
{
leveldb::Options options;
+ options.env = leveldb::IDBEnv();
const leveldb::Status s = leveldb::DestroyDB(fileName.utf8().data(), options);
return s.ok();
}
@@ -135,7 +137,7 @@
OwnPtr<ComparatorAdapter> comparatorAdapter = adoptPtr(new ComparatorAdapter(comparator));
leveldb::DB* db;
- const leveldb::Status s = openDB(comparatorAdapter.get(), leveldb::Env::Default(), fileName, &db);
+ const leveldb::Status s = openDB(comparatorAdapter.get(), leveldb::IDBEnv(), fileName, &db);
if (!s.ok()) {
LOG_ERROR("Failed to open LevelDB database from %s: %s", fileName.ascii().data(), s.ToString().c_str());
@@ -153,7 +155,7 @@
PassOwnPtr<LevelDBDatabase> LevelDBDatabase::openInMemory(const LevelDBComparator* comparator)
{
OwnPtr<ComparatorAdapter> comparatorAdapter = adoptPtr(new ComparatorAdapter(comparator));
- OwnPtr<leveldb::Env> inMemoryEnv = adoptPtr(leveldb::NewMemEnv(leveldb::Env::Default()));
+ OwnPtr<leveldb::Env> inMemoryEnv = adoptPtr(leveldb::NewMemEnv(leveldb::IDBEnv()));
leveldb::DB* db;
const leveldb::Status s = openDB(comparatorAdapter.get(), inMemoryEnv.get(), String(), &db);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
