| Index: third_party/WebKit/Source/modules/indexeddb/IDBObserver.cpp
|
| diff --git a/third_party/WebKit/Source/modules/indexeddb/IDBObserver.cpp b/third_party/WebKit/Source/modules/indexeddb/IDBObserver.cpp
|
| index 17e8494068c422100ba2844d5735abde6a19ae48..f3f3169b7a2e7dd43b4057fc707e14ae54297a13 100644
|
| --- a/third_party/WebKit/Source/modules/indexeddb/IDBObserver.cpp
|
| +++ b/third_party/WebKit/Source/modules/indexeddb/IDBObserver.cpp
|
| @@ -5,10 +5,14 @@
|
| #include "modules/indexeddb/IDBObserver.h"
|
|
|
| #include "bindings/core/v8/ExceptionState.h"
|
| +#include "bindings/core/v8/ExceptionStatePlaceholder.h"
|
| #include "bindings/modules/v8/ToV8ForModules.h"
|
| #include "bindings/modules/v8/V8BindingForModules.h"
|
| +#include "core/dom/ExceptionCode.h"
|
| +#include "modules/indexeddb/IDBDatabase.h"
|
| #include "modules/indexeddb/IDBObserverCallback.h"
|
| #include "modules/indexeddb/IDBObserverInit.h"
|
| +#include "modules/indexeddb/WebIDBObserverImpl.h"
|
|
|
| namespace blink {
|
|
|
| @@ -29,7 +33,28 @@ IDBObserver::~IDBObserver() {}
|
|
|
| void IDBObserver::observe(IDBDatabase* database, IDBTransaction* transaction, ExceptionState& exceptionState)
|
| {
|
| - // TODO(palakj): Finish implementation.
|
| + if (transaction->isFinished() || transaction->isFinishing()) {
|
| + exceptionState.throwDOMException(TransactionInactiveError, IDBDatabase::transactionFinishedErrorMessage);
|
| + return;
|
| + }
|
| + if (!transaction->isActive()) {
|
| + exceptionState.throwDOMException(TransactionInactiveError, IDBDatabase::transactionInactiveErrorMessage);
|
| + return;
|
| + }
|
| + if (!database->backend()) {
|
| + exceptionState.throwDOMException(InvalidStateError, IDBDatabase::databaseClosedErrorMessage);
|
| + return;
|
| + }
|
| + database->backend()->observe(WebIDBObserverImpl::create(this).leakPtr(), transaction->id());
|
| +}
|
| +
|
| +void IDBObserver::unobserve(IDBDatabase* database, ExceptionState& exceptionState)
|
| +{
|
| + if (!database->backend()) {
|
| + exceptionState.throwDOMException(InvalidStateError, IDBDatabase::databaseClosedErrorMessage);
|
| + return;
|
| + }
|
| + database->backend()->unobserve(WebIDBObserverImpl::create(this).leakPtr());
|
| }
|
|
|
| DEFINE_TRACE(IDBObserver)
|
|
|