Chromium Code Reviews| Index: third_party/WebKit/Source/modules/indexeddb/IDBRequest.cpp |
| diff --git a/third_party/WebKit/Source/modules/indexeddb/IDBRequest.cpp b/third_party/WebKit/Source/modules/indexeddb/IDBRequest.cpp |
| index f7f5dc782f6dc5576e9e1cb709d945119c05d755..009c0500666cc62369368d0c4c40c1ce0971f814 100644 |
| --- a/third_party/WebKit/Source/modules/indexeddb/IDBRequest.cpp |
| +++ b/third_party/WebKit/Source/modules/indexeddb/IDBRequest.cpp |
| @@ -411,11 +411,11 @@ ExecutionContext* IDBRequest::executionContext() const |
| return ActiveDOMObject::executionContext(); |
| } |
| -bool IDBRequest::dispatchEventInternal(PassRefPtrWillBeRawPtr<Event> event) |
| +WebInputEventResult IDBRequest::dispatchEventInternal(PassRefPtrWillBeRawPtr<Event> event) |
| { |
| IDB_TRACE("IDBRequest::dispatchEvent"); |
| if (m_contextStopped || !executionContext()) |
| - return false; |
| + return WebInputEventResult::HandledSuppressed; |
| ASSERT(m_readyState == PENDING); |
| ASSERT(m_hasPendingActivity); |
| ASSERT(m_enqueuedEvents.size()); |
| @@ -458,7 +458,7 @@ bool IDBRequest::dispatchEventInternal(PassRefPtrWillBeRawPtr<Event> event) |
| if (setTransactionActive) |
| m_transaction->setActive(true); |
| - bool dontPreventDefault = IDBEventDispatcher::dispatch(event.get(), targets); |
|
jsbell
2015/12/03 00:46:18
Very happy to see this going away. :)
dtapuska
2015/12/03 02:00:53
Thanks for the happiness :-)
|
| + WebInputEventResult eventResult = IDBEventDispatcher::dispatch(event.get(), targets); |
| if (m_transaction) { |
| if (m_readyState == DONE) |
| @@ -466,7 +466,7 @@ bool IDBRequest::dispatchEventInternal(PassRefPtrWillBeRawPtr<Event> event) |
| // Possibly abort the transaction. This must occur after unregistering (so this request |
| // doesn't receive a second error) and before deactivating (which might trigger commit). |
| - if (event->type() == EventTypeNames::error && dontPreventDefault && !m_requestAborted) { |
| + if (event->type() == EventTypeNames::error && eventResult == WebInputEventResult::NotHandled && !m_requestAborted) { |
| m_transaction->setError(m_error); |
| m_transaction->abort(IGNORE_EXCEPTION); |
| } |
| @@ -484,7 +484,7 @@ bool IDBRequest::dispatchEventInternal(PassRefPtrWillBeRawPtr<Event> event) |
| if (m_readyState == DONE && event->type() != EventTypeNames::upgradeneeded) |
| m_hasPendingActivity = false; |
| - return dontPreventDefault; |
| + return eventResult; |
| } |
| void IDBRequest::uncaughtExceptionInEventHandler() |