Changeset 207937 in webkit

Timestamp:

Oct 26, 2016 11:00:11 PM (7 years ago)

Author:

Chris Dumez

Message:

[Web IDL] Add support for having string enumerations in their own IDL file
​https://bugs.webkit.org/show_bug.cgi?id=164025

Reviewed by Darin Adler.

Source/WebCore:

Add support for having string enumerations in their own IDL file to facilitate
sharing them. Use this new support to implement IDBTransactionMode enumeration
for IndexedDB:

• ​https://www.w3.org/TR/IndexedDB/#idl-def-IDBTransactionMode

No new tests, rebaselined existing tests.

• CMakeLists.txt:
• DerivedSources.cpp:
• DerivedSources.make:
• Modules/indexeddb/IDBDatabase.cpp:

(WebCore::IDBDatabase::transaction):
(WebCore::IDBDatabase::startVersionChangeTransaction):

• Modules/indexeddb/IDBDatabase.h:
• Modules/indexeddb/IDBDatabase.idl:
• Modules/indexeddb/IDBOpenDBRequest.cpp:

(WebCore::IDBOpenDBRequest::onUpgradeNeeded):

• Modules/indexeddb/IDBTransaction.cpp:

(WebCore::IDBTransaction::IDBTransaction):

• Modules/indexeddb/IDBTransaction.h:

(WebCore::IDBTransaction::mode):
(WebCore::IDBTransaction::isVersionChange):
(WebCore::IDBTransaction::isReadOnly):

• Modules/indexeddb/IDBTransaction.idl:
• Modules/indexeddb/IDBTransactionMode.h: Added.
• Modules/indexeddb/IDBTransactionMode.idl: Copied from Source/WebCore/Modules/indexeddb/IDBTransaction.idl.
• Modules/indexeddb/IndexedDB.h:
• Modules/indexeddb/server/MemoryBackingStoreTransaction.cpp:

(WebCore::IDBServer::MemoryBackingStoreTransaction::MemoryBackingStoreTransaction):
(WebCore::IDBServer::MemoryBackingStoreTransaction::objectStoreRenamed):
(WebCore::IDBServer::MemoryBackingStoreTransaction::indexRenamed):
(WebCore::IDBServer::MemoryBackingStoreTransaction::abort):

• Modules/indexeddb/server/MemoryBackingStoreTransaction.h:

(WebCore::IDBServer::MemoryBackingStoreTransaction::isVersionChange):
(WebCore::IDBServer::MemoryBackingStoreTransaction::isWriting):

• Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:

(WebCore::IDBServer::SQLiteIDBBackingStore::beginTransaction):
(WebCore::IDBServer::SQLiteIDBBackingStore::abortTransaction):
(WebCore::IDBServer::SQLiteIDBBackingStore::commitTransaction):
(WebCore::IDBServer::SQLiteIDBBackingStore::createObjectStore):
(WebCore::IDBServer::SQLiteIDBBackingStore::deleteObjectStore):
(WebCore::IDBServer::SQLiteIDBBackingStore::renameObjectStore):
(WebCore::IDBServer::SQLiteIDBBackingStore::clearObjectStore):
(WebCore::IDBServer::SQLiteIDBBackingStore::createIndex):
(WebCore::IDBServer::SQLiteIDBBackingStore::deleteIndex):
(WebCore::IDBServer::SQLiteIDBBackingStore::renameIndex):
(WebCore::IDBServer::SQLiteIDBBackingStore::deleteRecord):
(WebCore::IDBServer::SQLiteIDBBackingStore::deleteRange):
(WebCore::IDBServer::SQLiteIDBBackingStore::addRecord):
(WebCore::IDBServer::SQLiteIDBBackingStore::generateKeyNumber):
(WebCore::IDBServer::SQLiteIDBBackingStore::revertGeneratedKeyNumber):
(WebCore::IDBServer::SQLiteIDBBackingStore::maybeUpdateKeyGeneratorNumber):

• Modules/indexeddb/server/SQLiteIDBTransaction.cpp:

(WebCore::IDBServer::SQLiteIDBTransaction::begin):

• Modules/indexeddb/server/SQLiteIDBTransaction.h:

(WebCore::IDBServer::SQLiteIDBTransaction::mode):

• Modules/indexeddb/server/UniqueIDBDatabase.cpp:

(WebCore::IDBServer::UniqueIDBDatabase::enqueueTransaction):
(WebCore::IDBServer::UniqueIDBDatabase::takeNextRunnableTransaction):

• Modules/indexeddb/server/UniqueIDBDatabaseConnection.cpp:

(WebCore::IDBServer::UniqueIDBDatabaseConnection::establishTransaction):

• Modules/indexeddb/server/UniqueIDBDatabaseTransaction.cpp:

(WebCore::IDBServer::UniqueIDBDatabaseTransaction::UniqueIDBDatabaseTransaction):
(WebCore::IDBServer::UniqueIDBDatabaseTransaction::originalDatabaseInfo):
(WebCore::IDBServer::UniqueIDBDatabaseTransaction::isVersionChange):
(WebCore::IDBServer::UniqueIDBDatabaseTransaction::isReadOnly):

• Modules/indexeddb/shared/IDBTransactionInfo.cpp:

(WebCore::IDBTransactionInfo::clientTransaction):
(WebCore::IDBTransactionInfo::versionChange):
(WebCore::IDBTransactionInfo::loggingString):

• Modules/indexeddb/shared/IDBTransactionInfo.h:

(WebCore::IDBTransactionInfo::mode):

• WebCore.xcodeproj/project.pbxproj:
• bindings/scripts/CodeGenerator.pm:

(ProcessDocument):
(IsEnumType):
(GetEnumByName):
(IsExternalEnumType):
(ValidEnumValues):

• bindings/scripts/CodeGeneratorJS.pm:

(GenerateEnumeration):
(AddToImplIncludesForIDLType):
(GetEnumerationClassName):
(GenerateEnumerationHeader):
(GenerateEnumerationImplementation):
(GenerateEnumerationImplementationContent):
(GenerateEnumerationsImplementationContent):
(GenerateEnumerationHeaderContent):
(GenerateEnumerationsHeaderContent):

• bindings/scripts/test/JS/JSTestObj.cpp:

(WebCore::jsTestObjPrototypeFunctionMethodWithEnumArgCaller):
(WebCore::jsTestObjPrototypeFunctionMethodWithStandaloneEnumArg):
(WebCore::jsTestObjPrototypeFunctionMethodWithStandaloneEnumArgCaller):

• bindings/scripts/test/JS/JSTestStandaloneEnumeration.cpp: Added.

(WebCore::convertEnumerationToJS):
(WebCore::parseEnumeration<TestStandaloneEnumeration>):
(WebCore::convertEnumeration<TestStandaloneEnumeration>):
(WebCore::expectedEnumerationValues<TestStandaloneEnumeration>):

• bindings/scripts/test/JS/JSTestStandaloneEnumeration.h: Added.
• bindings/scripts/test/TestObj.idl:
• bindings/scripts/test/TestStandaloneEnumeration.idl: Copied from Source/WebCore/Modules/indexeddb/IDBTransaction.idl.
• inspector/InspectorIndexedDBAgent.cpp:

LayoutTests:

Rebaseline existign tests as the exception messages differ slightly.

