Index: third_party/WebKit/Source/modules/indexeddb/IDBFactory.cpp |
diff --git a/third_party/WebKit/Source/modules/indexeddb/IDBFactory.cpp b/third_party/WebKit/Source/modules/indexeddb/IDBFactory.cpp |
index 737435363e2c49374c8f701e580bee84ac3ef43b..a1e8ad925a44e22391e4e22c520e3e94c599dc0c 100644 |
--- a/third_party/WebKit/Source/modules/indexeddb/IDBFactory.cpp |
+++ b/third_party/WebKit/Source/modules/indexeddb/IDBFactory.cpp |
@@ -35,17 +35,21 @@ |
#include "core/dom/ExceptionCode.h" |
#include "modules/indexeddb/IDBDatabase.h" |
#include "modules/indexeddb/IDBDatabaseCallbacks.h" |
+#include "modules/indexeddb/IDBDatabaseObserver.h" |
#include "modules/indexeddb/IDBKey.h" |
+#include "modules/indexeddb/IDBOpenRequestObserver.h" |
#include "modules/indexeddb/IDBTracing.h" |
#include "modules/indexeddb/IndexedDBClient.h" |
+#include "modules/indexeddb/ResponseHandler.h" |
#include "modules/indexeddb/WebIDBCallbacksImpl.h" |
#include "modules/indexeddb/WebIDBDatabaseCallbacksImpl.h" |
#include "platform/Histogram.h" |
#include "platform/weborigin/SecurityOrigin.h" |
#include "public/platform/Platform.h" |
#include "public/platform/WebSecurityOrigin.h" |
-#include "public/platform/modules/indexeddb/WebIDBFactory.h" |
-#include <memory> |
+ |
+using indexed_db::mojom::blink::IDBDatabaseObserverImpl; |
+using indexed_db::mojom::blink::IDBOpenRequestObserverImpl; |
namespace blink { |
@@ -55,6 +59,10 @@ IDBFactory::IDBFactory() |
{ |
} |
+IDBFactory::~IDBFactory() |
+{ |
+} |
+ |
static bool isContextValid(ExecutionContext* context) |
{ |
ASSERT(context->isDocument() || context->isWorkerGlobalScope()); |
@@ -82,7 +90,7 @@ IDBRequest* IDBFactory::getDatabaseNames(ScriptState* scriptState, ExceptionStat |
return request; |
} |
- Platform::current()->idbFactory()->getDatabaseNames(WebIDBCallbacksImpl::create(request).release(), WebSecurityOrigin(scriptState->getExecutionContext()->getSecurityOrigin())); |
+ m_backend->GetDatabaseNames(scriptState->getExecutionContext()->getSecurityOrigin()); |
return request; |
} |
@@ -116,7 +124,7 @@ IDBOpenDBRequest* IDBFactory::openInternal(ScriptState* scriptState, const Strin |
return request; |
} |
- Platform::current()->idbFactory()->open(name, version, transactionId, WebIDBCallbacksImpl::create(request).release(), WebIDBDatabaseCallbacksImpl::create(databaseCallbacks).release(), WebSecurityOrigin(scriptState->getExecutionContext()->getSecurityOrigin())); |
+ m_backend->Open(name, version, transactionId, scriptState->getExecutionContext()->getSecurityOrigin(), IDBOpenRequestObserverImpl::Create(), IDBDatabaseObserverImpl::Create(), ResponseHandler::createOpenCallback(request)); |
return request; |
} |
@@ -144,7 +152,7 @@ IDBOpenDBRequest* IDBFactory::deleteDatabase(ScriptState* scriptState, const Str |
return request; |
} |
- Platform::current()->idbFactory()->deleteDatabase(name, WebIDBCallbacksImpl::create(request).release(), WebSecurityOrigin(scriptState->getExecutionContext()->getSecurityOrigin())); |
+ m_backend->DeleteDatabase(name, scriptState->getExecutionContext()->getSecurityOrigin()); |
return request; |
} |