- Revision
- 125084
- Author
- commit-qu...@webkit.org
- Date
- 2012-08-08 14:04:36 -0700 (Wed, 08 Aug 2012)
Log Message
IndexedDB: new enums and openCursor stub
https://bugs.webkit.org/show_bug.cgi?id=93410
Patch by Alec Flett <alecfl...@chromium.org> on 2012-08-08
Reviewed by Adam Barth.
Source/WebCore:
Introduce a new TaskType enum that will be used to prioritize
internal tasks. This is preliminary staging for
https://bugs.webkit.org/show_bug.cgi?id=91125.
No new tests, coming in bug 91125.
* Modules/indexeddb/IDBTransactionBackendInterface.h:
Source/WebKit/chromium:
This stubs out the TaskType and Direction enums that will be
required to land the chromium side of
https://bugs.webkit.org/show_bug.cgi?id=91125.
* public/WebIDBCursor.h:
* public/WebIDBObjectStore.h:
(WebKit::WebIDBObjectStore::setIndexKeys):
(WebKit::WebIDBObjectStore::setIndexesReady):
(WebIDBObjectStore):
(WebKit::WebIDBObjectStore::openCursor):
* public/WebIDBTransaction.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (125083 => 125084)
--- trunk/Source/WebCore/ChangeLog 2012-08-08 21:02:15 UTC (rev 125083)
+++ trunk/Source/WebCore/ChangeLog 2012-08-08 21:04:36 UTC (rev 125084)
@@ -1,3 +1,18 @@
+2012-08-08 Alec Flett <alecfl...@chromium.org>
+
+ IndexedDB: new enums and openCursor stub
+ https://bugs.webkit.org/show_bug.cgi?id=93410
+
+ Reviewed by Adam Barth.
+
+ Introduce a new TaskType enum that will be used to prioritize
+ internal tasks. This is preliminary staging for
+ https://bugs.webkit.org/show_bug.cgi?id=91125.
+
+ No new tests, coming in bug 91125.
+
+ * Modules/indexeddb/IDBTransactionBackendInterface.h:
+
2012-08-08 Pavel Feldman <pfeld...@chromium.org>
REGRESSION(r125046): Breaks debug build (assertion in protocol type checks) (Requested by pfeldman on #webkit).
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendInterface.h (125083 => 125084)
--- trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendInterface.h 2012-08-08 21:02:15 UTC (rev 125083)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendInterface.h 2012-08-08 21:04:36 UTC (rev 125084)
@@ -49,6 +49,11 @@
public:
virtual ~IDBTransactionBackendInterface() { }
+ enum TaskType {
+ NormalTask = 0,
+ PreemptiveTask
+ };
+
virtual PassRefPtr<IDBObjectStoreBackendInterface> objectStore(const String& name, ExceptionCode&) = 0;
virtual void didCompleteTaskEvents() = 0;
virtual void commit() = 0;
Modified: trunk/Source/WebKit/chromium/ChangeLog (125083 => 125084)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-08-08 21:02:15 UTC (rev 125083)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-08-08 21:04:36 UTC (rev 125084)
@@ -1,3 +1,22 @@
+2012-08-08 Alec Flett <alecfl...@chromium.org>
+
+ IndexedDB: new enums and openCursor stub
+ https://bugs.webkit.org/show_bug.cgi?id=93410
+
+ Reviewed by Adam Barth.
+
+ This stubs out the TaskType and Direction enums that will be
+ required to land the chromium side of
+ https://bugs.webkit.org/show_bug.cgi?id=91125.
+
+ * public/WebIDBCursor.h:
+ * public/WebIDBObjectStore.h:
+ (WebKit::WebIDBObjectStore::setIndexKeys):
+ (WebKit::WebIDBObjectStore::setIndexesReady):
+ (WebIDBObjectStore):
+ (WebKit::WebIDBObjectStore::openCursor):
+ * public/WebIDBTransaction.h:
+
2012-08-08 Dana Jansens <dan...@chromium.org>
[chromium] Enable occlusion tracker in the occlusion tests for surface cacheing
Modified: trunk/Source/WebKit/chromium/public/WebIDBCursor.h (125083 => 125084)
--- trunk/Source/WebKit/chromium/public/WebIDBCursor.h 2012-08-08 21:02:15 UTC (rev 125083)
+++ trunk/Source/WebKit/chromium/public/WebIDBCursor.h 2012-08-08 21:04:36 UTC (rev 125084)
@@ -40,6 +40,13 @@
public:
virtual ~WebIDBCursor() { }
+ enum Direction {
+ Next = 0,
+ NextNoDuplicate = 1,
+ Prev = 2,
+ PrevNoDuplicate = 3,
+ };
+
virtual WebIDBKey key() const
{
WEBKIT_ASSERT_NOT_REACHED();
Modified: trunk/Source/WebKit/chromium/public/WebIDBObjectStore.h (125083 => 125084)
--- trunk/Source/WebKit/chromium/public/WebIDBObjectStore.h 2012-08-08 21:02:15 UTC (rev 125083)
+++ trunk/Source/WebKit/chromium/public/WebIDBObjectStore.h 2012-08-08 21:04:36 UTC (rev 125084)
@@ -26,10 +26,12 @@
#ifndef WebIDBObjectStore_h
#define WebIDBObjectStore_h
+#include "WebDOMStringList.h"
#include "WebExceptionCode.h"
-#include "WebDOMStringList.h"
#include "WebIDBCallbacks.h"
+#include "WebIDBCursor.h"
#include "WebIDBKeyPath.h"
+#include "WebIDBTransaction.h"
#include "platform/WebCommon.h"
#include "platform/WebString.h"
@@ -61,6 +63,8 @@
WEBKIT_ASSERT_NOT_REACHED();
return 0;
}
+ virtual void setIndexKeys(const WebIDBKey&, const WebVector<WebString>&, const WebVector<WebIndexKeys>&, const WebIDBTransaction&) { WEBKIT_ASSERT_NOT_REACHED(); }
+ virtual void setIndexesReady(const WebVector<WebString>&, const WebIDBTransaction&) { WEBKIT_ASSERT_NOT_REACHED(); };
// Transfers ownership of the WebIDBIndex to the caller.
virtual WebIDBIndex* index(const WebString& name, WebExceptionCode&)
{
@@ -68,7 +72,9 @@
return 0;
}
virtual void deleteIndex(const WebString& name, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
+ // FIXME: Remove this version of openCursor when TaskType is plumbed through chromium.
virtual void openCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
+ virtual void openCursor(const WebIDBKeyRange&, WebIDBCursor::Direction direction, WebIDBCallbacks*, WebIDBTransaction::TaskType, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
virtual void count(const WebIDBKeyRange&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
protected:
Modified: trunk/Source/WebKit/chromium/public/WebIDBTransaction.h (125083 => 125084)
--- trunk/Source/WebKit/chromium/public/WebIDBTransaction.h 2012-08-08 21:02:15 UTC (rev 125083)
+++ trunk/Source/WebKit/chromium/public/WebIDBTransaction.h 2012-08-08 21:04:36 UTC (rev 125084)
@@ -41,6 +41,11 @@
public:
virtual ~WebIDBTransaction() { }
+ enum TaskType {
+ NormalTask = 0,
+ PreemptiveTask
+ };
+
virtual WebIDBObjectStore* objectStore(const WebString& name, WebExceptionCode&)
{
WEBKIT_ASSERT_NOT_REACHED();