• storage/indexeddb/exceptions-expected.txt:
• storage/indexeddb/exceptions-private-expected.txt:
• storage/indexeddb/modern/idbdatabase-transaction-failures-expected.txt:
• storage/indexeddb/modern/idbdatabase-transaction-failures-private-expected.txt:
• storage/indexeddb/transaction-basics-expected.txt:
• storage/indexeddb/transaction-basics-private-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/storage/indexeddb/exceptions-expected.txt (modified) (1 diff)
• LayoutTests/storage/indexeddb/exceptions-private-expected.txt (modified) (1 diff)
• LayoutTests/storage/indexeddb/modern/idbdatabase-transaction-failures-expected.txt (modified) (1 diff)
• LayoutTests/storage/indexeddb/modern/idbdatabase-transaction-failures-private-expected.txt (modified) (1 diff)
• LayoutTests/storage/indexeddb/transaction-basics-expected.txt (modified) (1 diff)
• LayoutTests/storage/indexeddb/transaction-basics-private-expected.txt (modified) (1 diff)
• Source/WebCore/CMakeLists.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/DerivedSources.cpp (modified) (1 diff)
• Source/WebCore/DerivedSources.make (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/IDBDatabase.cpp (modified) (4 diffs)
• Source/WebCore/Modules/indexeddb/IDBDatabase.h (modified) (2 diffs)
• Source/WebCore/Modules/indexeddb/IDBDatabase.idl (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.cpp (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/IDBTransaction.cpp (modified) (3 diffs)
• Source/WebCore/Modules/indexeddb/IDBTransaction.h (modified) (4 diffs)
• Source/WebCore/Modules/indexeddb/IDBTransaction.idl (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/IDBTransactionMode.h (added)
• Source/WebCore/Modules/indexeddb/IDBTransactionMode.idl (copied) (copied from trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.idl) (2 diffs)
• Source/WebCore/Modules/indexeddb/IndexedDB.h (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/server/MemoryBackingStoreTransaction.cpp (modified) (4 diffs)
• Source/WebCore/Modules/indexeddb/server/MemoryBackingStoreTransaction.h (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp (modified) (16 diffs)
• Source/WebCore/Modules/indexeddb/server/SQLiteIDBTransaction.cpp (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/server/SQLiteIDBTransaction.h (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp (modified) (4 diffs)
• Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.cpp (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.cpp (modified) (3 diffs)
• Source/WebCore/Modules/indexeddb/shared/IDBTransactionInfo.cpp (modified) (3 diffs)
• Source/WebCore/Modules/indexeddb/shared/IDBTransactionInfo.h (modified) (4 diffs)
• Source/WebCore/WebCore.xcodeproj/project.pbxproj (modified) (7 diffs)
• Source/WebCore/bindings/scripts/CodeGenerator.pm (modified) (7 diffs)
• Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (modified) (9 diffs)
• Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (modified) (4 diffs)
• Source/WebCore/bindings/scripts/test/JS/JSTestStandaloneEnumeration.cpp (added)
• Source/WebCore/bindings/scripts/test/JS/JSTestStandaloneEnumeration.h (added)
• Source/WebCore/bindings/scripts/test/TestObj.idl (modified) (1 diff)
• Source/WebCore/bindings/scripts/test/TestStandaloneEnumeration.idl (copied) (copied from trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.idl) (3 diffs)
• Source/WebCore/inspector/InspectorIndexedDBAgent.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-10-26  Chris Dumez  <cdumez@apple.com>
+
+        [Web IDL] Add support for having string enumerations in their own IDL file
+        https://bugs.webkit.org/show_bug.cgi?id=164025
+
+        Reviewed by Darin Adler.
+
+        Rebaseline existign tests as the exception messages differ slightly.
+
+        * storage/indexeddb/exceptions-expected.txt:
+        * storage/indexeddb/exceptions-private-expected.txt:
+        * storage/indexeddb/modern/idbdatabase-transaction-failures-expected.txt:
+        * storage/indexeddb/modern/idbdatabase-transaction-failures-private-expected.txt:
+        * storage/indexeddb/transaction-basics-expected.txt:
+        * storage/indexeddb/transaction-basics-private-expected.txt:
+
 2016-10-26  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/LayoutTests/storage/indexeddb/exceptions-expected.txt

@@ -106 +106 @@
 Expecting TypeError exception from db.transaction('store', 'invalid-mode')
 PASS Exception was thrown.
-PASS db.transaction('store', 'invalid-mode') threw TypeError: Failed to execute 'transaction' on 'IDBDatabase': The mode provided ('invalid-mode') is not one of 'readonly' or 'readwrite'.
+PASS db.transaction('store', 'invalid-mode') threw TypeError: Argument 2 ('mode') to IDBDatabase.transaction must be one of: "readonly", "readwrite", "versionchange"
 The function was called with an empty list of store names
 Expecting exception from db.transaction([])

trunk/LayoutTests/storage/indexeddb/exceptions-private-expected.txt

@@ -106 +106 @@
 Expecting TypeError exception from db.transaction('store', 'invalid-mode')
 PASS Exception was thrown.
-PASS db.transaction('store', 'invalid-mode') threw TypeError: Failed to execute 'transaction' on 'IDBDatabase': The mode provided ('invalid-mode') is not one of 'readonly' or 'readwrite'.
+PASS db.transaction('store', 'invalid-mode') threw TypeError: Argument 2 ('mode') to IDBDatabase.transaction must be one of: "readonly", "readwrite", "versionchange"
 The function was called with an empty list of store names
 Expecting exception from db.transaction([])

trunk/LayoutTests/storage/indexeddb/modern/idbdatabase-transaction-failures-expected.txt

@@ -13 +13 @@
 Failed to start a transaction with an empty set of object stores - InvalidAccessError (DOM IDBDatabase Exception 15): Failed to execute 'transaction' on 'IDBDatabase': The storeNames parameter was empty.
 Failed to start a transaction to a nonexistent object store - NotFoundError (DOM IDBDatabase Exception 8): Failed to execute 'transaction' on 'IDBDatabase': One of the specified object stores was not found.
-Failed to start a transaction with an invalid mode - TypeError: Failed to execute 'transaction' on 'IDBDatabase': The mode provided ('blahblah') is not one of 'readonly' or 'readwrite'.
-Failed to explicitly start a versionchange transaction - TypeError: Failed to execute 'transaction' on 'IDBDatabase': The mode provided ('versionchange') is not one of 'readonly' or 'readwrite'.
+Failed to start a transaction with an invalid mode - TypeError: Argument 2 ('mode') to IDBDatabase.transaction must be one of: "readonly", "readwrite", "versionchange"
+Failed to explicitly start a versionchange transaction - TypeError: Type error
 Failed to explicitly start a transaction with the close pending flag set - InvalidStateError (DOM IDBDatabase Exception 11): Failed to execute 'transaction' on 'IDBDatabase': The database connection is closing.
 PASS successfullyParsed is true

trunk/LayoutTests/storage/indexeddb/modern/idbdatabase-transaction-failures-private-expected.txt

@@ -13 +13 @@
 Failed to start a transaction with an empty set of object stores - InvalidAccessError (DOM IDBDatabase Exception 15): Failed to execute 'transaction' on 'IDBDatabase': The storeNames parameter was empty.
 Failed to start a transaction to a nonexistent object store - NotFoundError (DOM IDBDatabase Exception 8): Failed to execute 'transaction' on 'IDBDatabase': One of the specified object stores was not found.
-Failed to start a transaction with an invalid mode - TypeError: Failed to execute 'transaction' on 'IDBDatabase': The mode provided ('blahblah') is not one of 'readonly' or 'readwrite'.
-Failed to explicitly start a versionchange transaction - TypeError: Failed to execute 'transaction' on 'IDBDatabase': The mode provided ('versionchange') is not one of 'readonly' or 'readwrite'.
+Failed to start a transaction with an invalid mode - TypeError: Argument 2 ('mode') to IDBDatabase.transaction must be one of: "readonly", "readwrite", "versionchange"
+Failed to explicitly start a versionchange transaction - TypeError: Type error
 Failed to explicitly start a transaction with the close pending flag set - InvalidStateError (DOM IDBDatabase Exception 11): Failed to execute 'transaction' on 'IDBDatabase': The database connection is closing.
 PASS successfullyParsed is true

trunk/LayoutTests/storage/indexeddb/transaction-basics-expected.txt

@@ -230 +230 @@
 Expecting TypeError exception from db.transaction(['storeName'], 'lsakjdf')
 PASS Exception was thrown.
-PASS db.transaction(['storeName'], 'lsakjdf') threw TypeError: Failed to execute 'transaction' on 'IDBDatabase': The mode provided ('lsakjdf') is not one of 'readonly' or 'readwrite'.
+PASS db.transaction(['storeName'], 'lsakjdf') threw TypeError: Argument 2 ('mode') to IDBDatabase.transaction must be one of: "readonly", "readwrite", "versionchange"
 
 Test that null and undefined are treated as strings

trunk/LayoutTests/storage/indexeddb/transaction-basics-private-expected.txt

@@ -230 +230 @@
 Expecting TypeError exception from db.transaction(['storeName'], 'lsakjdf')
 PASS Exception was thrown.
-PASS db.transaction(['storeName'], 'lsakjdf') threw TypeError: Failed to execute 'transaction' on 'IDBDatabase': The mode provided ('lsakjdf') is not one of 'readonly' or 'readwrite'.
+PASS db.transaction(['storeName'], 'lsakjdf') threw TypeError: Argument 2 ('mode') to IDBDatabase.transaction must be one of: "readonly", "readwrite", "versionchange"
 
 Test that null and undefined are treated as strings

trunk/Source/WebCore/CMakeLists.txt

@@ -200 +200 @@
     Modules/indexeddb/IDBRequest.idl
     Modules/indexeddb/IDBTransaction.idl
+    Modules/indexeddb/IDBTransactionMode.idl
     Modules/indexeddb/IDBVersionChangeEvent.idl
     Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.idl

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-26  Chris Dumez  <cdumez@apple.com>
+
+        [Web IDL] Add support for having string enumerations in their own IDL file
+        https://bugs.webkit.org/show_bug.cgi?id=164025
+
+        Reviewed by Darin Adler.
+
+        Add support for having string enumerations in their own IDL file to facilitate
+        sharing them. Use this new support to implement IDBTransactionMode enumeration
+        for IndexedDB:
+        - https://www.w3.org/TR/IndexedDB/#idl-def-IDBTransactionMode
+
+        No new tests, rebaselined existing tests.
+
+        * CMakeLists.txt:
+        * DerivedSources.cpp:
+        * DerivedSources.make:
+        * Modules/indexeddb/IDBDatabase.cpp:
+        (WebCore::IDBDatabase::transaction):
+        (WebCore::IDBDatabase::startVersionChangeTransaction):
+        * Modules/indexeddb/IDBDatabase.h:
+        * Modules/indexeddb/IDBDatabase.idl:
+        * Modules/indexeddb/IDBOpenDBRequest.cpp:
+        (WebCore::IDBOpenDBRequest::onUpgradeNeeded):
+        * Modules/indexeddb/IDBTransaction.cpp:
+        (WebCore::IDBTransaction::IDBTransaction):
+        * Modules/indexeddb/IDBTransaction.h:
+        (WebCore::IDBTransaction::mode):
+        (WebCore::IDBTransaction::isVersionChange):
+        (WebCore::IDBTransaction::isReadOnly):
+        * Modules/indexeddb/IDBTransaction.idl:
+        * Modules/indexeddb/IDBTransactionMode.h: Added.
+        * Modules/indexeddb/IDBTransactionMode.idl: Copied from Source/WebCore/Modules/indexeddb/IDBTransaction.idl.
+        * Modules/indexeddb/IndexedDB.h:
+        * Modules/indexeddb/server/MemoryBackingStoreTransaction.cpp:
+        (WebCore::IDBServer::MemoryBackingStoreTransaction::MemoryBackingStoreTransaction):
+        (WebCore::IDBServer::MemoryBackingStoreTransaction::objectStoreRenamed):
+        (WebCore::IDBServer::MemoryBackingStoreTransaction::indexRenamed):
+        (WebCore::IDBServer::MemoryBackingStoreTransaction::abort):
+        * Modules/indexeddb/server/MemoryBackingStoreTransaction.h:
+        (WebCore::IDBServer::MemoryBackingStoreTransaction::isVersionChange):
+        (WebCore::IDBServer::MemoryBackingStoreTransaction::isWriting):
+        * Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:
+        (WebCore::IDBServer::SQLiteIDBBackingStore::beginTransaction):
+        (WebCore::IDBServer::SQLiteIDBBackingStore::abortTransaction):
+        (WebCore::IDBServer::SQLiteIDBBackingStore::commitTransaction):
+        (WebCore::IDBServer::SQLiteIDBBackingStore::createObjectStore):
+        (WebCore::IDBServer::SQLiteIDBBackingStore::deleteObjectStore):
+        (WebCore::IDBServer::SQLiteIDBBackingStore::renameObjectStore):
+        (WebCore::IDBServer::SQLiteIDBBackingStore::clearObjectStore):
+        (WebCore::IDBServer::SQLiteIDBBackingStore::createIndex):
+        (WebCore::IDBServer::SQLiteIDBBackingStore::deleteIndex):
+        (WebCore::IDBServer::SQLiteIDBBackingStore::renameIndex):
+        (WebCore::IDBServer::SQLiteIDBBackingStore::deleteRecord):
+        (WebCore::IDBServer::SQLiteIDBBackingStore::deleteRange):
+        (WebCore::IDBServer::SQLiteIDBBackingStore::addRecord):
+        (WebCore::IDBServer::SQLiteIDBBackingStore::generateKeyNumber):
+        (WebCore::IDBServer::SQLiteIDBBackingStore::revertGeneratedKeyNumber):
+        (WebCore::IDBServer::SQLiteIDBBackingStore::maybeUpdateKeyGeneratorNumber):
+        * Modules/indexeddb/server/SQLiteIDBTransaction.cpp:
+        (WebCore::IDBServer::SQLiteIDBTransaction::begin):
+        * Modules/indexeddb/server/SQLiteIDBTransaction.h:
+        (WebCore::IDBServer::SQLiteIDBTransaction::mode):
+        * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
+        (WebCore::IDBServer::UniqueIDBDatabase::enqueueTransaction):
+        (WebCore::IDBServer::UniqueIDBDatabase::takeNextRunnableTransaction):
+        * Modules/indexeddb/server/UniqueIDBDatabaseConnection.cpp:
+        (WebCore::IDBServer::UniqueIDBDatabaseConnection::establishTransaction):
+        * Modules/indexeddb/server/UniqueIDBDatabaseTransaction.cpp:
+        (WebCore::IDBServer::UniqueIDBDatabaseTransaction::UniqueIDBDatabaseTransaction):
+        (WebCore::IDBServer::UniqueIDBDatabaseTransaction::originalDatabaseInfo):
+        (WebCore::IDBServer::UniqueIDBDatabaseTransaction::isVersionChange):
+        (WebCore::IDBServer::UniqueIDBDatabaseTransaction::isReadOnly):
+        * Modules/indexeddb/shared/IDBTransactionInfo.cpp:
+        (WebCore::IDBTransactionInfo::clientTransaction):
+        (WebCore::IDBTransactionInfo::versionChange):
+        (WebCore::IDBTransactionInfo::loggingString):
+        * Modules/indexeddb/shared/IDBTransactionInfo.h:
+        (WebCore::IDBTransactionInfo::mode):
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/scripts/CodeGenerator.pm:
+        (ProcessDocument):
+        (IsEnumType):
+        (GetEnumByName):
+        (IsExternalEnumType):
+        (ValidEnumValues):
+        * bindings/scripts/CodeGeneratorJS.pm:
+        (GenerateEnumeration):
+        (AddToImplIncludesForIDLType):
+        (GetEnumerationClassName):
+        (GenerateEnumerationHeader):
+        (GenerateEnumerationImplementation):
+        (GenerateEnumerationImplementationContent):
+        (GenerateEnumerationsImplementationContent):
+        (GenerateEnumerationHeaderContent):
+        (GenerateEnumerationsHeaderContent):
+        * bindings/scripts/test/JS/JSTestObj.cpp:
+        (WebCore::jsTestObjPrototypeFunctionMethodWithEnumArgCaller):
+        (WebCore::jsTestObjPrototypeFunctionMethodWithStandaloneEnumArg):
+        (WebCore::jsTestObjPrototypeFunctionMethodWithStandaloneEnumArgCaller):
+        * bindings/scripts/test/JS/JSTestStandaloneEnumeration.cpp: Added.
+        (WebCore::convertEnumerationToJS):
+        (WebCore::parseEnumeration<TestStandaloneEnumeration>):
+        (WebCore::convertEnumeration<TestStandaloneEnumeration>):
+        (WebCore::expectedEnumerationValues<TestStandaloneEnumeration>):
+        * bindings/scripts/test/JS/JSTestStandaloneEnumeration.h: Added.
+        * bindings/scripts/test/TestObj.idl:
+        * bindings/scripts/test/TestStandaloneEnumeration.idl: Copied from Source/WebCore/Modules/indexeddb/IDBTransaction.idl.
+        * inspector/InspectorIndexedDBAgent.cpp:
+
 2016-10-26  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/DerivedSources.cpp

@@ -309 +309 @@
 #include "JSIDBRequest.cpp"
 #include "JSIDBTransaction.cpp"
+#include "JSIDBTransactionMode.cpp"
 #include "JSIDBVersionChangeEvent.cpp"
 #endif

trunk/Source/WebCore/DerivedSources.make

@@ -116 +116 @@
     $(WebCore)/Modules/indexeddb/IDBRequest.idl \
     $(WebCore)/Modules/indexeddb/IDBTransaction.idl \
+    $(WebCore)/Modules/indexeddb/IDBTransactionMode.idl \
     $(WebCore)/Modules/indexeddb/IDBVersionChangeEvent.idl \
     $(WebCore)/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.idl \

trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp

@@ -161 +161 @@
 }
 
-ExceptionOr<Ref<IDBTransaction>> IDBDatabase::transaction(StringOrVectorOfStrings&& storeNames, const String& modeString)
+ExceptionOr<Ref<IDBTransaction>> IDBDatabase::transaction(StringOrVectorOfStrings&& storeNames, IDBTransactionMode mode)
 {
     LOG(IndexedDB, "IDBDatabase::transaction");
@@ -179 +179 @@
         return Exception { IDBDatabaseException::InvalidAccessError, ASCIILiteral("Failed to execute 'transaction' on 'IDBDatabase': The storeNames parameter was empty.") };
 
-    auto mode = IDBTransaction::stringToMode(modeString);
-    if (!mode)
-        return Exception { TypeError, "Failed to execute 'transaction' on 'IDBDatabase': The mode provided ('" + modeString + "') is not one of 'readonly' or 'readwrite'." };
-
-    if (mode.value() != IndexedDB::TransactionMode::ReadOnly && mode.value() != IndexedDB::TransactionMode::ReadWrite)
+    if (mode != IDBTransactionMode::Readonly && mode != IDBTransactionMode::Readwrite)
         return Exception { TypeError };
 
@@ -195 +191 @@
     }
 
-    auto info = IDBTransactionInfo::clientTransaction(m_connectionProxy.get(), objectStores, mode.value());
+    auto info = IDBTransactionInfo::clientTransaction(m_connectionProxy.get(), objectStores, mode);
     auto transaction = IDBTransaction::create(*this, info);
 
@@ -327 +323 @@
     ASSERT(currentThread() == originThreadID());
     ASSERT(!m_versionChangeTransaction);
-    ASSERT(info.mode() == IndexedDB::TransactionMode::VersionChange);
+    ASSERT(info.mode() == IDBTransactionMode::Versionchange);
     ASSERT(!m_closePending);
     ASSERT(scriptExecutionContext());

trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.h

@@ -36 +36 @@
 #include "IDBDatabaseInfo.h"
 #include "IDBKeyPath.h"
+#include "IDBTransactionMode.h"
 
 namespace WebCore {
@@ -65 +66 @@
 
     using StringOrVectorOfStrings = WTF::Variant<String, Vector<String>>;
-    ExceptionOr<Ref<IDBTransaction>> transaction(StringOrVectorOfStrings&& storeNames, const String& mode);
+    ExceptionOr<Ref<IDBTransaction>> transaction(StringOrVectorOfStrings&& storeNames, IDBTransactionMode);
     ExceptionOr<void> deleteObjectStore(const String& name);
     void close();

trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.idl

@@ -38 +38 @@
     [MayThrowException] void deleteObjectStore(DOMString name);
 
-    // FIXME: mode parameter type should be a IDBTransactionMode string enumeration.
-    [MayThrowException] IDBTransaction transaction((DOMString or sequence<DOMString>) storeNames, optional DOMString mode = "readonly");
+    [MayThrowException] IDBTransaction transaction((DOMString or sequence<DOMString>) storeNames, optional IDBTransactionMode mode = "readonly");
 
     // FIXME: This is not part of the spec, but is needed for compatibility.
     // See https://github.com/w3c/IndexedDB/issues/85
-    [MayThrowException] IDBTransaction transaction(DOMStringList storeNames, optional DOMString mode = "readonly");
+    [MayThrowException] IDBTransaction transaction(DOMStringList storeNames, optional IDBTransactionMode mode = "readonly");
     void close();
 

trunk/Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.cpp

@@ -149 +149 @@
     Ref<IDBTransaction> transaction = database->startVersionChangeTransaction(resultData.transactionInfo(), *this);
 
-    ASSERT(transaction->info().mode() == IndexedDB::TransactionMode::VersionChange);
+    ASSERT(transaction->info().mode() == IDBTransactionMode::Versionchange);
     ASSERT(transaction->originalDatabaseInfo());
 

trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp

@@ -60 +60 @@
 namespace WebCore {
 
-const AtomicString& IDBTransaction::modeReadOnly()
-{
-    static NeverDestroyed<AtomicString> readonly("readonly", AtomicString::ConstructFromLiteral);
-    return readonly;
-}
-
-const AtomicString& IDBTransaction::modeReadWrite()
-{
-    static NeverDestroyed<AtomicString> readwrite("readwrite", AtomicString::ConstructFromLiteral);
-    return readwrite;
-}
-
-const AtomicString& IDBTransaction::modeVersionChange()
-{
-    static NeverDestroyed<AtomicString> versionchange("versionchange", AtomicString::ConstructFromLiteral);
-    return versionchange;
-}
-
-const AtomicString& IDBTransaction::modeReadOnlyLegacy()
-{
-    static NeverDestroyed<AtomicString> readonly("0", AtomicString::ConstructFromLiteral);
-    return readonly;
-}
-
-const AtomicString& IDBTransaction::modeReadWriteLegacy()
-{
-    static NeverDestroyed<AtomicString> readwrite("1", AtomicString::ConstructFromLiteral);
-    return readwrite;
-}
-
-Optional<IndexedDB::TransactionMode> IDBTransaction::stringToMode(const String& modeString)
-{
-    if (modeString.isNull() || modeString == IDBTransaction::modeReadOnly())
-        return IndexedDB::TransactionMode::ReadOnly;
-    if (modeString == IDBTransaction::modeReadWrite())
-        return IndexedDB::TransactionMode::ReadWrite;
-
-    return Nullopt;
-}
-
-const AtomicString& IDBTransaction::modeToString(IndexedDB::TransactionMode mode)
-{
-    switch (mode) {
-    case IndexedDB::TransactionMode::ReadOnly:
-        return IDBTransaction::modeReadOnly();
-
-    case IndexedDB::TransactionMode::ReadWrite:
-        return IDBTransaction::modeReadWrite();
-
-    case IndexedDB::TransactionMode::VersionChange:
-        return IDBTransaction::modeVersionChange();
-    }
-
-    ASSERT_NOT_REACHED();
-    return IDBTransaction::modeReadOnly();
-}
-
 Ref<IDBTransaction> IDBTransaction::create(IDBDatabase& database, const IDBTransactionInfo& info)
 {
@@ -138 +81 @@
     ASSERT(currentThread() == m_database->originThreadID());
 
-    if (m_info.mode() == IndexedDB::TransactionMode::VersionChange) {
+    if (m_info.mode() == IDBTransactionMode::Versionchange) {
         ASSERT(m_openDBRequest);
         m_openDBRequest->setVersionChangeTransaction(*this);
@@ -182 +125 @@
     objectStoreNames->sort();
     return objectStoreNames;
-}
-
-const String& IDBTransaction::mode() const
-{
-    ASSERT(currentThread() == m_database->originThreadID());
-
-    switch (m_info.mode()) {
-    case IndexedDB::TransactionMode::ReadOnly:
-        return IDBTransaction::modeReadOnly();
-    case IndexedDB::TransactionMode::ReadWrite:
-        return IDBTransaction::modeReadWrite();
-    case IndexedDB::TransactionMode::VersionChange:
-        return IDBTransaction::modeVersionChange();
-    }
-
-    RELEASE_ASSERT_NOT_REACHED();
 }
 

trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h

@@ -35 +35 @@
 #include "IDBOpenDBRequest.h"
 #include "IDBTransactionInfo.h"
+#include "IDBTransactionMode.h"
 #include "IndexedDB.h"
 #include "Timer.h"
@@ -65 +66 @@
 class IDBTransaction : public ThreadSafeRefCounted<IDBTransaction>, public EventTargetWithInlineData, public IDBActiveDOMObject {
 public:
-    static const AtomicString& modeReadOnly();
-    static const AtomicString& modeReadWrite();
-    static const AtomicString& modeVersionChange();
-    static const AtomicString& modeReadOnlyLegacy();
-    static const AtomicString& modeReadWriteLegacy();
-
-    static Optional<IndexedDB::TransactionMode> stringToMode(const String&);
-    static const AtomicString& modeToString(IndexedDB::TransactionMode);
-
     static Ref<IDBTransaction> create(IDBDatabase&, const IDBTransactionInfo&);
     static Ref<IDBTransaction> create(IDBDatabase&, const IDBTransactionInfo&, IDBOpenDBRequest&);
@@ -81 +73 @@
     // IDBTransaction IDL
     Ref<DOMStringList> objectStoreNames() const;
-    const String& mode() const;
+    IDBTransactionMode mode() const { return m_info.mode(); }
     IDBDatabase* db();
     DOMError* error() const;
@@ -111 +103 @@
     void didCommit(const IDBError&);
 
-    bool isVersionChange() const { return m_info.mode() == IndexedDB::TransactionMode::VersionChange; }
-    bool isReadOnly() const { return m_info.mode() == IndexedDB::TransactionMode::ReadOnly; }
+    bool isVersionChange() const { return mode() == IDBTransactionMode::Versionchange; }
+    bool isReadOnly() const { return mode() == IDBTransactionMode::Readonly; }
     bool isActive() const;
 

trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.idl

@@ -32 +32 @@
 ] interface IDBTransaction : EventTarget {
     readonly attribute DOMStringList objectStoreNames;
-    readonly attribute DOMString mode;
+    readonly attribute IDBTransactionMode mode;
     readonly attribute IDBDatabase db;
     readonly attribute DOMError error;

trunk/Source/WebCore/Modules/indexeddb/IDBTransactionMode.idl

@@ -1 @@
- /*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- * Copyright (C) 2011 Apple Inc. All rights reserved.
+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26 +25 @@
 
 [
-    ActiveDOMObject,
     Conditional=INDEXED_DATABASE,
-    EnabledAtRuntime=IndexedDB,
-    SkipVTableValidation,
-] interface IDBTransaction : EventTarget {
-    readonly attribute DOMStringList objectStoreNames;
-    readonly attribute DOMString mode;
-    readonly attribute IDBDatabase db;
-    readonly attribute DOMError error;
-
-    [MayThrowException] IDBObjectStore objectStore(DOMString name);
-    [MayThrowException] void abort();
-
-    attribute EventHandler onabort;
-    attribute EventHandler oncomplete;
-    attribute EventHandler onerror;
+] enum IDBTransactionMode {
+    "readonly",
+    "readwrite",
+    "versionchange"
 };

trunk/Source/WebCore/Modules/indexeddb/IndexedDB.h

@@ -31 +31 @@
 
 namespace IndexedDB {
-
-enum class TransactionMode {
-    ReadOnly = 0,
-    ReadWrite = 1,
-    VersionChange = 2,
-};
-const unsigned TransactionModeMaximum = 2;
 
 enum class TransactionState {

trunk/Source/WebCore/Modules/indexeddb/server/MemoryBackingStoreTransaction.cpp

@@ -49 +49 @@
     , m_info(info)
 {
-    if (m_info.mode() == IndexedDB::TransactionMode::VersionChange) {
+    if (m_info.mode() == IDBTransactionMode::Versionchange) {
         IDBDatabaseInfo info;
         auto error = m_backingStore.getOrEstablishDatabaseInfo(info);
@@ -154 +154 @@
 {
     ASSERT(m_objectStores.contains(&objectStore));
-    ASSERT(m_info.mode() == IndexedDB::TransactionMode::VersionChange);
+    ASSERT(m_info.mode() == IDBTransactionMode::Versionchange);
 
     // We only care about the first rename in a given transaction, because if the transaction is aborted we want
@@ -164 +164 @@
 {
     ASSERT(m_objectStores.contains(&index.objectStore()));
-    ASSERT(m_info.mode() == IndexedDB::TransactionMode::VersionChange);
+    ASSERT(m_info.mode() == IDBTransactionMode::Versionchange);
 
     // We only care about the first rename in a given transaction, because if the transaction is aborted we want
@@ -234 +234 @@
 
     if (m_originalDatabaseInfo) {
-        ASSERT(m_info.mode() == IndexedDB::TransactionMode::VersionChange);
+        ASSERT(m_info.mode() == IDBTransactionMode::Versionchange);
         m_backingStore.setDatabaseInfo(*m_originalDatabaseInfo);
     }

trunk/Source/WebCore/Modules/indexeddb/server/MemoryBackingStoreTransaction.h

@@ -53 +53 @@
     ~MemoryBackingStoreTransaction();
 
-    bool isVersionChange() const { return m_info.mode() == IndexedDB::TransactionMode::VersionChange; }
-    bool isWriting() const { return m_info.mode() != IndexedDB::TransactionMode::ReadOnly; }
+    bool isVersionChange() const { return m_info.mode() == IDBTransactionMode::Versionchange; }
+    bool isWriting() const { return m_info.mode() != IDBTransactionMode::Readonly; }
     bool isAborting() const { return m_isAborting; }
 

trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp

@@ -779 +779 @@
 
     auto error = addResult.iterator->value->begin(*m_sqliteDB);
-    if (error.isNull() && info.mode() == IndexedDB::TransactionMode::VersionChange) {
+    if (error.isNull() && info.mode() == IDBTransactionMode::Versionchange) {
         m_originalDatabaseInfoBeforeVersionChange = std::make_unique<IDBDatabaseInfo>(*m_databaseInfo);
 
@@ -806 +806 @@
 
 
-    if (transaction->mode() == IndexedDB::TransactionMode::VersionChange) {
+    if (transaction->mode() == IDBTransactionMode::Versionchange) {
         ASSERT(m_originalDatabaseInfoBeforeVersionChange);
         m_databaseInfo = WTFMove(m_originalDatabaseInfoBeforeVersionChange);
@@ -829 +829 @@
     auto error = transaction->commit();
     if (!error.isNull()) {
-        if (transaction->mode() == IndexedDB::TransactionMode::VersionChange) {
+        if (transaction->mode() == IDBTransactionMode::Versionchange) {
             ASSERT(m_originalDatabaseInfoBeforeVersionChange);
             m_databaseInfo = WTFMove(m_originalDatabaseInfoBeforeVersionChange);
@@ -851 +851 @@
         return { IDBDatabaseException::UnknownError, ASCIILiteral("Attempt to create an object store without an in-progress transaction") };
     }
-    if (transaction->mode() != IndexedDB::TransactionMode::VersionChange) {
+    if (transaction->mode() != IDBTransactionMode::Versionchange) {
         LOG_ERROR("Attempt to create an object store in a non-version-change transaction");
         return { IDBDatabaseException::UnknownError, ASCIILiteral("Attempt to create an object store in a non-version-change transaction") };
@@ -903 +903 @@
         return { IDBDatabaseException::UnknownError, ASCIILiteral("Attempt to delete an object store without an in-progress transaction") };
     }
-    if (transaction->mode() != IndexedDB::TransactionMode::VersionChange) {
+    if (transaction->mode() != IDBTransactionMode::Versionchange) {
         LOG_ERROR("Attempt to delete an object store in a non-version-change transaction");
         return { IDBDatabaseException::UnknownError, ASCIILiteral("Attempt to delete an object store in a non-version-change transaction") };
@@ -995 +995 @@
         return { IDBDatabaseException::UnknownError, ASCIILiteral("Attempt to rename an object store without an in-progress transaction") };
     }
-    if (transaction->mode() != IndexedDB::TransactionMode::VersionChange) {
+    if (transaction->mode() != IDBTransactionMode::Versionchange) {
         LOG_ERROR("Attempt to rename an object store in a non-version-change transaction");
         return { IDBDatabaseException::UnknownError, ASCIILiteral("Attempt to rename an object store in a non-version-change transaction") };
@@ -1028 +1028 @@
         return { IDBDatabaseException::UnknownError, ASCIILiteral("Attempt to clear an object store without an in-progress transaction") };
     }
-    if (transaction->mode() == IndexedDB::TransactionMode::ReadOnly) {
+    if (transaction->mode() == IDBTransactionMode::Readonly) {
         LOG_ERROR("Attempt to clear an object store in a read-only transaction");
         return { IDBDatabaseException::UnknownError, ASCIILiteral("Attempt to clear an object store in a read-only transaction") };
@@ -1069 +1069 @@
         return { IDBDatabaseException::UnknownError, ASCIILiteral("Attempt to create an index without an in-progress transaction") };
     }
-    if (transaction->mode() != IndexedDB::TransactionMode::VersionChange) {
+    if (transaction->mode() != IDBTransactionMode::Versionchange) {
         LOG_ERROR("Attempt to create an index in a non-version-change transaction");
         return { IDBDatabaseException::UnknownError, ASCIILiteral("Attempt to create an index in a non-version-change transaction") };
@@ -1246 +1246 @@
     }
 
-    if (transaction->mode() != IndexedDB::TransactionMode::VersionChange) {
+    if (transaction->mode() != IDBTransactionMode::Versionchange) {
         LOG_ERROR("Attempt to delete index during a non-version-change transaction");
         return { IDBDatabaseException::UnknownError, ASCIILiteral("Attempt to delete index during a non-version-change transaction") };
@@ -1301 +1301 @@
     }
 
-    if (transaction->mode() != IndexedDB::TransactionMode::VersionChange) {
+    if (transaction->mode() != IDBTransactionMode::Versionchange) {
         LOG_ERROR("Attempt to rename an index in a non-version-change transaction");
         return { IDBDatabaseException::UnknownError, ASCIILiteral("Attempt to rename an index in a non-version-change transaction") };
@@ -1415 +1415 @@
     ASSERT(m_sqliteDB->isOpen());
     ASSERT(transaction.inProgress());
-    ASSERT(transaction.mode() != IndexedDB::TransactionMode::ReadOnly);
+    ASSERT(transaction.mode() != IDBTransactionMode::Readonly);
     UNUSED_PARAM(transaction);
 
@@ -1512 +1512 @@
         return { IDBDatabaseException::UnknownError, ASCIILiteral("Attempt to delete range from database without an in-progress transaction") };
     }
-    if (transaction->mode() == IndexedDB::TransactionMode::ReadOnly) {
+    if (transaction->mode() == IDBTransactionMode::Readonly) {
         LOG_ERROR("Attempt to delete records from an object store in a read-only transaction");
         return { IDBDatabaseException::UnknownError, ASCIILiteral("Attempt to delete records from an object store in a read-only transaction") };
@@ -1631 +1631 @@
         return { IDBDatabaseException::UnknownError, ASCIILiteral("Attempt to store a record in an object store without an in-progress transaction") };
     }
-    if (transaction->mode() == IndexedDB::TransactionMode::ReadOnly) {
+    if (transaction->mode() == IDBTransactionMode::Readonly) {
         LOG_ERROR("Attempt to store a record in an object store in a read-only transaction");
         return { IDBDatabaseException::UnknownError, ASCIILiteral("Attempt to store a record in an object store in a read-only transaction") };
@@ -1990 +1990 @@
         return { IDBDatabaseException::UnknownError, ASCIILiteral("Attempt to generate key in database without an in-progress transaction") };
     }
-    if (transaction->mode() == IndexedDB::TransactionMode::ReadOnly) {
+    if (transaction->mode() == IDBTransactionMode::Readonly) {
         LOG_ERROR("Attempt to generate key in a read-only transaction");
         return { IDBDatabaseException::UnknownError, ASCIILiteral("Attempt to generate key in a read-only transaction") };
@@ -2019 +2019 @@
         return { IDBDatabaseException::UnknownError, ASCIILiteral("Attempt to revert key generator value in database without an in-progress transaction") };
     }
-    if (transaction->mode() == IndexedDB::TransactionMode::ReadOnly) {
+    if (transaction->mode() == IDBTransactionMode::Readonly) {
         LOG_ERROR("Attempt to revert key generator value in a read-only transaction");
         return { IDBDatabaseException::UnknownError, ASCIILiteral("Attempt to revert key generator value in a read-only transaction") };
@@ -2040 +2040 @@
         return { IDBDatabaseException::UnknownError, ASCIILiteral("Attempt to update key generator value in database without an in-progress transaction") };
     }
-    if (transaction->mode() == IndexedDB::TransactionMode::ReadOnly) {
+    if (transaction->mode() == IDBTransactionMode::Readonly) {
         LOG_ERROR("Attempt to update key generator value in a read-only transaction");
         return { IDBDatabaseException::UnknownError, ASCIILiteral("Attempt to update key generator value in a read-only transaction") };

trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBTransaction.cpp

@@ -59 +59 @@
     ASSERT(!m_sqliteTransaction);
 
-    m_sqliteTransaction = std::make_unique<SQLiteTransaction>(database, m_info.mode() == IndexedDB::TransactionMode::ReadOnly);
+    m_sqliteTransaction = std::make_unique<SQLiteTransaction>(database, m_info.mode() == IDBTransactionMode::Readonly);
     m_sqliteTransaction->begin();
 

trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBTransaction.h

@@ -67 +67 @@
     void notifyCursorsOfChanges(int64_t objectStoreID);
 
-    IndexedDB::TransactionMode mode() const { return m_info.mode(); }
+    IDBTransactionMode mode() const { return m_info.mode(); }
     bool inProgress() const;
 

trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp

@@ -1413 +1413 @@
     ASSERT(!m_hardClosedForUserDelete);
 
-    ASSERT(transaction->info().mode() != IndexedDB::TransactionMode::VersionChange);
+    ASSERT(transaction->info().mode() != IDBTransactionMode::Versionchange);
 
     m_pendingTransactions.append(WTFMove(transaction));
@@ -1549 +1549 @@
 
         switch (currentTransaction->info().mode()) {
-        case IndexedDB::TransactionMode::ReadOnly: {
+        case IDBTransactionMode::Readonly: {
             bool hasOverlappingScopes = scopesOverlap(deferredReadWriteScopes, currentTransaction->objectStoreIdentifiers());
             hasOverlappingScopes |= scopesOverlap(m_objectStoreWriteTransactions, currentTransaction->objectStoreIdentifiers());
@@ -1558 +1558 @@
             break;
         }
-        case IndexedDB::TransactionMode::ReadWrite: {
+        case IDBTransactionMode::Readwrite: {
             bool hasOverlappingScopes = scopesOverlap(m_objectStoreTransactionCounts, currentTransaction->objectStoreIdentifiers());
             hasOverlappingScopes |= scopesOverlap(deferredReadWriteScopes, currentTransaction->objectStoreIdentifiers());
@@ -1570 +1570 @@
             break;
         }
-        case IndexedDB::TransactionMode::VersionChange:
+        case IDBTransactionMode::Versionchange:
             // Version change transactions should never be scheduled in the traditional manner.
             RELEASE_ASSERT_NOT_REACHED();

trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.cpp

@@ -136 +136 @@
     LOG(IndexedDB, "UniqueIDBDatabaseConnection::establishTransaction - %s - %" PRIu64, m_openRequestIdentifier.loggingString().utf8().data(), m_identifier);
 
-    ASSERT(info.mode() != IndexedDB::TransactionMode::VersionChange);
+    ASSERT(info.mode() != IDBTransactionMode::Versionchange);
 
     // No transactions should ever come from the client after the client has already told us

trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.cpp

@@ -47 +47 @@
     , m_transactionInfo(info)
 {
-    if (m_transactionInfo.mode() == IndexedDB::TransactionMode::VersionChange)
+    if (m_transactionInfo.mode() == IDBTransactionMode::Versionchange)
         m_originalDatabaseInfo = std::make_unique<IDBDatabaseInfo>(m_databaseConnection->database().info());
 
@@ -61 +61 @@
 IDBDatabaseInfo* UniqueIDBDatabaseTransaction::originalDatabaseInfo() const
 {
-    ASSERT(m_transactionInfo.mode() == IndexedDB::TransactionMode::VersionChange);
+    ASSERT(m_transactionInfo.mode() == IDBTransactionMode::Versionchange);
     return m_originalDatabaseInfo.get();
 }
@@ -85 +85 @@
 bool UniqueIDBDatabaseTransaction::isVersionChange() const
 {
-    return m_transactionInfo.mode() == IndexedDB::TransactionMode::VersionChange;
+    return m_transactionInfo.mode() == IDBTransactionMode::Versionchange;
 }
 
 bool UniqueIDBDatabaseTransaction::isReadOnly() const
 {
-    return m_transactionInfo.mode() == IndexedDB::TransactionMode::ReadOnly;
+    return m_transactionInfo.mode() == IDBTransactionMode::Readonly;
 }   
 

trunk/Source/WebCore/Modules/indexeddb/shared/IDBTransactionInfo.cpp

@@ -42 +42 @@
 }
 
-IDBTransactionInfo IDBTransactionInfo::clientTransaction(const IDBClient::IDBConnectionProxy& connectionProxy, const Vector<String>& objectStores, IndexedDB::TransactionMode mode)
+IDBTransactionInfo IDBTransactionInfo::clientTransaction(const IDBClient::IDBConnectionProxy& connectionProxy, const Vector<String>& objectStores, IDBTransactionMode mode)
 {
     IDBTransactionInfo result((IDBResourceIdentifier(connectionProxy)));
@@ -54 +54 @@
 {
     IDBTransactionInfo result((IDBResourceIdentifier(connection)));
-    result.m_mode = IndexedDB::TransactionMode::VersionChange;
+    result.m_mode = IDBTransactionMode::Versionchange;
     result.m_newVersion = newVersion;
     result.m_originalDatabaseInfo = std::make_unique<IDBDatabaseInfo>(originalDatabaseInfo);
@@ -100 +100 @@
     String modeString;
     switch (m_mode) {
-    case IndexedDB::TransactionMode::ReadOnly:
-        modeString = IDBTransaction::modeReadOnly();
+    case IDBTransactionMode::Readonly:
+        modeString = ASCIILiteral("readonly");
         break;
-    case IndexedDB::TransactionMode::ReadWrite:
-        modeString = IDBTransaction::modeReadWrite();
+    case IDBTransactionMode::Readwrite:
+        modeString = ASCIILiteral("readwrite");
         break;
-    case IndexedDB::TransactionMode::VersionChange:
-        modeString = IDBTransaction::modeVersionChange();
+    case IDBTransactionMode::Versionchange:
+        modeString = ASCIILiteral("versionchange");
         break;
     default:

trunk/Source/WebCore/Modules/indexeddb/shared/IDBTransactionInfo.h

@@ -31 +31 @@
 #include "IDBDatabaseInfo.h"
 #include "IDBResourceIdentifier.h"
+#include "IDBTransactionMode.h"
 #include "IndexedDB.h"
 #include <wtf/Vector.h>
@@ -46 +47 @@
 class IDBTransactionInfo {
 public:
-    static IDBTransactionInfo clientTransaction(const IDBClient::IDBConnectionProxy&, const Vector<String>& objectStores, IndexedDB::TransactionMode);
+    static IDBTransactionInfo clientTransaction(const IDBClient::IDBConnectionProxy&, const Vector<String>& objectStores, IDBTransactionMode);
     static IDBTransactionInfo versionChange(const IDBServer::IDBConnectionToClient&, const IDBDatabaseInfo& originalDatabaseInfo, uint64_t newVersion);
 
@@ -58 +59 @@
     const IDBResourceIdentifier& identifier() const { return m_identifier; }
 
-    IndexedDB::TransactionMode mode() const { return m_mode; }
+    IDBTransactionMode mode() const { return m_mode; }
     uint64_t newVersion() const { return m_newVersion; }
 
@@ -80 +81 @@
     IDBResourceIdentifier m_identifier;
 
-    IndexedDB::TransactionMode m_mode { IndexedDB::TransactionMode::ReadOnly };
+    IDBTransactionMode m_mode { IDBTransactionMode::Readonly };
     uint64_t m_newVersion { 0 };
     Vector<String> m_objectStores;

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -2949 +2949 @@
                 838867351D13BA5F003697D0 /* RenderObjectEnums.h in Headers */ = {isa = PBXBuildFile; fileRef = 838867341D13BA59003697D0 /* RenderObjectEnums.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 838869EC1CE81EA300D16A9E /* JSTextCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 838869EB1CE81E9E00D16A9E /* JSTextCustom.cpp */; };
+                838EF5381DC149E2008F0C39 /* IDBTransactionMode.h in Headers */ = {isa = PBXBuildFile; fileRef = 838EF5361DC149DA008F0C39 /* IDBTransactionMode.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                838EF53B1DC14A7C008F0C39 /* JSIDBTransactionMode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 838EF5391DC14A75008F0C39 /* JSIDBTransactionMode.cpp */; };
+                838EF53C1DC14A7C008F0C39 /* JSIDBTransactionMode.h in Headers */ = {isa = PBXBuildFile; fileRef = 838EF53A1DC14A75008F0C39 /* JSIDBTransactionMode.h */; };
                 839AAFEC1A0C0C8D00605F99 /* HTMLWBRElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 839AAFEA1A0C0C8D00605F99 /* HTMLWBRElement.cpp */; };
                 839AAFED1A0C0C8D00605F99 /* HTMLWBRElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 839AAFEB1A0C0C8D00605F99 /* HTMLWBRElement.h */; };
@@ -10273 +10276 @@
                 838867341D13BA59003697D0 /* RenderObjectEnums.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderObjectEnums.h; sourceTree = "<group>"; };
                 838869EB1CE81E9E00D16A9E /* JSTextCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTextCustom.cpp; sourceTree = "<group>"; };
+                838EF5361DC149DA008F0C39 /* IDBTransactionMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBTransactionMode.h; sourceTree = "<group>"; };
+                838EF5371DC149DA008F0C39 /* IDBTransactionMode.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = IDBTransactionMode.idl; sourceTree = "<group>"; };
+                838EF5391DC14A75008F0C39 /* JSIDBTransactionMode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSIDBTransactionMode.cpp; sourceTree = "<group>"; };
+                838EF53A1DC14A75008F0C39 /* JSIDBTransactionMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSIDBTransactionMode.h; sourceTree = "<group>"; };
                 839AAFEA1A0C0C8D00605F99 /* HTMLWBRElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLWBRElement.cpp; sourceTree = "<group>"; };
                 839AAFEB1A0C0C8D00605F99 /* HTMLWBRElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLWBRElement.h; sourceTree = "<group>"; };
@@ -18835 +18842 @@
                                 51645B511B9F889B00F789CE /* IDBTransaction.h */,
                                 51D719A6181106E00016DC51 /* IDBTransaction.idl */,
+                                838EF5361DC149DA008F0C39 /* IDBTransactionMode.h */,
+                                838EF5371DC149DA008F0C39 /* IDBTransactionMode.idl */,
                                 516103AD1CADB9A30016B4C7 /* IDBValue.cpp */,
                                 516103AE1CADB9A30016B4C7 /* IDBValue.h */,
@@ -20227 +20236 @@
                                 511EF2B417F0FC4800E4FA16 /* JSIDBTransaction.cpp */,
                                 B656626E120B1227006EA85C /* JSIDBTransaction.h */,
+                                838EF5391DC14A75008F0C39 /* JSIDBTransactionMode.cpp */,
+                                838EF53A1DC14A75008F0C39 /* JSIDBTransactionMode.h */,
                                 269239911505E1AA009E57FC /* JSIDBVersionChangeEvent.cpp */,
                                 269239921505E1AA009E57FC /* JSIDBVersionChangeEvent.h */,
@@ -25519 +25530 @@
                                 65DF323A09D1DE65000BE325 /* JSCanvasGradient.h in Headers */,
                                 65DF323C09D1DE65000BE325 /* JSCanvasPattern.h in Headers */,
+                                838EF53C1DC14A7C008F0C39 /* JSIDBTransactionMode.h in Headers */,
                                 65DF323C09D1DE65001BE325 /* JSCanvasProxy.h in Headers */,
                                 49EED1451051969400099FAB /* JSCanvasRenderingContext2D.h in Headers */,
@@ -26836 +26848 @@
                                 A8CFF5E10A155A05000A4234 /* RootInlineBox.h in Headers */,
                                 49E911C90EF86D47009D0CAF /* RotateTransformOperation.h in Headers */,
+                                838EF5381DC149E2008F0C39 /* IDBTransactionMode.h in Headers */,
                                 A73F95FF12C97BFE0031AAF9 /* RoundedRect.h in Headers */,
                                 07AB996918DA3C010018771E /* RTCConfiguration.h in Headers */,
@@ -28974 +28987 @@
                                 A81369DD097374F600D74463 /* HTMLOptionElement.cpp in Sources */,
                                 9327A94209968D1A0068A546 /* HTMLOptionsCollection.cpp in Sources */,
+                                838EF53B1DC14A7C008F0C39 /* JSIDBTransactionMode.cpp in Sources */,
                                 4AD01008127E642A0015035F /* HTMLOutputElement.cpp in Sources */,
                                 A8EA7CB20A192B9C00A8EF5F /* HTMLParagraphElement.cpp in Sources */,

trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm

@@ -73 +73 @@
 );
 
-my %dictionaryTypes = ();
 my %dictionaryTypeImplementationNameOverrides = ();
-
-my %enumTypeHash = ();
 my %enumTypeImplementationNameOverrides = ();
 
@@ -142 +139 @@
 my $cachedInterfaces = {};
 my $cachedExternalDictionaries = {};
+my $cachedExternalEnumerations = {};
 
 sub assert
@@ -182 +180 @@
 
     foreach my $dictionary (@{$useDocument->dictionaries}) {
-        $dictionaryTypes{$dictionary->name} = 1;
         if ($dictionary->extendedAttributes->{"ImplementedAs"}) {
             $dictionaryTypeImplementationNameOverrides{$dictionary->name} = $dictionary->extendedAttributes->{"ImplementedAs"};
@@ -189 +186 @@
 
     foreach my $enumeration (@{$useDocument->enumerations}) {
-        $enumTypeHash{$enumeration->name} = $enumeration->values;
         if ($enumeration->extendedAttributes->{"ImplementedAs"}) {
             $enumTypeImplementationNameOverrides{$enumeration->name} = $enumeration->extendedAttributes->{"ImplementedAs"};
@@ -224 +220 @@
         $codeGenerator->GenerateDictionary($dictionary, $useDocument->enumerations);
         $codeGenerator->WriteData($dictionary, $useOutputDir, $useOutputHeadersDir);
+        return;
+    }
+    
+    my $enumerations = $useDocument->enumerations;
+    if (@$enumerations) {
+        die "Multiple standalone enumerations per document are not supported" if @$enumerations > 1;
+
+        my $enumeration = @$enumerations[0];
+        print "Generating $useGenerator bindings code for IDL enumeration \"" . $enumeration->name . "\"...\n" if $verbose;
+        $codeGenerator->GenerateEnumeration($enumeration);
+        $codeGenerator->WriteData($enumeration, $useOutputDir, $useOutputHeadersDir);
         return;
     }
@@ -445 +452 @@
     my ($object, $type) = @_;
 
-    return 1 if exists $enumTypeHash{$type};
-    return 0;
+    return defined($object->GetEnumByName($type));
+}
+
+sub GetEnumByName
+{
+    my ($object, $name) = @_;
+    
+    die "GetEnumByName() was called with an undefined enumeration name" unless defined($name);
+
+    for my $enumeration (@{$useDocument->enumerations}) {
+        return $enumeration if $enumeration->name eq $name;
+    }
+
+    return $cachedExternalEnumerations->{$name} if exists($cachedExternalEnumerations->{$name});
+
+    # Find the IDL file associated with the dictionary.
+    my $filename = $object->IDLFileForInterface($name) or return;
+
+    # Do a fast check to see if it seems to contain a dictionary.
+    my $fileContents = slurp($filename);
+
+    if ($fileContents =~ /\benum\s+$name/gs) {
+        # Parse the IDL.
+        my $parser = IDLParser->new(1);
+        my $document = $parser->Parse($filename, $defines, $preprocessor);
+
+        foreach my $enumeration (@{$document->enumerations}) {
+            next unless $enumeration->name eq $name;
+
+            $cachedExternalEnumerations->{$name} = $enumeration;
+            my $implementedAs = $enumeration->extendedAttributes->{ImplementedAs};
+            $enumTypeImplementationNameOverrides{$enumeration->name} = $implementedAs if $implementedAs;
+            return $enumeration;
+        }
+    }
+    $cachedExternalEnumerations->{$name} = undef;
+}
+
+# An enumeration defined in its own IDL file.
+sub IsExternalEnumType
+{
+    my ($object, $type) = @_;
+
+    return $object->IsEnumType($type) && defined($cachedExternalEnumerations->{$type});
 }
 
@@ -453 +502 @@
     my ($object, $type) = @_;
 
-    return @{$enumTypeHash{$type}};
+    my $enumeration = $object->GetEnumByName($type);
+    die "ValidEnumValues() was with a type that is not an enumeration: " . $type unless defined($enumeration);
+
+    return $enumeration->values;
 }
 

trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm

@@ -133 +133 @@
 }
 
+sub GenerateEnumeration
+{
+    my ($object, $enumeration) = @_;
+
+    my $className = GetEnumerationClassName($enumeration->name);
+    $object->GenerateEnumerationHeader($enumeration, $className);
+    $object->GenerateEnumerationImplementation($enumeration, $className);
+}
+
 sub GenerateDictionary
 {
@@ -289 +298 @@
     }
 
-    if ($codeGenerator->IsExternalDictionaryType($idlType->name)) {
+    if ($codeGenerator->IsExternalDictionaryType($idlType->name) || $codeGenerator->IsExternalEnumType($idlType->name)) {
         AddToImplIncludes("JS" . $idlType->name . ".h", $conditional);
         return;
@@ -853 +862 @@
     }
 
+    return $name if $codeGenerator->IsExternalEnumType($name);
     return $name unless defined($interface);
+
     return GetNestedClassName($interface, $name);
 }
@@ -867 +878 @@
 }
 
+sub GenerateEnumerationHeader
+{
+    my ($object, $enumeration, $className) = @_;
+ 
+    # - Add default header template and header protection.
+    push(@headerContentHeader, GenerateHeaderContentHeader($enumeration));
+ 
+    $headerIncludes{"$className.h"} = 1;
+    $headerIncludes{"JSDOMConvert.h"} = 1;
+ 
+    push(@headerContent, "\nnamespace WebCore {\n\n");
+    push(@headerContent, GenerateEnumerationHeaderContent($enumeration, $className));
+    push(@headerContent, "} // namespace WebCore\n");
+     
+    my $conditionalString = $codeGenerator->GenerateConditionalString($enumeration);
+    push(@headerContent, "\n#endif // ${conditionalString}\n") if $conditionalString;
+}
+ 
+sub GenerateEnumerationImplementation
+{
+    my ($object, $enumeration, $className) = @_;
+ 
+    # - Add default header template
+    push(@implContentHeader, GenerateImplementationContentHeader($enumeration));
+    
+    # FIXME: A little ugly to have this be a side effect instead of a return value.
+    AddToImplIncludes("<runtime/JSString.h>");
+    AddToImplIncludes("JSDOMConvert.h");
+ 
+    push(@implContent, "\nusing namespace JSC;\n\n");
+    push(@implContent, "namespace WebCore {\n\n");
+    push(@implContent, GenerateEnumerationImplementationContent($enumeration, $className));
+    push(@implContent, "} // namespace WebCore\n");
+     
+    my $conditionalString = $codeGenerator->GenerateConditionalString($enumeration);
+    push(@implContent, "\n#endif // ${conditionalString}\n") if $conditionalString;
+}
+
+sub GenerateEnumerationImplementationContent
+{
+    my ($enumeration, $className, $interface, $conditionalString) = @_;
+    
+    my $result = "";
+    $result .= "#if ${conditionalString}\n\n" if $conditionalString;
+
+    # FIXME: Change to take VM& instead of ExecState*.
+    $result .= "template<> JSString* convertEnumerationToJS(ExecState& state, $className enumerationValue)\n";
+    $result .= "{\n";
+    # FIXME: Might be nice to make this global be "const", but NeverDestroyed does not currently support that.
+    # FIXME: Might be nice to make the entire array be NeverDestroyed instead of each value, but not sure what the syntax for that is.
+    AddToImplIncludes("<wtf/NeverDestroyed.h>");
+    $result .= "    static NeverDestroyed<const String> values[] = {\n";
+    foreach my $value (@{$enumeration->values}) {
+        if ($value eq "") {
+            $result .= "        emptyString(),\n";
+        } else {
+            $result .= "        ASCIILiteral(\"$value\"),\n";
+        }
+    }
+    $result .= "    };\n";
+    my $index = 0;
+    foreach my $value (@{$enumeration->values}) {
+        my $enumerationValueName = GetEnumerationValueName($value);
+        $result .= "    static_assert(static_cast<size_t>(${className}::$enumerationValueName) == $index, \"${className}::$enumerationValueName is not $index as expected\");\n";
+        $index++;
+    }
+    $result .= "    ASSERT(static_cast<size_t>(enumerationValue) < WTF_ARRAY_LENGTH(values));\n";
+    $result .= "    return jsStringWithCache(&state, values[static_cast<size_t>(enumerationValue)]);\n";
+    $result .= "}\n\n";
+
+    # FIXME: Change to take VM& instead of ExecState&.
+    # FIXME: Consider using toStringOrNull to make exception checking faster.
+    # FIXME: Consider finding a more efficient way to match against all the strings quickly.
+    $result .= "template<> Optional<$className> parseEnumeration<$className>(ExecState& state, JSValue value)\n";
+    $result .= "{\n";
+    $result .= "    auto stringValue = value.toWTFString(&state);\n";
+    foreach my $value (@{$enumeration->values}) {
+        my $enumerationValueName = GetEnumerationValueName($value);
+        if ($value eq "") {
+            $result .= "    if (stringValue.isEmpty())\n";
+        } else {
+            $result .= "    if (stringValue == \"$value\")\n";
+        }
+        $result .= "        return ${className}::${enumerationValueName};\n";
+    }
+    $result .= "    return Nullopt;\n";
+    $result .= "}\n\n";
+
+    $result .= "template<> $className convertEnumeration<$className>(ExecState& state, JSValue value)\n";
+    $result .= "{\n";
+    $result .= "    VM& vm = state.vm();\n";
+    $result .= "    auto throwScope = DECLARE_THROW_SCOPE(vm);\n";
+    $result .= "    auto result = parseEnumeration<$className>(state, value);\n";
+    $result .= "    if (UNLIKELY(!result)) {\n";
+    $result .= "        throwTypeError(&state, throwScope);\n";
+    $result .= "        return { };\n";
+    $result .= "    }\n";
+    $result .= "    return result.value();\n";
+    $result .= "}\n\n";
+
+    $result .= "template<> const char* expectedEnumerationValues<$className>()\n";
+    $result .= "{\n";
+    $result .= "    return \"\\\"" . join ("\\\", \\\"", @{$enumeration->values}) . "\\\"\";\n";
+    $result .= "}\n\n";
+
+    $result .= "#endif\n\n" if $conditionalString;
+
+    return $result;
+}
+
 sub GenerateEnumerationsImplementationContent
 {
@@ -872 +993 @@
 
     return "" unless @$enumerations;
+    
+    # FIXME: A little ugly to have this be a side effect instead of a return value.
+    AddToImplIncludes("<runtime/JSString.h>");
+    AddToImplIncludes("JSDOMConvert.h");
 
     my $result = "";
@@ -878 +1003 @@
 
         my $className = GetEnumerationClassName($name, $interface);
-
-        # FIXME: A little ugly to have this be a side effect instead of a return value.
-        AddToImplIncludes("<runtime/JSString.h>");
-
         my $conditionalString = $codeGenerator->GenerateConditionalString($enumeration);
-        $result .= "#if ${conditionalString}\n\n" if $conditionalString;
-
-        # FIXME: Change to take VM& instead of ExecState*.
-        $result .= "template<> JSString* convertEnumerationToJS(ExecState& state, $className enumerationValue)\n";
-        $result .= "{\n";
-        # FIXME: Might be nice to make this global be "const", but NeverDestroyed does not currently support that.
-        # FIXME: Might be nice to make the entire array be NeverDestroyed instead of each value, but not sure what the syntax for that is.
-        AddToImplIncludes("<wtf/NeverDestroyed.h>");
-        $result .= "    static NeverDestroyed<const String> values[] = {\n";
-        foreach my $value (@{$enumeration->values}) {
-            if ($value eq "") {
-                $result .= "        emptyString(),\n";
-            } else {
-                $result .= "        ASCIILiteral(\"$value\"),\n";
-            }
-        }
-        $result .= "    };\n";
-        my $index = 0;
-        foreach my $value (@{$enumeration->values}) {
-            my $enumerationValueName = GetEnumerationValueName($value);
-            $result .= "    static_assert(static_cast<size_t>(${className}::$enumerationValueName) == $index, \"${className}::$enumerationValueName is not $index as expected\");\n";
-            $index++;
-        }
-        $result .= "    ASSERT(static_cast<size_t>(enumerationValue) < WTF_ARRAY_LENGTH(values));\n";
-        $result .= "    return jsStringWithCache(&state, values[static_cast<size_t>(enumerationValue)]);\n";
-        $result .= "}\n\n";
-
-        # FIXME: Change to take VM& instead of ExecState&.
-        # FIXME: Consider using toStringOrNull to make exception checking faster.
-        # FIXME: Consider finding a more efficient way to match against all the strings quickly.
-        $result .= "template<> Optional<$className> parseEnumeration<$className>(ExecState& state, JSValue value)\n";
-        $result .= "{\n";
-        $result .= "    auto stringValue = value.toWTFString(&state);\n";
-        foreach my $value (@{$enumeration->values}) {
-            my $enumerationValueName = GetEnumerationValueName($value);
-            if ($value eq "") {
-                $result .= "    if (stringValue.isEmpty())\n";
-            } else {
-                $result .= "    if (stringValue == \"$value\")\n";
-            }
-            $result .= "        return ${className}::${enumerationValueName};\n";
-        }
-        $result .= "    return Nullopt;\n";
-        $result .= "}\n\n";
-
-        # FIXME: A little ugly to have this be a side effect instead of a return value.
-        AddToImplIncludes("JSDOMConvert.h");
-
-        $result .= "template<> $className convertEnumeration<$className>(ExecState& state, JSValue value)\n";
-        $result .= "{\n";
-        $result .= "    VM& vm = state.vm();\n";
-        $result .= "    auto throwScope = DECLARE_THROW_SCOPE(vm);\n";
-        $result .= "    auto result = parseEnumeration<$className>(state, value);\n";
-        $result .= "    if (UNLIKELY(!result)) {\n";
-        $result .= "        throwTypeError(&state, throwScope);\n";
-        $result .= "        return { };\n";
-        $result .= "    }\n";
-        $result .= "    return result.value();\n";
-        $result .= "}\n\n";
-
-        $result .= "template<> const char* expectedEnumerationValues<$className>()\n";
-        $result .= "{\n";
-        $result .= "    return \"\\\"" . join ("\\\", \\\"", @{$enumeration->values}) . "\\\"\";\n";
-        $result .= "}\n\n";
-
-        $result .= "#endif\n\n" if $conditionalString;
-    }
+        $result .= GenerateEnumerationImplementationContent($enumeration, $className, $interface, $conditionalString);
+    }
+    return $result;
+}
+
+sub GenerateEnumerationHeaderContent
+{
+    my ($enumeration, $className, $conditionalString) = @_;
+
+    my $result = "";
+    $result .= "#if ${conditionalString}\n\n" if $conditionalString;
+    $result .= "template<> JSC::JSString* convertEnumerationToJS(JSC::ExecState&, $className);\n\n";
+    $result .= "template<> Optional<$className> parseEnumeration<$className>(JSC::ExecState&, JSC::JSValue);\n";
+    $result .= "template<> $className convertEnumeration<$className>(JSC::ExecState&, JSC::JSValue);\n";
+    $result .= "template<> const char* expectedEnumerationValues<$className>();\n\n";
+    $result .= "#endif\n\n" if $conditionalString;
+    
     return $result;
 }
@@ -965 +1036 @@
 
     my $result = "";
-
     foreach my $enumeration (@$enumerations) {
-        my $name = $enumeration->name;
-
-        my $className = GetEnumerationClassName($name, $interface);
-
+        my $className = GetEnumerationClassName($enumeration->name, $interface);
         my $conditionalString = $codeGenerator->GenerateConditionalString($enumeration);
-        $result .= "#if ${conditionalString}\n\n" if $conditionalString;
-
-        $result .= "template<> JSC::JSString* convertEnumerationToJS(JSC::ExecState&, $className);\n\n";
-
-        $result .= "template<> Optional<$className> parseEnumeration<$className>(JSC::ExecState&, JSC::JSValue);\n";
-        $result .= "template<> $className convertEnumeration<$className>(JSC::ExecState&, JSC::JSValue);\n";
-        $result .= "template<> const char* expectedEnumerationValues<$className>();\n\n";
-
-        $result .= "#endif\n\n" if $conditionalString;
+        $result .= GenerateEnumerationHeaderContent($enumeration, $className, $conditionalString);
     }
     return $result;
@@ -4396 +4455 @@
             }
 
+            $implIncludes{"JS$className.h"} = 1 if $codeGenerator->IsExternalEnumType($type);
             push(@$outputArray, "$indent    $defineOptionalValue = parseEnumeration<$className>(*state, ${name}Value);\n");
             push(@$outputArray, "$indent    RETURN_IF_EXCEPTION(throwScope, encodedJSValue());\n");
@@ -5304 +5364 @@
 
     return ("to$type($value)", 1) if $codeGenerator->IsTypedArrayType($type);
-    return ("parseEnumeration<" . GetEnumerationClassName($type, $interface) . ">($stateReference, $value)", 1) if $codeGenerator->IsEnumType($type);
-
+    
+    if ($codeGenerator->IsEnumType($type)) {
+        AddToImplIncludes("JS$type.h", $conditional) if $codeGenerator->IsExternalEnumType($type);
+        return ("parseEnumeration<" . GetEnumerationClassName($type, $interface) . ">($stateReference, $value)", 1);
+    }
+    
     AddToImplIncludes("JS$type.h", $conditional);
 

trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp

@@ -53 +53 @@
 #include "JSTestObj.h"
 #include "JSTestStandaloneDictionary.h"
+#include "JSTestStandaloneEnumeration.h"
 #include "JSTestSubObj.h"
 #include "JSXPathNSResolver.h"
@@ -961 +962 @@
 JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionNullableStringSpecialMethod(JSC::ExecState*);
 JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithEnumArg(JSC::ExecState*);
+JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithStandaloneEnumArg(JSC::ExecState*);
 JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalEnumArg(JSC::ExecState*);
 JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalEnumArgAndDefaultValue(JSC::ExecState*);
@@ -1572 +1574 @@
     { "nullableStringSpecialMethod", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionNullableStringSpecialMethod), (intptr_t) (1) } },
     { "methodWithEnumArg", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithEnumArg), (intptr_t) (1) } },
+    { "methodWithStandaloneEnumArg", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithStandaloneEnumArg), (intptr_t) (1) } },
     { "methodWithOptionalEnumArg", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalEnumArg), (intptr_t) (0) } },
     { "methodWithOptionalEnumArgAndDefaultValue", JSC::Function, NoIntrinsic, { (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalEnumArgAndDefaultValue), (intptr_t) (0) } },
