From a94275402997c11dd2e778633dacf4b7e630a35d Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Fri, 22 Oct 2010 13:02:20 +0100 Subject: Merge WebKit at r70209: Initial merge by Git Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e --- WebKit/chromium/public/WebIDBObjectStore.h | 49 ++++++------------------------ 1 file changed, 10 insertions(+), 39 deletions(-) (limited to 'WebKit/chromium/public/WebIDBObjectStore.h') diff --git a/WebKit/chromium/public/WebIDBObjectStore.h b/WebKit/chromium/public/WebIDBObjectStore.h index 19efd48..f5f1473 100755 --- a/WebKit/chromium/public/WebIDBObjectStore.h +++ b/WebKit/chromium/public/WebIDBObjectStore.h @@ -27,6 +27,7 @@ #define WebIDBObjectStore_h #include "WebCommon.h" +#include "WebExceptionCode.h" #include "WebDOMStringList.h" #include "WebIDBCallbacks.h" #include "WebIDBTransaction.h" @@ -58,52 +59,22 @@ public: return WebDOMStringList(); } - // FIXME: Remove the default parameters for transactionIds. - virtual void get(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction&) + virtual void get(const WebIDBKey&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); } + virtual void put(const WebSerializedScriptValue&, const WebIDBKey&, bool addOnly, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); } + virtual void remove(const WebIDBKey&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); } + virtual WebIDBIndex* createIndex(const WebString& name, const WebString& keyPath, bool unique, const WebIDBTransaction&, WebExceptionCode&) { - get(key, callbacks); - } - virtual void get(const WebIDBKey& key, WebIDBCallbacks* callbacks) - { - WebIDBTransaction transaction; - get(key, callbacks, transaction); - } - virtual void put(const WebSerializedScriptValue& value, const WebIDBKey& key, bool addOnly, WebIDBCallbacks* callbacks, const WebIDBTransaction&) - { - put(value, key, addOnly, callbacks); - } - virtual void put(const WebSerializedScriptValue& value, const WebIDBKey& key, bool addOnly, WebIDBCallbacks* callbacks) - { - WebIDBTransaction transaction; - put(value, key, addOnly, callbacks, transaction); - } - virtual void remove(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction&) - { - remove(key, callbacks); - } - virtual void remove(const WebIDBKey& key, WebIDBCallbacks* callbacks) - { - WebIDBTransaction transaction; - remove(key, callbacks, transaction); + WEBKIT_ASSERT_NOT_REACHED(); + return 0; } - virtual void createIndex(const WebString& name, const WebString& keyPath, bool unique, WebIDBCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); } // Transfers ownership of the WebIDBIndex to the caller. - virtual WebIDBIndex* index(const WebString& name) + virtual WebIDBIndex* index(const WebString& name, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); return 0; } - virtual void removeIndex(const WebString& name, WebIDBCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); } - virtual void openCursor(const WebIDBKeyRange& range, unsigned short direction, WebIDBCallbacks* callbacks, const WebIDBTransaction&) - { - openCursor(range, direction, callbacks); - } - virtual void openCursor(const WebIDBKeyRange& range, unsigned short direction, WebIDBCallbacks* callbacks) - { - WebIDBTransaction transaction; - openCursor(range, direction, callbacks, transaction); - } - // FIXME: finish. + virtual void removeIndex(const WebString& name, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); } + virtual void openCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); } }; } // namespace WebKit -- cgit v1.1