IndexedDB: Align exception priorities with Firefox

third_party/WebKit/Source/modules/indexeddb/IDBDatabase.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 177 matching lines @@
     }
     if (m_versionChangeTransaction->isFinished() || m_versionChangeTransaction->isFinishing()) {
         exceptionState.throwDOMException(TransactionInactiveError, IDBDatabase::transactionFinishedErrorMessage);
         return nullptr;
     }
     if (!m_versionChangeTransaction->isActive()) {
         exceptionState.throwDOMException(TransactionInactiveError, IDBDatabase::transactionInactiveErrorMessage);
         return nullptr;
     }
 
+    if (!keyPath.isNull() && !keyPath.isValid()) {
+        exceptionState.throwDOMException(SyntaxError, "The keyPath option is not a valid key path.");
+        return nullptr;
+    }
+
     if (containsObjectStore(name)) {
         exceptionState.throwDOMException(ConstraintError, "An object store with the specified name already exists.");
         return nullptr;
     }
 
-    if (!keyPath.isNull() && !keyPath.isValid()) {
-        exceptionState.throwDOMException(SyntaxError, "The keyPath option is not a valid key path.");
-        return nullptr;
-    }
-
     if (autoIncrement && ((keyPath.getType() == IDBKeyPath::StringType && keyPath.string().isEmpty()) || keyPath.getType() == IDBKeyPath::ArrayType)) {
         exceptionState.throwDOMException(InvalidAccessError, "The autoIncrement option was set but the keyPath option was empty or an array.");
         return nullptr;
     }
 
     if (!m_backend) {
         exceptionState.throwDOMException(InvalidStateError, IDBDatabase::databaseClosedErrorMessage);
         return nullptr;
     }
 
@@ skipping 54 matching lines @@
         for (const String& name : storeNames.getAsStringSequence())
             scope.add(name);
     } else if (storeNames.isDOMStringList()) {
         const Vector<String>& list = *storeNames.getAsDOMStringList();
         for (const String& name : list)
             scope.add(name);
     } else {
         ASSERT_NOT_REACHED();
     }
 
-    if (scope.isEmpty()) {
-        exceptionState.throwDOMException(InvalidAccessError, "The storeNames parameter was empty.");
-        return nullptr;
-    }
-
-    WebIDBTransactionMode mode = IDBTransaction::stringToMode(modeString);
-    if (mode != WebIDBTransactionModeReadOnly && mode != WebIDBTransactionModeReadWrite) {
-        exceptionState.throwTypeError("The mode provided ('" + modeString + "') is not one of 'readonly' or 'readwrite'.");
-        return nullptr;
-    }
-
-    if (exceptionState.hadException())
-        return nullptr;
-
     if (m_versionChangeTransaction) {
         exceptionState.throwDOMException(InvalidStateError, "A version change transaction is running.");
         return nullptr;
     }
 
     if (m_closePending) {
         exceptionState.throwDOMException(InvalidStateError, "The database connection is closing.");
         return nullptr;
     }
 
+    if (!m_backend) {
+        exceptionState.throwDOMException(InvalidStateError, IDBDatabase::databaseClosedErrorMessage);
+        return nullptr;
+    }
+
+
+    if (scope.isEmpty()) {
+        exceptionState.throwDOMException(InvalidAccessError, "The storeNames parameter was empty.");
+        return nullptr;
+    }
+
     Vector<int64_t> objectStoreIds;
     for (const String& name : scope) {
         int64_t objectStoreId = findObjectStoreId(name);
         if (objectStoreId == IDBObjectStoreMetadata::InvalidId) {
             exceptionState.throwDOMException(NotFoundError, "One of the specified object stores was not found.");
             return nullptr;
         }
         objectStoreIds.append(objectStoreId);
     }
 
-    if (!m_backend) {
-        exceptionState.throwDOMException(InvalidStateError, IDBDatabase::databaseClosedErrorMessage);
+    WebIDBTransactionMode mode = IDBTransaction::stringToMode(modeString);
+    if (mode != WebIDBTransactionModeReadOnly && mode != WebIDBTransactionModeReadWrite) {
+        exceptionState.throwTypeError("The mode provided ('" + modeString + "') is not one of 'readonly' or 'readwrite'.");
         return nullptr;
     }
 
     int64_t transactionId = nextTransactionId();
     m_backend->createTransaction(transactionId, WebIDBDatabaseCallbacksImpl::create(m_databaseCallbacks).release(), objectStoreIds, mode);
 
     return IDBTransaction::create(scriptState, transactionId, scope, mode, this);
 }
 
 void IDBDatabase::forceClose()
@@ skipping 126 matching lines @@
     return ActiveDOMObject::getExecutionContext();
 }
 
 void IDBDatabase::recordApiCallsHistogram(IndexedDatabaseMethods method)
 {
     DEFINE_THREAD_SAFE_STATIC_LOCAL(EnumerationHistogram, apiCallsHistogram, new EnumerationHistogram("WebCore.IndexedDB.FrontEndAPICalls", IDBMethodsMax));
     apiCallsHistogram.count(method);
 }
 
 } // namespace blink