diff options
Diffstat (limited to 'WebKit/chromium/public/WebIDBCursor.h')
| -rw-r--r-- | WebKit/chromium/public/WebIDBCursor.h | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/WebKit/chromium/public/WebIDBCursor.h b/WebKit/chromium/public/WebIDBCursor.h index 27eb924..f47a44c 100644 --- a/WebKit/chromium/public/WebIDBCursor.h +++ b/WebKit/chromium/public/WebIDBCursor.h @@ -44,33 +44,30 @@ public: WEBKIT_ASSERT_NOT_REACHED(); return 0; } - virtual WebIDBKey key() const { WEBKIT_ASSERT_NOT_REACHED(); - return WebIDBKey(""); + return WebIDBKey::createInvalid(); } - + // FIXME: Remove the legacy version of value() (the first version) as soon as a WebKit roll happens. virtual WebSerializedScriptValue value() const { - WEBKIT_ASSERT_NOT_REACHED(); - return WebSerializedScriptValue(); - } - - virtual void update(const WebSerializedScriptValue&, WebIDBCallbacks*) - { - WEBKIT_ASSERT_NOT_REACHED(); + WebSerializedScriptValue serializedScriptValue; + WebIDBKey idbKey; + value(serializedScriptValue, idbKey); + WEBKIT_ASSERT(!serializedScriptValue.isNull()); + WEBKIT_ASSERT(idbKey.type() == WebIDBKey::InvalidType); + return serializedScriptValue; } - - virtual void continueFunction(const WebIDBKey&, WebIDBCallbacks*) + // One or the other will set, depending on what type of cursor this is. + virtual void value(WebSerializedScriptValue& serializedScriptValue, WebIDBKey& idbKey) const { - WEBKIT_ASSERT_NOT_REACHED(); + serializedScriptValue = value(); } - virtual void remove(WebIDBCallbacks*) - { - WEBKIT_ASSERT_NOT_REACHED(); - } + virtual void update(const WebSerializedScriptValue&, WebIDBCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); } + virtual void continueFunction(const WebIDBKey&, WebIDBCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); } + virtual void remove(WebIDBCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); } }; } // namespace WebKit |