Modified: trunk/Source/WebKit/chromium/ChangeLog (125210 => 125211)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-08-09 21:59:19 UTC (rev 125210)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-08-09 22:10:29 UTC (rev 125211)
@@ -1,3 +1,18 @@
+2012-08-09 Alec Flett <[email protected]>
+
+ IndexedDB: additional chromium signature for openCursor
+ https://bugs.webkit.org/show_bug.cgi?id=93637
+
+ Reviewed by Adam Barth.
+
+ Stub out the TaskType-based openCursor in the chromium API.
+
+ * src/WebIDBObjectStoreImpl.cpp:
+ (WebKit::WebIDBObjectStoreImpl::openCursor):
+ * src/WebIDBObjectStoreImpl.h:
+ (WebKit::WebIDBObjectStoreImpl::openCursor):
+ (WebIDBObjectStoreImpl):
+
2012-08-09 Dana Jansens <[email protected]>
[chromium] Do partial-swap scissoring on quads during draw instead of on layers
Modified: trunk/Source/WebKit/chromium/src/WebIDBObjectStoreImpl.cpp (125210 => 125211)
--- trunk/Source/WebKit/chromium/src/WebIDBObjectStoreImpl.cpp 2012-08-09 21:59:19 UTC (rev 125210)
+++ trunk/Source/WebKit/chromium/src/WebIDBObjectStoreImpl.cpp 2012-08-09 22:10:29 UTC (rev 125211)
@@ -106,8 +106,9 @@
m_objectStore->deleteIndex(name, transaction.getIDBTransactionBackendInterface(), ec);
}
-void WebIDBObjectStoreImpl::openCursor(const WebIDBKeyRange& keyRange, unsigned short direction, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode& ec)
+void WebIDBObjectStoreImpl::openCursor(const WebIDBKeyRange& keyRange, WebIDBCursor::Direction direction, WebIDBCallbacks* callbacks, WebIDBTransaction::TaskType, const WebIDBTransaction& transaction, WebExceptionCode& ec)
{
+ // FIXME: Pass along TaskType when the API becomes available.
m_objectStore->openCursor(keyRange, direction, IDBCallbacksProxy::create(adoptPtr(callbacks)), transaction.getIDBTransactionBackendInterface(), ec);
}
Modified: trunk/Source/WebKit/chromium/src/WebIDBObjectStoreImpl.h (125210 => 125211)
--- trunk/Source/WebKit/chromium/src/WebIDBObjectStoreImpl.h 2012-08-09 21:59:19 UTC (rev 125210)
+++ trunk/Source/WebKit/chromium/src/WebIDBObjectStoreImpl.h 2012-08-09 22:10:29 UTC (rev 125211)
@@ -54,7 +54,11 @@
WebIDBIndex* index(const WebString& name, WebExceptionCode&);
void deleteIndex(const WebString& name, const WebIDBTransaction&, WebExceptionCode&);
- void openCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&);
+ void openCursor(const WebIDBKeyRange& range, unsigned short direction, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode& ec)
+ {
+ openCursor(range, static_cast<WebIDBCursor::Direction>(direction), callbacks, WebIDBTransaction::NormalTask, transaction, ec);
+ }
+ void openCursor(const WebIDBKeyRange&, WebIDBCursor::Direction, WebIDBCallbacks*, WebIDBTransaction::TaskType, const WebIDBTransaction&, WebExceptionCode&);
void count(const WebIDBKeyRange&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&);
private:
