[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
jorlow at chromium.org
jorlow at chromium.org
Wed Dec 22 14:30:13 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 3454c03459ad209927a1db0e9bc7f8122520f739
Author: jorlow at chromium.org <jorlow at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 12 00:19:25 2010 +0000
2010-10-11 Jeremy Orlow <jorlow at chromium.org>
Reviewed by Nate Chapin.
[Chromium] Add plumbing for synchronous indexedDB exceptions
https://bugs.webkit.org/show_bug.cgi?id=47511
Add a WebExceptionCode file (already run by fishd) and add versions of
each applicable method that take such a parameter. A follow up patch
will be posted with the meat.
* WebKit.gyp:
* public/WebExceptionCode.h: Added.
* public/WebIDBCursor.h:
(WebKit::WebIDBCursor::update):
(WebKit::WebIDBCursor::continueFunction):
(WebKit::WebIDBCursor::remove):
* public/WebIDBDatabase.h:
(WebKit::WebIDBDatabase::objectStore):
(WebKit::WebIDBDatabase::createObjectStore):
(WebKit::WebIDBDatabase::removeObjectStore):
(WebKit::WebIDBDatabase::setVersion):
(WebKit::WebIDBDatabase::transaction):
* public/WebIDBIndex.h:
(WebKit::WebIDBIndex::openObjectCursor):
(WebKit::WebIDBIndex::openKeyCursor):
(WebKit::WebIDBIndex::getObject):
(WebKit::WebIDBIndex::getKey):
* public/WebIDBObjectStore.h:
(WebKit::WebIDBObjectStore::get):
(WebKit::WebIDBObjectStore::put):
(WebKit::WebIDBObjectStore::remove):
(WebKit::WebIDBObjectStore::createIndex):
(WebKit::WebIDBObjectStore::index):
(WebKit::WebIDBObjectStore::removeIndex):
(WebKit::WebIDBObjectStore::openCursor):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69541 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index b07fbb8..84c4cca 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,40 @@
+2010-10-11 Jeremy Orlow <jorlow at chromium.org>
+
+ Reviewed by Nate Chapin.
+
+ [Chromium] Add plumbing for synchronous indexedDB exceptions
+ https://bugs.webkit.org/show_bug.cgi?id=47511
+
+ Add a WebExceptionCode file (already run by fishd) and add versions of
+ each applicable method that take such a parameter. A follow up patch
+ will be posted with the meat.
+
+ * WebKit.gyp:
+ * public/WebExceptionCode.h: Added.
+ * public/WebIDBCursor.h:
+ (WebKit::WebIDBCursor::update):
+ (WebKit::WebIDBCursor::continueFunction):
+ (WebKit::WebIDBCursor::remove):
+ * public/WebIDBDatabase.h:
+ (WebKit::WebIDBDatabase::objectStore):
+ (WebKit::WebIDBDatabase::createObjectStore):
+ (WebKit::WebIDBDatabase::removeObjectStore):
+ (WebKit::WebIDBDatabase::setVersion):
+ (WebKit::WebIDBDatabase::transaction):
+ * public/WebIDBIndex.h:
+ (WebKit::WebIDBIndex::openObjectCursor):
+ (WebKit::WebIDBIndex::openKeyCursor):
+ (WebKit::WebIDBIndex::getObject):
+ (WebKit::WebIDBIndex::getKey):
+ * public/WebIDBObjectStore.h:
+ (WebKit::WebIDBObjectStore::get):
+ (WebKit::WebIDBObjectStore::put):
+ (WebKit::WebIDBObjectStore::remove):
+ (WebKit::WebIDBObjectStore::createIndex):
+ (WebKit::WebIDBObjectStore::index):
+ (WebKit::WebIDBObjectStore::removeIndex):
+ (WebKit::WebIDBObjectStore::openCursor):
+
2010-10-11 Andrei Popescu <andreip at google.com>
Reviewed by Jeremy Orlow.
diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp
index 3fae7e1..e13b83b 100644
--- a/WebKit/chromium/WebKit.gyp
+++ b/WebKit/chromium/WebKit.gyp
@@ -150,6 +150,7 @@
'public/WebDragData.h',
'public/WebEditingAction.h',
'public/WebElement.h',
+ 'public/WebExceptionCode.h',
'public/WebFileChooserCompletion.h',
'public/WebFileChooserParams.h',
'public/WebFileError.h',
diff --git a/WebKit/chromium/public/WebExceptionCode.h b/WebKit/chromium/public/WebExceptionCode.h
new file mode 100644
index 0000000..61d53d9
--- /dev/null
+++ b/WebKit/chromium/public/WebExceptionCode.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2010 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebExceptionCode_h
+#define WebExceptionCode_h
+
+namespace WebKit {
+
+// This should match how ExceptionCode is defined in WebCore.
+typedef int WebExceptionCode;
+
+} // namespace WebKit
+
+#endif
diff --git a/WebKit/chromium/public/WebIDBCursor.h b/WebKit/chromium/public/WebIDBCursor.h
index 05bd51a..a17365b 100644
--- a/WebKit/chromium/public/WebIDBCursor.h
+++ b/WebKit/chromium/public/WebIDBCursor.h
@@ -27,6 +27,7 @@
#define WebIDBCursor_h
#include "WebCommon.h"
+#include "WebExceptionCode.h"
#include "WebIDBCallbacks.h"
#include "WebIDBKey.h"
#include "WebSerializedScriptValue.h"
@@ -52,9 +53,40 @@ public:
// 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(); }
- 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(); }
+ // FIXME: Remove.
+ virtual void update(const WebSerializedScriptValue& value, WebIDBCallbacks* callbacks, WebExceptionCode&)
+ {
+ update(value, callbacks);
+ }
+ virtual void update(const WebSerializedScriptValue& value, WebIDBCallbacks* callbacks)
+ {
+ WebExceptionCode ec = 0;
+ update(value, callbacks, ec);
+ }
+ virtual void continueFunction(const WebIDBKey& key, WebIDBCallbacks* callbacks, WebExceptionCode&)
+ {
+ continueFunction(key, callbacks);
+ }
+ virtual void continueFunction(const WebIDBKey& key, WebIDBCallbacks* callbacks)
+ {
+ WebExceptionCode ec = 0;
+ continueFunction(key, callbacks, ec);
+ }
+ virtual void remove(WebIDBCallbacks* callbacks, WebExceptionCode&)
+ {
+ remove(callbacks);
+ }
+ virtual void remove(WebIDBCallbacks* callbacks)
+ {
+ WebExceptionCode ec = 0;
+ remove(callbacks, ec);
+ }
+
+ /*
+ virtual void update(const WebSerializedScriptValue&, WebIDBCallbacks*, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
+ virtual void continueFunction(const WebIDBKey&, WebIDBCallbacks*, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
+ virtual void remove(WebIDBCallbacks*, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
+ */
};
} // namespace WebKit
diff --git a/WebKit/chromium/public/WebIDBDatabase.h b/WebKit/chromium/public/WebIDBDatabase.h
index fe07ac8..4e92bdb 100644
--- a/WebKit/chromium/public/WebIDBDatabase.h
+++ b/WebKit/chromium/public/WebIDBDatabase.h
@@ -28,6 +28,7 @@
#include "WebCommon.h"
#include "WebDOMStringList.h"
+#include "WebExceptionCode.h"
namespace WebKit {
@@ -62,29 +63,63 @@ public:
return WebDOMStringList();
}
- // FIXME: Remove once we update Chromium side.
- virtual void createObjectStore(const WebString& name, const WebString& keyPath, bool autoIncrement, WebIDBCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
- virtual WebIDBObjectStore* createObjectStore(const WebString& name, const WebString& keyPath, bool autoIncrement, const WebIDBTransaction&)
- {
+ // FIXME: Remove after next roll.
+ virtual WebIDBObjectStore* objectStore(const WebString& name, unsigned short mode)
+ {
WEBKIT_ASSERT_NOT_REACHED();
return 0;
}
- // Transfers ownership of the WebIDBObjectStore to the caller.
- virtual WebIDBObjectStore* objectStore(const WebString& name, unsigned short mode)
+ virtual WebIDBObjectStore* createObjectStore(const WebString& name, const WebString& keyPath, bool autoIncrement, const WebIDBTransaction& transaction, WebExceptionCode&)
+ {
+ return createObjectStore(name, keyPath, autoIncrement, transaction);
+ }
+ virtual WebIDBObjectStore* createObjectStore(const WebString& name, const WebString& keyPath, bool autoIncrement, const WebIDBTransaction& transaction)
+ {
+ WebExceptionCode ec = 0;
+ return createObjectStore(name, keyPath, autoIncrement, transaction, ec);
+ }
+ virtual void removeObjectStore(const WebString& name, const WebIDBTransaction& transaction, WebExceptionCode&)
+ {
+ removeObjectStore(name, transaction);
+ }
+ virtual void removeObjectStore(const WebString& name, const WebIDBTransaction& transaction)
+ {
+ WebExceptionCode ec = 0;
+ removeObjectStore(name, transaction, ec);
+ }
+ virtual void setVersion(const WebString& version, WebIDBCallbacks* callbacks, WebExceptionCode&)
{
+ setVersion(version, callbacks);
+ }
+ virtual void setVersion(const WebString& version, WebIDBCallbacks* callbacks)
+ {
+ WebExceptionCode ec = 0;
+ setVersion(version, callbacks, ec);
+ }
+ virtual WebIDBTransaction* transaction(const WebDOMStringList& names, unsigned short mode, unsigned long timeout, WebExceptionCode&)
+ {
+ return transaction(names, mode, timeout);
+ }
+ virtual WebIDBTransaction* transaction(const WebDOMStringList& names, unsigned short mode, unsigned long timeout)
+ {
+ WebExceptionCode ec = 0;
+ return transaction(names, mode, timeout, ec);
+ }
+/*
+ virtual WebIDBObjectStore* createObjectStore(const WebString& name, const WebString& keyPath, bool autoIncrement, const WebIDBTransaction&, WebExceptionCode&)
+ {
WEBKIT_ASSERT_NOT_REACHED();
return 0;
}
- // FIXME: Remove after WebKit roll.
- virtual void removeObjectStore(const WebString& name, WebIDBCallbacks* callbacks) { WEBKIT_ASSERT_NOT_REACHED(); }
- virtual void removeObjectStore(const WebString& name, const WebIDBTransaction&) { WEBKIT_ASSERT_NOT_REACHED(); }
- virtual void setVersion(const WebString& version, WebIDBCallbacks* callbacks) { WEBKIT_ASSERT_NOT_REACHED(); }
+ virtual void removeObjectStore(const WebString& name, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
+ virtual void setVersion(const WebString& version, WebIDBCallbacks* callbacks, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
// Transfers ownership of the WebIDBTransaction to the caller.
- virtual WebIDBTransaction* transaction(const WebDOMStringList& names, unsigned short mode, unsigned long timeout)
+ virtual WebIDBTransaction* transaction(const WebDOMStringList& names, unsigned short mode, unsigned long timeout, WebExceptionCode&)
{
WEBKIT_ASSERT_NOT_REACHED();
return 0;
}
+*/
virtual void close() { WEBKIT_ASSERT_NOT_REACHED(); }
};
diff --git a/WebKit/chromium/public/WebIDBIndex.h b/WebKit/chromium/public/WebIDBIndex.h
index 0d1541c..7c77878 100644
--- a/WebKit/chromium/public/WebIDBIndex.h
+++ b/WebKit/chromium/public/WebIDBIndex.h
@@ -26,6 +26,7 @@
#ifndef WebIDBIndex_h
#define WebIDBIndex_h
+#include "WebExceptionCode.h"
#include "WebIDBTransaction.h"
#include "WebString.h"
@@ -61,25 +62,49 @@ public:
return false;
}
- // FIXME: openObjectCursor -> openCursor and getObject -> get.
- virtual void openObjectCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*, const WebIDBTransaction&) { WEBKIT_ASSERT_NOT_REACHED(); }
- virtual void openCursor(const WebIDBKeyRange& range, unsigned short direction, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
+ virtual void openObjectCursor(const WebIDBKeyRange& range, unsigned short direction, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode&)
{
- openKeyCursor(range, direction, callbacks, transaction);
+ WebExceptionCode ec = 0;
+ openObjectCursor(range, direction, callbacks, transaction, ec);
+ }
+ virtual void openObjectCursor(const WebIDBKeyRange& range, unsigned short direction, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
+ {
+ openObjectCursor(range, direction, callbacks, transaction);
+ }
+ virtual void openKeyCursor(const WebIDBKeyRange& range, unsigned short direction, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode&)
+ {
+ WebExceptionCode ec = 0;
+ openKeyCursor(range, direction, callbacks, transaction, ec);
}
virtual void openKeyCursor(const WebIDBKeyRange& range, unsigned short direction, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
{
- openCursor(range, direction, callbacks, transaction);
+ openKeyCursor(range, direction, callbacks, transaction);
}
- virtual void getObject(const WebIDBKey&, WebIDBCallbacks*, const WebIDBTransaction&) { WEBKIT_ASSERT_NOT_REACHED(); }
- virtual void get(const WebIDBKey& range, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
+ virtual void getObject(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode&)
{
- getKey(range, callbacks, transaction);
+ WebExceptionCode ec = 0;
+ getObject(key, callbacks, transaction, ec);
}
- virtual void getKey(const WebIDBKey& range, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
+ virtual void getObject(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
{
- get(range, callbacks, transaction);
+ getObject(key, callbacks, transaction);
}
+ virtual void getKey(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode&)
+ {
+ WebExceptionCode ec = 0;
+ getKey(key, callbacks, transaction, ec);
+ }
+ virtual void getKey(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
+ {
+ getKey(key, callbacks, transaction);
+ }
+
+ /*
+ virtual void openObjectCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
+ virtual void openKeyCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
+ virtual void getObject(const WebIDBKey&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
+ virtual void getKey(const WebIDBKey&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
+ */
};
} // namespace WebKit
diff --git a/WebKit/chromium/public/WebIDBObjectStore.h b/WebKit/chromium/public/WebIDBObjectStore.h
index 24a432e..9933b21 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,27 +59,89 @@ public:
return WebDOMStringList();
}
- virtual void get(const WebIDBKey&, WebIDBCallbacks*, const WebIDBTransaction&) { WEBKIT_ASSERT_NOT_REACHED(); }
- virtual void put(const WebSerializedScriptValue&, const WebIDBKey&, bool addOnly, WebIDBCallbacks*, const WebIDBTransaction&) { WEBKIT_ASSERT_NOT_REACHED(); }
- virtual void remove(const WebIDBKey&, WebIDBCallbacks*, const WebIDBTransaction&) { WEBKIT_ASSERT_NOT_REACHED(); }
- // FIXME: Remove once we update Chromium side.
- virtual void createIndex(const WebString& name, const WebString& keyPath, bool unique, WebIDBCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
- virtual WebIDBIndex* createIndex(const WebString& name, const WebString& keyPath, bool unique, const WebIDBTransaction&)
+ // FIXME: Remove.
+ virtual void get(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode&)
+ {
+ get(key, callbacks, transaction);
+ }
+ virtual void get(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
+ {
+ WebExceptionCode ec = 0;
+ get(key, callbacks, transaction, ec);
+ }
+ virtual void put(const WebSerializedScriptValue& value, const WebIDBKey& key, bool addOnly, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode&)
+ {
+ put(value, key, addOnly, callbacks, transaction);
+ }
+ virtual void put(const WebSerializedScriptValue& value, const WebIDBKey& key, bool addOnly, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
+ {
+ WebExceptionCode ec = 0;
+ put(value, key, addOnly, callbacks, transaction, ec);
+ }
+ virtual void remove(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode&)
+ {
+ remove(key, callbacks, transaction);
+ }
+ virtual void remove(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
+ {
+ WebExceptionCode ec = 0;
+ remove(key, callbacks, transaction, ec);
+ }
+ virtual WebIDBIndex* createIndex(const WebString& name, const WebString& keyPath, bool unique, const WebIDBTransaction& transaction, WebExceptionCode&)
+ {
+ return createIndex(name, keyPath, unique, transaction);
+ }
+ virtual WebIDBIndex* createIndex(const WebString& name, const WebString& keyPath, bool unique, const WebIDBTransaction& transaction)
+ {
+ WebExceptionCode ec = 0;
+ return createIndex(name, keyPath, unique, transaction, ec);
+ }
+ virtual WebIDBIndex* index(const WebString& name, WebExceptionCode&)
+ {
+ return index(name);
+ }
+ virtual WebIDBIndex* index(const WebString& name)
+ {
+ WebExceptionCode ec = 0;
+ return index(name, ec);
+ }
+ virtual void removeIndex(const WebString& name, const WebIDBTransaction& transaction, WebExceptionCode&)
+ {
+ removeIndex(name, transaction);
+ }
+ virtual void removeIndex(const WebString& name, const WebIDBTransaction& transaction)
+ {
+ WebExceptionCode ec = 0;
+ removeIndex(name, transaction, ec);
+ }
+ virtual void openCursor(const WebIDBKeyRange& range, unsigned short direction, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode&)
+ {
+ openCursor(range, direction, callbacks, transaction);
+ }
+ virtual void openCursor(const WebIDBKeyRange& range, unsigned short direction, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
+ {
+ WebExceptionCode ec = 0;
+ openCursor(range, direction, callbacks, transaction, ec);
+ }
+
+ /*
+ 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&)
{
WEBKIT_ASSERT_NOT_REACHED();
return 0;
}
// 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;
}
- // FIXME: Remove once we update Chromium side.
- virtual void removeIndex(const WebString& name, WebIDBCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
- virtual void removeIndex(const WebString& name, const WebIDBTransaction&) { WEBKIT_ASSERT_NOT_REACHED(); }
- virtual void openCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*, const WebIDBTransaction&) { WEBKIT_ASSERT_NOT_REACHED(); }
- // 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
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list