Title: [139208] trunk/Source/WebCore
- Revision
- 139208
- Author
- [email protected]
- Date
- 2013-01-09 10:50:36 -0800 (Wed, 09 Jan 2013)
Log Message
Unreviewed, rolling out r139143.
http://trac.webkit.org/changeset/139143
https://bugs.webkit.org/show_bug.cgi?id=106135
Broke Chromium content_browsertests.
* platform/leveldb/LevelDBDatabase.cpp:
(WebCore::LevelDBDatabase::open):
(WebCore::LevelDBDatabase::openInMemory):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (139207 => 139208)
--- trunk/Source/WebCore/ChangeLog 2013-01-09 18:50:07 UTC (rev 139207)
+++ trunk/Source/WebCore/ChangeLog 2013-01-09 18:50:36 UTC (rev 139208)
@@ -1,3 +1,15 @@
+2013-01-09 Dimitri Glazkov <[email protected]>
+
+ Unreviewed, rolling out r139143.
+ http://trac.webkit.org/changeset/139143
+ https://bugs.webkit.org/show_bug.cgi?id=106135
+
+ Broke Chromium content_browsertests.
+
+ * platform/leveldb/LevelDBDatabase.cpp:
+ (WebCore::LevelDBDatabase::open):
+ (WebCore::LevelDBDatabase::openInMemory):
+
2013-01-09 Sam Weinig <[email protected]>
Add Settings.in and make_settings.pl to the project.
Modified: trunk/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp (139207 => 139208)
--- trunk/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp 2013-01-09 18:50:07 UTC (rev 139207)
+++ trunk/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp 2013-01-09 18:50:36 UTC (rev 139208)
@@ -33,7 +33,6 @@
#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>
@@ -136,7 +135,7 @@
OwnPtr<ComparatorAdapter> comparatorAdapter = adoptPtr(new ComparatorAdapter(comparator));
leveldb::DB* db;
- const leveldb::Status s = openDB(comparatorAdapter.get(), leveldb::IDBEnv(), fileName, &db);
+ const leveldb::Status s = openDB(comparatorAdapter.get(), leveldb::Env::Default(), fileName, &db);
if (!s.ok()) {
LOG_ERROR("Failed to open LevelDB database from %s: %s", fileName.ascii().data(), s.ToString().c_str());
@@ -154,7 +153,7 @@
PassOwnPtr<LevelDBDatabase> LevelDBDatabase::openInMemory(const LevelDBComparator* comparator)
{
OwnPtr<ComparatorAdapter> comparatorAdapter = adoptPtr(new ComparatorAdapter(comparator));
- OwnPtr<leveldb::Env> inMemoryEnv = adoptPtr(leveldb::NewMemEnv(leveldb::IDBEnv()));
+ OwnPtr<leveldb::Env> inMemoryEnv = adoptPtr(leveldb::NewMemEnv(leveldb::Env::Default()));
leveldb::DB* db;
const leveldb::Status s = openDB(comparatorAdapter.get(), inMemoryEnv.get(), String(), &db);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