@@ -5187 +5190 @@
 }
 
+static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionMethodWithStandaloneEnumArgCaller(JSC::ExecState*, JSTestObj*, JSC::ThrowScope&);
+
+EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithStandaloneEnumArg(ExecState* state)
+{
+    return BindingCaller<JSTestObj>::callOperation<jsTestObjPrototypeFunctionMethodWithStandaloneEnumArgCaller>(state, "methodWithStandaloneEnumArg");
+}
+
+static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionMethodWithStandaloneEnumArgCaller(JSC::ExecState* state, JSTestObj* castedThis, JSC::ThrowScope& throwScope)
+{
+    UNUSED_PARAM(state);
+    UNUSED_PARAM(throwScope);
+    auto& impl = castedThis->wrapped();
+    if (UNLIKELY(state->argumentCount() < 1))
+        return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
+    auto enumArgValue = state->uncheckedArgument(0);
+    TestStandaloneEnumeration enumArg;
+    auto optionalValue = parseEnumeration<TestStandaloneEnumeration>(*state, enumArgValue);
+    RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
+    if (UNLIKELY(!optionalValue))
+        return throwArgumentMustBeEnumError(*state, throwScope, 0, "enumArg", "TestObject", "methodWithStandaloneEnumArg", expectedEnumerationValues<TestStandaloneEnumeration>());
+    enumArg = optionalValue.value();
+    impl.methodWithStandaloneEnumArg(enumArg);
+    return JSValue::encode(jsUndefined());
+}
+
 static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionMethodWithOptionalEnumArgCaller(JSC::ExecState*, JSTestObj*, JSC::ThrowScope&);
 

