From dd8bb3de4f353a81954234999f1fea748aee2ea9 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Wed, 11 Aug 2010 14:44:44 +0100
Subject: Merge WebKit at r65072 : Initial merge by git.

Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
---
 WebKit/chromium/src/IDBObjectStoreProxy.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'WebKit/chromium/src/IDBObjectStoreProxy.cpp')

diff --git a/WebKit/chromium/src/IDBObjectStoreProxy.cpp b/WebKit/chromium/src/IDBObjectStoreProxy.cpp
index 858ed20..ad27fa3 100755
--- a/WebKit/chromium/src/IDBObjectStoreProxy.cpp
+++ b/WebKit/chromium/src/IDBObjectStoreProxy.cpp
@@ -29,7 +29,9 @@
 #include "DOMStringList.h"
 #include "IDBCallbacks.h"
 #include "IDBIndexBackendProxy.h"
+#include "IDBKeyRange.h"
 #include "WebIDBCallbacksImpl.h"
+#include "WebIDBKeyRange.h"
 #include "WebIDBIndex.h"
 #include "WebIDBKey.h"
 #include "WebIDBObjectStore.h"
@@ -39,7 +41,7 @@
 
 namespace WebCore {
 
-PassRefPtr<IDBObjectStore> IDBObjectStoreProxy::create(PassOwnPtr<WebKit::WebIDBObjectStore> objectStore)
+PassRefPtr<IDBObjectStoreBackendInterface> IDBObjectStoreProxy::create(PassOwnPtr<WebKit::WebIDBObjectStore> objectStore)
 {
     return adoptRef(new IDBObjectStoreProxy(objectStore));
 }
@@ -101,6 +103,11 @@ void IDBObjectStoreProxy::removeIndex(const String& name, PassRefPtr<IDBCallback
     m_webIDBObjectStore->removeIndex(name, new WebIDBCallbacksImpl(callbacks));
 }
 
+void IDBObjectStoreProxy::openCursor(PassRefPtr<IDBKeyRange> range, unsigned short direction, PassRefPtr<IDBCallbacks> callbacks)
+{
+    m_webIDBObjectStore->openCursor(range, direction, new WebIDBCallbacksImpl(callbacks));
+}
+
 } // namespace WebCore
 
 #endif // ENABLE(INDEXED_DATABASE)
-- 
cgit v1.1