IndexedDB: Align abort behavior on uncaught exception with Gecko

third_party/WebKit/Source/modules/indexeddb/IDBRequest.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 454 matching lines @@
       << "event type was " << event->type();
   const bool setTransactionActive =
       m_transaction &&
       (event->type() == EventTypeNames::success ||
        event->type() == EventTypeNames::upgradeneeded ||
        (event->type() == EventTypeNames::error && !m_requestAborted));
 
   if (setTransactionActive)
     m_transaction->setActive(true);
 
+  m_didThrowInEventHandler = false;
   DispatchEventResult dispatchResult =
       IDBEventDispatcher::dispatch(event, targets);
 
   if (m_transaction) {
     if (m_readyState == DONE)
       m_transaction->unregisterRequest(this);
 
     // 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 &&
-        dispatchResult == DispatchEventResult::NotCanceled &&
-        !m_requestAborted) {
-      m_transaction->setError(m_error);
-      m_transaction->abort(IGNORE_EXCEPTION_FOR_TESTING);
+    if (!m_requestAborted) {
+      if (m_didThrowInEventHandler) {
+        m_transaction->setError(DOMException::create(
+            AbortError, "Uncaught exception in event handler."));
+        m_transaction->abort(IGNORE_EXCEPTION_FOR_TESTING);
+      } else if (event->type() == EventTypeNames::error &&
+                 dispatchResult == DispatchEventResult::NotCanceled) {
+        m_transaction->setError(m_error);
+        m_transaction->abort(IGNORE_EXCEPTION_FOR_TESTING);
+      }
     }
 
     // If this was the last request in the transaction's list, it may commit
     // here.
     if (setTransactionActive)
       m_transaction->setActive(false);
   }
 
   if (cursorToNotify)
     cursorToNotify->postSuccessHandlerCallback();
 
   // An upgradeneeded event will always be followed by a success or error event,
   // so must be kept alive.
   if (m_readyState == DONE && event->type() != EventTypeNames::upgradeneeded)
     m_hasPendingActivity = false;
 
   return dispatchResult;
 }
 
 void IDBRequest::uncaughtExceptionInEventHandler() {
-  if (m_transaction && !m_requestAborted) {
-    m_transaction->setError(DOMException::create(
-        AbortError, "Uncaught exception in event handler."));
-    m_transaction->abort(IGNORE_EXCEPTION_FOR_TESTING);
-  }
+  m_didThrowInEventHandler = true;
 }
 
 void IDBRequest::transactionDidFinishAndDispatch() {
   DCHECK(m_transaction);
   DCHECK(m_transaction->isVersionChange());
   DCHECK(m_didFireUpgradeNeededEvent);
   DCHECK_EQ(m_readyState, DONE);
   DCHECK(getExecutionContext());
   m_transaction.clear();
 
@@ skipping 24 matching lines @@
 }
 
 void IDBRequest::dequeueEvent(Event* event) {
   for (size_t i = 0; i < m_enqueuedEvents.size(); ++i) {
     if (m_enqueuedEvents[i].get() == event)
       m_enqueuedEvents.remove(i);
   }
 }
 
 }  // namespace blink