Title: [99581] trunk
- Revision
- 99581
- Author
- h...@chromium.org
- Date
- 2011-11-08 09:51:06 -0800 (Tue, 08 Nov 2011)
Log Message
IndexedDB: Start using the onSuccessWithContinuation() callback
https://bugs.webkit.org/show_bug.cgi?id=71565
Reviewed by Tony Chang.
Source/WebCore:
This is a follow-up to r99169 where we start using this new
callback for cursors.
* storage/IDBCursorBackendImpl.cpp:
(WebCore::IDBCursorBackendImpl::continueFunctionInternal):
* storage/IDBRequest.cpp:
(WebCore::IDBRequest::setCursor):
LayoutTests:
The cursor-inconsistency.html test now passes completely.
* storage/indexeddb/cursor-inconsistency-expected.txt:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (99580 => 99581)
--- trunk/LayoutTests/ChangeLog 2011-11-08 17:49:37 UTC (rev 99580)
+++ trunk/LayoutTests/ChangeLog 2011-11-08 17:51:06 UTC (rev 99581)
@@ -1,3 +1,14 @@
+2011-11-08 Hans Wennborg <h...@chromium.org>
+
+ IndexedDB: Start using the onSuccessWithContinuation() callback
+ https://bugs.webkit.org/show_bug.cgi?id=71565
+
+ Reviewed by Tony Chang.
+
+ The cursor-inconsistency.html test now passes completely.
+
+ * storage/indexeddb/cursor-inconsistency-expected.txt:
+
2011-11-08 Justin Schuh <jsc...@chromium.org>
Document::loader should use documentLoader(), not activeDocumentLoader()
Modified: trunk/LayoutTests/storage/indexeddb/cursor-inconsistency-expected.txt (99580 => 99581)
--- trunk/LayoutTests/storage/indexeddb/cursor-inconsistency-expected.txt 2011-11-08 17:49:37 UTC (rev 99580)
+++ trunk/LayoutTests/storage/indexeddb/cursor-inconsistency-expected.txt 2011-11-08 17:51:06 UTC (rev 99581)
@@ -30,7 +30,7 @@
event.target.result.continue()
checkCursor()
-FAIL storedCursor === event.target.result should be true. Was false.
+PASS storedCursor === event.target.result is true
PASS storedCursor.key is "someKey2"
PASS event.target.result.key is "someKey2"
PASS storedCursor.value is "someValue2"
@@ -38,7 +38,7 @@
event.target.result.continue()
checkCursor()
-FAIL storedCursor === event.target.result should be true. Was false.
+PASS storedCursor === event.target.result is true
PASS storedCursor.key is "someKey3"
PASS event.target.result.key is "someKey3"
PASS storedCursor.value is "someValue3"
@@ -46,7 +46,7 @@
event.target.result.continue()
checkCursor()
-FAIL storedCursor === event.target.result should be true. Was false.
+PASS storedCursor === event.target.result is true
PASS storedCursor.key is "someKey4"
PASS event.target.result.key is "someKey4"
PASS storedCursor.value is "someValue4"
Modified: trunk/Source/WebCore/ChangeLog (99580 => 99581)
--- trunk/Source/WebCore/ChangeLog 2011-11-08 17:49:37 UTC (rev 99580)
+++ trunk/Source/WebCore/ChangeLog 2011-11-08 17:51:06 UTC (rev 99581)
@@ -1,3 +1,18 @@
+2011-11-08 Hans Wennborg <h...@chromium.org>
+
+ IndexedDB: Start using the onSuccessWithContinuation() callback
+ https://bugs.webkit.org/show_bug.cgi?id=71565
+
+ Reviewed by Tony Chang.
+
+ This is a follow-up to r99169 where we start using this new
+ callback for cursors.
+
+ * storage/IDBCursorBackendImpl.cpp:
+ (WebCore::IDBCursorBackendImpl::continueFunctionInternal):
+ * storage/IDBRequest.cpp:
+ (WebCore::IDBRequest::setCursor):
+
2011-11-08 Justin Schuh <jsc...@chromium.org>
Document::loader should use documentLoader(), not activeDocumentLoader()
Modified: trunk/Source/WebCore/storage/IDBCursorBackendImpl.cpp (99580 => 99581)
--- trunk/Source/WebCore/storage/IDBCursorBackendImpl.cpp 2011-11-08 17:49:37 UTC (rev 99580)
+++ trunk/Source/WebCore/storage/IDBCursorBackendImpl.cpp 2011-11-08 17:51:06 UTC (rev 99581)
@@ -110,7 +110,7 @@
return;
}
- callbacks->onSuccess(cursor.get()); // FIXME: After Chromium side is ready, this should be callbacks->onSuccessWithContinuation();
+ callbacks->onSuccessWithContinuation();
}
void IDBCursorBackendImpl::deleteFunction(PassRefPtr<IDBCallbacks> prpCallbacks, ExceptionCode& ec)
Modified: trunk/Source/WebCore/storage/IDBRequest.cpp (99580 => 99581)
--- trunk/Source/WebCore/storage/IDBRequest.cpp 2011-11-08 17:49:37 UTC (rev 99580)
+++ trunk/Source/WebCore/storage/IDBRequest.cpp 2011-11-08 17:51:06 UTC (rev 99581)
@@ -173,7 +173,7 @@
void IDBRequest::setCursor(PassRefPtr<IDBCursor> cursor)
{
- // FIXME: Assert !m_cursor when the new onSuccessCursorContinue() callback is used.
+ ASSERT(!m_cursor);
m_cursor = cursor;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