trunk/Source/WebCore/bindings/scripts/test/TestObj.idl

@@ -136 +136 @@
 
     void methodWithEnumArg(TestEnumType enumArg);
+    void methodWithStandaloneEnumArg(TestStandaloneEnumeration enumArg);
     void methodWithOptionalEnumArg(optional TestEnumType enumArg);
     void methodWithOptionalEnumArgAndDefaultValue(optional TestEnumType enumArg = "EnumValue1");

trunk/Source/WebCore/bindings/scripts/test/TestStandaloneEnumeration.idl

@@ -1 @@
- /*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- * Copyright (C) 2011 Apple Inc. All rights reserved.
+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary form, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -12 +11 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
+ * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
+ *     its contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
@@ -26 +28 @@
 
 [
-    ActiveDOMObject,
-    Conditional=INDEXED_DATABASE,
-    EnabledAtRuntime=IndexedDB,
-    SkipVTableValidation,
-] interface IDBTransaction : EventTarget {
-    readonly attribute DOMStringList objectStoreNames;
-    readonly attribute DOMString mode;
-    readonly attribute IDBDatabase db;
-    readonly attribute DOMError error;
+    Conditional=CONDITION,
+] enum TestStandaloneEnumeration {
+    "enumValue1",
+    "enumValue2"
+};
 
-    [MayThrowException] IDBObjectStore objectStore(DOMString name);
-    [MayThrowException] void abort();
-
-    attribute EventHandler onabort;
-    attribute EventHandler oncomplete;
-    attribute EventHandler onerror;
-};

trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp

@@ -183 +183 @@
 }
 
-static RefPtr<IDBTransaction> transactionForDatabase(IDBDatabase* idbDatabase, const String& objectStoreName, const String& mode = IDBTransaction::modeReadOnly())
+static RefPtr<IDBTransaction> transactionForDatabase(IDBDatabase* idbDatabase, const String& objectStoreName, IDBTransactionMode mode = IDBTransactionMode::Readonly)
 {
     auto result = idbDatabase->transaction(objectStoreName, mode);
@@ -692 +692 @@
             return;
 
-        auto idbTransaction = transactionForDatabase(&database, m_objectStoreName, IDBTransaction::modeReadWrite());
+        auto idbTransaction = transactionForDatabase(&database, m_objectStoreName, IDBTransactionMode::Readwrite);
         if (!idbTransaction) {
             m_requestCallback->sendFailure("Could not get transaction");