[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 13:39:14 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit bae11fc68aec7f175c83db7a56ce4fb87cd7f30e
Author: jorlow at chromium.org <jorlow at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 22 16:57:24 2010 +0000
2010-09-22 Jeremy Orlow <jorlow at chromium.org>
Reviewed by Darin Fisher.
[Chromium] Change WebKit API for IDBTransaciton to new style
https://bugs.webkit.org/show_bug.cgi?id=46263
* public/WebIDBIndex.h:
(WebKit::WebIDBIndex::openObjectCursor):
(WebKit::WebIDBIndex::openCursor):
(WebKit::WebIDBIndex::getObject):
(WebKit::WebIDBIndex::get):
* public/WebIDBObjectStore.h:
(WebKit::WebIDBObjectStore::get):
(WebKit::WebIDBObjectStore::put):
(WebKit::WebIDBObjectStore::remove):
(WebKit::WebIDBObjectStore::openCursor):
* src/WebIDBIndexImpl.cpp:
(WebKit::WebIDBIndexImpl::openCursor):
(WebKit::WebIDBIndexImpl::openObjectCursor):
(WebKit::WebIDBIndexImpl::getObject):
(WebKit::WebIDBIndexImpl::get):
* src/WebIDBIndexImpl.h:
* src/WebIDBObjectStoreImpl.cpp:
(WebKit::WebIDBObjectStoreImpl::get):
(WebKit::WebIDBObjectStoreImpl::put):
(WebKit::WebIDBObjectStoreImpl::remove):
(WebKit::WebIDBObjectStoreImpl::openCursor):
* src/WebIDBObjectStoreImpl.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68051 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 0aea610..b113995 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,33 @@
+2010-09-22 Jeremy Orlow <jorlow at chromium.org>
+
+ Reviewed by Darin Fisher.
+
+ [Chromium] Change WebKit API for IDBTransaciton to new style
+ https://bugs.webkit.org/show_bug.cgi?id=46263
+
+ * public/WebIDBIndex.h:
+ (WebKit::WebIDBIndex::openObjectCursor):
+ (WebKit::WebIDBIndex::openCursor):
+ (WebKit::WebIDBIndex::getObject):
+ (WebKit::WebIDBIndex::get):
+ * public/WebIDBObjectStore.h:
+ (WebKit::WebIDBObjectStore::get):
+ (WebKit::WebIDBObjectStore::put):
+ (WebKit::WebIDBObjectStore::remove):
+ (WebKit::WebIDBObjectStore::openCursor):
+ * src/WebIDBIndexImpl.cpp:
+ (WebKit::WebIDBIndexImpl::openCursor):
+ (WebKit::WebIDBIndexImpl::openObjectCursor):
+ (WebKit::WebIDBIndexImpl::getObject):
+ (WebKit::WebIDBIndexImpl::get):
+ * src/WebIDBIndexImpl.h:
+ * src/WebIDBObjectStoreImpl.cpp:
+ (WebKit::WebIDBObjectStoreImpl::get):
+ (WebKit::WebIDBObjectStoreImpl::put):
+ (WebKit::WebIDBObjectStoreImpl::remove):
+ (WebKit::WebIDBObjectStoreImpl::openCursor):
+ * src/WebIDBObjectStoreImpl.h:
+
2010-09-22 Pavel Podivilov <podivilov at chromium.org>
Reviewed by Pavel Feldman.
diff --git a/WebKit/chromium/public/WebIDBIndex.h b/WebKit/chromium/public/WebIDBIndex.h
index 943c26d..b4ba1f4 100644
--- a/WebKit/chromium/public/WebIDBIndex.h
+++ b/WebKit/chromium/public/WebIDBIndex.h
@@ -26,6 +26,7 @@
#ifndef WebIDBIndex_h
#define WebIDBIndex_h
+#include "WebIDBTransaction.h"
#include "WebString.h"
namespace WebKit {
@@ -60,11 +61,43 @@ public:
return false;
}
- // FIXME: Remove the default parameters for transactionIds.
- virtual void openObjectCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*, int transactionId = 0) { WEBKIT_ASSERT_NOT_REACHED(); }
- virtual void openCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*, int transactionId = 0) { WEBKIT_ASSERT_NOT_REACHED(); }
- virtual void getObject(const WebIDBKey&, WebIDBCallbacks*, int transactionId = 0) { WEBKIT_ASSERT_NOT_REACHED(); }
- virtual void get(const WebIDBKey&, WebIDBCallbacks*, int transactionId = 0) { WEBKIT_ASSERT_NOT_REACHED(); }
+ // FIXME: Remove the versions without transaction parameters.
+ virtual void openObjectCursor(const WebIDBKeyRange& range, unsigned short direction, WebIDBCallbacks* callbacks, const WebIDBTransaction&)
+ {
+ openObjectCursor(range, direction, callbacks);
+ }
+ virtual void openObjectCursor(const WebIDBKeyRange& range, unsigned short direction, WebIDBCallbacks* callbacks)
+ {
+ WebIDBTransaction transaction;
+ openObjectCursor(range, direction, callbacks, transaction);
+ }
+ 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);
+ }
+ virtual void getObject(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction&)
+ {
+ getObject(key, callbacks);
+ }
+ virtual void getObject(const WebIDBKey& key, WebIDBCallbacks* callbacks)
+ {
+ WebIDBTransaction transaction;
+ getObject(key, callbacks, transaction);
+ }
+ virtual void get(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction&)
+ {
+ get(key, callbacks);
+ }
+ virtual void get(const WebIDBKey& key, WebIDBCallbacks* callbacks)
+ {
+ WebIDBTransaction transaction;
+ get(key, callbacks, transaction);
+ }
};
} // namespace WebKit
diff --git a/WebKit/chromium/public/WebIDBObjectStore.h b/WebKit/chromium/public/WebIDBObjectStore.h
index fe1c279..569ede1 100755
--- a/WebKit/chromium/public/WebIDBObjectStore.h
+++ b/WebKit/chromium/public/WebIDBObjectStore.h
@@ -29,6 +29,7 @@
#include "WebCommon.h"
#include "WebDOMStringList.h"
#include "WebIDBCallbacks.h"
+#include "WebIDBTransaction.h"
#include "WebString.h"
namespace WebKit {
@@ -57,9 +58,33 @@ public:
}
// FIXME: Remove the default parameters for transactionIds.
- virtual void get(const WebIDBKey& key, WebIDBCallbacks*, int transactionId = 0) { WEBKIT_ASSERT_NOT_REACHED(); }
- virtual void put(const WebSerializedScriptValue& value, const WebIDBKey& key, bool addOnly, WebIDBCallbacks*, int transactionId = 0) { WEBKIT_ASSERT_NOT_REACHED(); }
- virtual void remove(const WebIDBKey& key, WebIDBCallbacks*, int transactionId = 0) { WEBKIT_ASSERT_NOT_REACHED(); }
+ virtual void get(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction&)
+ {
+ 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);
+ }
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)
@@ -68,7 +93,15 @@ public:
return 0;
}
virtual void removeIndex(const WebString& name, WebIDBCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
- virtual void openCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*, int transactionId = 0) { 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.
};
diff --git a/WebKit/chromium/src/WebIDBIndexImpl.cpp b/WebKit/chromium/src/WebIDBIndexImpl.cpp
index 1104fba..c049aac 100644
--- a/WebKit/chromium/src/WebIDBIndexImpl.cpp
+++ b/WebKit/chromium/src/WebIDBIndexImpl.cpp
@@ -68,27 +68,23 @@ bool WebIDBIndexImpl::unique() const
return m_backend->unique();
}
-void WebIDBIndexImpl::openCursor(const WebIDBKeyRange& keyRange, unsigned short direction, WebIDBCallbacks* callbacks, int transactionId)
+void WebIDBIndexImpl::openCursor(const WebIDBKeyRange& keyRange, unsigned short direction, WebIDBCallbacks* callbacks)
{
- ASSERT_UNUSED(transactionId, !transactionId); // FIXME: Pass the transaction in.
m_backend->openCursor(keyRange, direction, IDBCallbacksProxy::create(callbacks));
}
-void WebIDBIndexImpl::openObjectCursor(const WebIDBKeyRange& keyRange, unsigned short direction, WebIDBCallbacks* callbacks, int transactionId)
+void WebIDBIndexImpl::openObjectCursor(const WebIDBKeyRange& keyRange, unsigned short direction, WebIDBCallbacks* callbacks)
{
- ASSERT_UNUSED(transactionId, !transactionId); // FIXME: Pass the transaction in.
m_backend->openObjectCursor(keyRange, direction, IDBCallbacksProxy::create(callbacks));
}
-void WebIDBIndexImpl::getObject(const WebIDBKey& keyRange, WebIDBCallbacks* callbacks, int transactionId)
+void WebIDBIndexImpl::getObject(const WebIDBKey& keyRange, WebIDBCallbacks* callbacks)
{
- ASSERT_UNUSED(transactionId, !transactionId); // FIXME: Pass the transaction in.
m_backend->getObject(keyRange, IDBCallbacksProxy::create(callbacks));
}
-void WebIDBIndexImpl::get(const WebIDBKey& keyRange, WebIDBCallbacks* callbacks, int transactionId)
+void WebIDBIndexImpl::get(const WebIDBKey& keyRange, WebIDBCallbacks* callbacks)
{
- ASSERT_UNUSED(transactionId, !transactionId); // FIXME: Pass the transaction in.
m_backend->get(keyRange, IDBCallbacksProxy::create(callbacks));
}
diff --git a/WebKit/chromium/src/WebIDBIndexImpl.h b/WebKit/chromium/src/WebIDBIndexImpl.h
index 02656ff..2108001 100644
--- a/WebKit/chromium/src/WebIDBIndexImpl.h
+++ b/WebKit/chromium/src/WebIDBIndexImpl.h
@@ -46,10 +46,10 @@ public:
virtual WebString keyPath() const;
virtual bool unique() const;
- virtual void openObjectCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*, int transactionId);
- virtual void openCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*, int transactionId);
- virtual void getObject(const WebIDBKey&, WebIDBCallbacks*, int transactionId);
- virtual void get(const WebIDBKey&, WebIDBCallbacks*, int transactionId);
+ virtual void openObjectCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*);
+ virtual void openCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*);
+ virtual void getObject(const WebIDBKey&, WebIDBCallbacks*);
+ virtual void get(const WebIDBKey&, WebIDBCallbacks*);
private:
WTF::RefPtr<WebCore::IDBIndexBackendInterface> m_backend;
diff --git a/WebKit/chromium/src/WebIDBObjectStoreImpl.cpp b/WebKit/chromium/src/WebIDBObjectStoreImpl.cpp
index 507570f..1ad1d9f 100755
--- a/WebKit/chromium/src/WebIDBObjectStoreImpl.cpp
+++ b/WebKit/chromium/src/WebIDBObjectStoreImpl.cpp
@@ -65,21 +65,18 @@ WebDOMStringList WebIDBObjectStoreImpl::indexNames() const
return m_objectStore->indexNames();
}
-void WebIDBObjectStoreImpl::get(const WebIDBKey& key, WebIDBCallbacks* callbacks, int transactionId)
+void WebIDBObjectStoreImpl::get(const WebIDBKey& key, WebIDBCallbacks* callbacks)
{
- ASSERT_UNUSED(transactionId, !transactionId); // FIXME: Pass the transaction in.
m_objectStore->get(key, IDBCallbacksProxy::create(callbacks));
}
-void WebIDBObjectStoreImpl::put(const WebSerializedScriptValue& value, const WebIDBKey& key, bool addOnly, WebIDBCallbacks* callbacks, int transactionId)
+void WebIDBObjectStoreImpl::put(const WebSerializedScriptValue& value, const WebIDBKey& key, bool addOnly, WebIDBCallbacks* callbacks)
{
- ASSERT_UNUSED(transactionId, !transactionId); // FIXME: Pass the transaction in.
m_objectStore->put(value, key, addOnly, IDBCallbacksProxy::create(callbacks));
}
-void WebIDBObjectStoreImpl::remove(const WebIDBKey& key, WebIDBCallbacks* callbacks, int transactionId)
+void WebIDBObjectStoreImpl::remove(const WebIDBKey& key, WebIDBCallbacks* callbacks)
{
- ASSERT_UNUSED(transactionId, !transactionId); // FIXME: Pass the transaction in.
m_objectStore->remove(key, IDBCallbacksProxy::create(callbacks));
}
@@ -101,9 +98,8 @@ void WebIDBObjectStoreImpl::removeIndex(const WebString& name, WebIDBCallbacks*
m_objectStore->removeIndex(name, IDBCallbacksProxy::create(callbacks));
}
-void WebIDBObjectStoreImpl::openCursor(const WebIDBKeyRange& keyRange, unsigned short direction, WebIDBCallbacks* callbacks, int transactionId)
+void WebIDBObjectStoreImpl::openCursor(const WebIDBKeyRange& keyRange, unsigned short direction, WebIDBCallbacks* callbacks)
{
- ASSERT_UNUSED(transactionId, !transactionId); // FIXME: Pass the transaction in.
m_objectStore->openCursor(IDBKeyRange::create(keyRange.left(), keyRange.right(), keyRange.flags()), direction, IDBCallbacksProxy::create(callbacks));
}
diff --git a/WebKit/chromium/src/WebIDBObjectStoreImpl.h b/WebKit/chromium/src/WebIDBObjectStoreImpl.h
index 68888f4..9f31369 100755
--- a/WebKit/chromium/src/WebIDBObjectStoreImpl.h
+++ b/WebKit/chromium/src/WebIDBObjectStoreImpl.h
@@ -47,15 +47,15 @@ public:
WebString keyPath() const;
WebDOMStringList indexNames() const;
- void get(const WebIDBKey& key, WebIDBCallbacks*, int transactionId);
- void put(const WebSerializedScriptValue& value, const WebIDBKey& key, bool addOnly, WebIDBCallbacks*, int transactionId);
- void remove(const WebIDBKey& key, WebIDBCallbacks*, int transactionId);
+ void get(const WebIDBKey& key, WebIDBCallbacks*);
+ void put(const WebSerializedScriptValue& value, const WebIDBKey& key, bool addOnly, WebIDBCallbacks*);
+ void remove(const WebIDBKey& key, WebIDBCallbacks*);
void createIndex(const WebString& name, const WebString& keyPath, bool unique, WebIDBCallbacks* callbacks);
WebIDBIndex* index(const WebString& name);
void removeIndex(const WebString& name, WebIDBCallbacks* callbacks);
- void openCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*, int transactionId);
+ void openCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*);
private:
WTF::RefPtr<WebCore::IDBObjectStoreBackendInterface> m_objectStore;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list