Changeset 192825 in webkit

Timestamp:

Nov 30, 2015 1:51:06 PM (8 years ago)

Author:

beidson@apple.com

Message:

Modern IDB: Correct handling of cursors finishing iteration.
​https://bugs.webkit.org/show_bug.cgi?id=151664

Reviewed by Andy Estes.

Source/WebCore:

No new tests (At least one previously failing test now passes).

• Modules/indexeddb/client/IDBCursorImpl.cpp:

(WebCore::IDBClient::IDBCursor::setGetResult):

• Modules/indexeddb/client/IDBObjectStoreImpl.cpp:

(WebCore::IDBClient::IDBObjectStore::putOrAdd):

LayoutTests:

• platform/mac-wk1/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-wk1/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/client/IDBCursorImpl.cpp (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/client/IDBObjectStoreImpl.cpp (modified) (8 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-11-30  Brady Eidson  <beidson@apple.com>
+
+        Modern IDB: Correct handling of cursors finishing iteration.
+        https://bugs.webkit.org/show_bug.cgi?id=151664
+
+        Reviewed by Andy Estes.
+
+        * platform/mac-wk1/TestExpectations:
+
 2015-11-30  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/LayoutTests/platform/mac-wk1/TestExpectations

@@ -73 +73 @@
 # But Modern IndexedDB is.
 storage/indexeddb/aborted-versionchange-closes.html [ Pass ]
+storage/indexeddb/cursor-finished.html [ Pass ]
 storage/indexeddb/modern [ Pass ]
 storage/indexeddb/mozilla/add-twice-failure.html [ Pass ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-11-30  Brady Eidson  <beidson@apple.com>
+
+        Modern IDB: Correct handling of cursors finishing iteration.
+        https://bugs.webkit.org/show_bug.cgi?id=151664
+
+        Reviewed by Andy Estes.
+
+        No new tests (At least one previously failing test now passes).
+
+        * Modules/indexeddb/client/IDBCursorImpl.cpp:
+        (WebCore::IDBClient::IDBCursor::setGetResult):
+        
+        * Modules/indexeddb/client/IDBObjectStoreImpl.cpp:
+        (WebCore::IDBClient::IDBObjectStore::putOrAdd):
+
 2015-11-30  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/Modules/indexeddb/client/IDBCursorImpl.cpp

@@ -289 +289 @@
         return;
 
+    if (!getResult.isDefined()) {
+        m_deprecatedCurrentKey = { };
+        m_deprecatedCurrentPrimaryKey = { };
+        m_currentPrimaryKeyData = { };
+        m_deprecatedCurrentValue = { };
+
+        m_gotValue = false;
+        return;
+    }
+
     m_deprecatedCurrentKey = idbKeyDataToScriptValue(context, getResult.keyData());
     m_deprecatedCurrentPrimaryKey = idbKeyDataToScriptValue(context, getResult.primaryKeyData());

trunk/Source/WebCore/Modules/indexeddb/client/IDBObjectStoreImpl.cpp

@@ -234 +234 @@
 
     if (m_transaction->isReadOnly()) {
-        ec = static_cast<ExceptionCode>(IDBExceptionCode::ReadOnlyError);
-        return nullptr;
-    }
-
-    if (!m_transaction->isActive()) {
-        ec = static_cast<ExceptionCode>(IDBExceptionCode::TransactionInactiveError);
-        return nullptr;
-    }
-
-    if (m_deleted) {
-        ec = INVALID_STATE_ERR;
+        ec = IDBDatabaseException::ReadOnlyError;
+        return nullptr;
+    }
+
+    if (!m_transaction->isActive()) {
+        ec = IDBDatabaseException::TransactionInactiveError;
+        return nullptr;
+    }
+
+    if (m_deleted) {
+        ec = IDBDatabaseException::InvalidStateError;
         return nullptr;
     }
@@ -250 +250 @@
     RefPtr<SerializedScriptValue> serializedValue = SerializedScriptValue::create(&state, value, nullptr, nullptr);
     if (state.hadException()) {
-        ec = DATA_CLONE_ERR;
+        ec = IDBDatabaseException::DataCloneError;
         return nullptr;
     }
@@ -256 +256 @@
     if (serializedValue->hasBlobURLs()) {
         // FIXME: Add Blob/File/FileList support
-        ec = DATA_CLONE_ERR;
+        ec = IDBDatabaseException::DataCloneError;
         return nullptr;
     }
 
     if (key && key->type() == KeyType::Invalid) {
-        ec = static_cast<ExceptionCode>(IDBExceptionCode::DataError);
+        ec = IDBDatabaseException::DataError;
         return nullptr;
     }
@@ -269 +269 @@
     if (usesInlineKeys && inlineKeyCheck == InlineKeyCheck::Perform) {
         if (key) {
-            ec = static_cast<ExceptionCode>(IDBExceptionCode::DataError);
+            ec = IDBDatabaseException::DataError;
             return nullptr;
         }
@@ -275 +275 @@
         RefPtr<IDBKey> keyPathKey = maybeCreateIDBKeyFromScriptValueAndKeyPath(state, value, m_info.keyPath());
         if (keyPathKey && !keyPathKey->isValid()) {
-            ec = static_cast<ExceptionCode>(IDBExceptionCode::DataError);
+            ec = IDBDatabaseException::DataError;
             return nullptr;
         }
@@ -282 +282 @@
             if (usesKeyGenerator) {
                 if (!canInjectIDBKeyIntoScriptValue(state, value, m_info.keyPath())) {
-                    ec = static_cast<ExceptionCode>(IDBExceptionCode::DataError);
+                    ec = IDBDatabaseException::DataError;
                     return nullptr;
                 }
             } else {
-                ec = static_cast<ExceptionCode>(IDBExceptionCode::DataError);
+                ec = IDBDatabaseException::DataError;
                 return nullptr;
             }
@@ -296 +296 @@
         }
     } else if (!usesKeyGenerator && !key) {
-        ec = static_cast<ExceptionCode>(IDBExceptionCode::DataError);
+        ec = IDBDatabaseException::DataError;
         return nullptr;
     }
@@ -302 +302 @@
     auto context = scriptExecutionContextFromExecState(&state);
     if (!context) {
-        ec = static_cast<ExceptionCode>(IDBExceptionCode::Unknown);
+        ec = IDBDatabaseException::UnknownError;
         return nullptr;
     }