[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:37:35 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 808fc0726ec1c29b1306a6e651d1a40a8c7803ec
Author: jorlow at chromium.org <jorlow at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Sep 21 21:04:02 2010 +0000
2010-09-21 Jeremy Orlow <jorlow at chromium.org>
Reviewed by Nate Chapin.
[Chromium] Plumb the IDBTransansaction's id
https://bugs.webkit.org/show_bug.cgi?id=46197
Next step, add the plumbing to Chromium. Then we add code to WebKit
that uses it (and take out the default IDBTransaction param).
* public/WebIDBCursor.h:
(WebKit::WebIDBCursor::key):
(WebKit::WebIDBCursor::value):
* public/WebIDBFactory.h:
(WebKit::WebIDBFactory::open):
* 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::createIndex):
(WebKit::WebIDBObjectStore::removeIndex):
(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@67986 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 6b9b649..29e724d 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,43 @@
+2010-09-21 Jeremy Orlow <jorlow at chromium.org>
+
+ Reviewed by Nate Chapin.
+
+ [Chromium] Plumb the IDBTransansaction's id
+ https://bugs.webkit.org/show_bug.cgi?id=46197
+
+ Next step, add the plumbing to Chromium. Then we add code to WebKit
+ that uses it (and take out the default IDBTransaction param).
+
+ * public/WebIDBCursor.h:
+ (WebKit::WebIDBCursor::key):
+ (WebKit::WebIDBCursor::value):
+ * public/WebIDBFactory.h:
+ (WebKit::WebIDBFactory::open):
+ * 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::createIndex):
+ (WebKit::WebIDBObjectStore::removeIndex):
+ (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-21 Chris Guillory <chris.guillory at google.com>
Reviewed by Chris Fleizach.
diff --git a/WebKit/chromium/public/WebIDBCursor.h b/WebKit/chromium/public/WebIDBCursor.h
index f47a44c..05bd51a 100644
--- a/WebKit/chromium/public/WebIDBCursor.h
+++ b/WebKit/chromium/public/WebIDBCursor.h
@@ -49,21 +49,8 @@ public:
WEBKIT_ASSERT_NOT_REACHED();
return WebIDBKey::createInvalid();
}
- // FIXME: Remove the legacy version of value() (the first version) as soon as a WebKit roll happens.
- virtual WebSerializedScriptValue value() const
- {
- WebSerializedScriptValue serializedScriptValue;
- WebIDBKey idbKey;
- value(serializedScriptValue, idbKey);
- WEBKIT_ASSERT(!serializedScriptValue.isNull());
- WEBKIT_ASSERT(idbKey.type() == WebIDBKey::InvalidType);
- return serializedScriptValue;
- }
// One or the other will set, depending on what type of cursor this is.
- virtual void value(WebSerializedScriptValue& serializedScriptValue, WebIDBKey& idbKey) const
- {
- serializedScriptValue = value();
- }
+ 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(); }
diff --git a/WebKit/chromium/public/WebIDBFactory.h b/WebKit/chromium/public/WebIDBFactory.h
index 3c800bd..0be4c63 100755
--- a/WebKit/chromium/public/WebIDBFactory.h
+++ b/WebKit/chromium/public/WebIDBFactory.h
@@ -52,15 +52,7 @@ public:
virtual ~WebIDBFactory() { }
// The WebKit implementation of open ignores the WebFrame* parameter.
- virtual void open(const WebString& name, const WebString& description, WebIDBCallbacks* callbacks, const WebSecurityOrigin& origin, WebFrame* webFrame, const WebString& dataDir)
- {
- open(name, description, callbacks, origin, webFrame);
- }
- // FIXME: Delete soon. Compatability hack.
- virtual void open(const WebString& name, const WebString& description, WebIDBCallbacks* callbacks, const WebSecurityOrigin& origin, WebFrame* webFrame)
- {
- open(name, description, callbacks, origin, webFrame, "/tmp/temporary-indexed-db-files");
- }
+ virtual void open(const WebString& name, const WebString& description, WebIDBCallbacks* callbacks, const WebSecurityOrigin& origin, WebFrame* webFrame, const WebString& dataDir) { WEBKIT_ASSERT_NOT_REACHED(); }
virtual void abortPendingTransactions(const WebVector<int>& pendingIDs) { WEBKIT_ASSERT_NOT_REACHED(); }
diff --git a/WebKit/chromium/public/WebIDBIndex.h b/WebKit/chromium/public/WebIDBIndex.h
index e03fc58..943c26d 100644
--- a/WebKit/chromium/public/WebIDBIndex.h
+++ b/WebKit/chromium/public/WebIDBIndex.h
@@ -60,10 +60,11 @@ public:
return false;
}
- virtual void openObjectCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
- virtual void openCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
- virtual void getObject(const WebIDBKey&, WebIDBCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
- virtual void get(const WebIDBKey&, WebIDBCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
+ // 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(); }
};
} // namespace WebKit
diff --git a/WebKit/chromium/public/WebIDBObjectStore.h b/WebKit/chromium/public/WebIDBObjectStore.h
index 7452be9..fe1c279 100755
--- a/WebKit/chromium/public/WebIDBObjectStore.h
+++ b/WebKit/chromium/public/WebIDBObjectStore.h
@@ -55,36 +55,20 @@ public:
WEBKIT_ASSERT_NOT_REACHED();
return WebDOMStringList();
}
- virtual void get(const WebIDBKey& key, WebIDBCallbacks*)
- {
- WEBKIT_ASSERT_NOT_REACHED();
- }
- virtual void put(const WebSerializedScriptValue& value, const WebIDBKey& key, bool addOnly, WebIDBCallbacks*)
- {
- WEBKIT_ASSERT_NOT_REACHED();
- }
- virtual void remove(const WebIDBKey& key, WebIDBCallbacks*)
- {
- WEBKIT_ASSERT_NOT_REACHED();
- }
- virtual void createIndex(const WebString& name, const WebString& keyPath, bool unique, WebIDBCallbacks*)
- {
- WEBKIT_ASSERT_NOT_REACHED();
- }
+
+ // 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 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)
{
WEBKIT_ASSERT_NOT_REACHED();
return 0;
}
- virtual void removeIndex(const WebString& name, WebIDBCallbacks*)
- {
- WEBKIT_ASSERT_NOT_REACHED();
- }
- virtual void openCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*)
- {
- WEBKIT_ASSERT_NOT_REACHED();
- }
+ 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(); }
// FIXME: finish.
};
diff --git a/WebKit/chromium/src/WebIDBIndexImpl.cpp b/WebKit/chromium/src/WebIDBIndexImpl.cpp
index c049aac..1104fba 100644
--- a/WebKit/chromium/src/WebIDBIndexImpl.cpp
+++ b/WebKit/chromium/src/WebIDBIndexImpl.cpp
@@ -68,23 +68,27 @@ bool WebIDBIndexImpl::unique() const
return m_backend->unique();
}
-void WebIDBIndexImpl::openCursor(const WebIDBKeyRange& keyRange, unsigned short direction, WebIDBCallbacks* callbacks)
+void WebIDBIndexImpl::openCursor(const WebIDBKeyRange& keyRange, unsigned short direction, WebIDBCallbacks* callbacks, int transactionId)
{
+ 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)
+void WebIDBIndexImpl::openObjectCursor(const WebIDBKeyRange& keyRange, unsigned short direction, WebIDBCallbacks* callbacks, int transactionId)
{
+ 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)
+void WebIDBIndexImpl::getObject(const WebIDBKey& keyRange, WebIDBCallbacks* callbacks, int transactionId)
{
+ ASSERT_UNUSED(transactionId, !transactionId); // FIXME: Pass the transaction in.
m_backend->getObject(keyRange, IDBCallbacksProxy::create(callbacks));
}
-void WebIDBIndexImpl::get(const WebIDBKey& keyRange, WebIDBCallbacks* callbacks)
+void WebIDBIndexImpl::get(const WebIDBKey& keyRange, WebIDBCallbacks* callbacks, int transactionId)
{
+ 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 2108001..02656ff 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*);
- virtual void openCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*);
- virtual void getObject(const WebIDBKey&, WebIDBCallbacks*);
- virtual void get(const WebIDBKey&, WebIDBCallbacks*);
+ 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);
private:
WTF::RefPtr<WebCore::IDBIndexBackendInterface> m_backend;
diff --git a/WebKit/chromium/src/WebIDBObjectStoreImpl.cpp b/WebKit/chromium/src/WebIDBObjectStoreImpl.cpp
index 1ad1d9f..507570f 100755
--- a/WebKit/chromium/src/WebIDBObjectStoreImpl.cpp
+++ b/WebKit/chromium/src/WebIDBObjectStoreImpl.cpp
@@ -65,18 +65,21 @@ WebDOMStringList WebIDBObjectStoreImpl::indexNames() const
return m_objectStore->indexNames();
}
-void WebIDBObjectStoreImpl::get(const WebIDBKey& key, WebIDBCallbacks* callbacks)
+void WebIDBObjectStoreImpl::get(const WebIDBKey& key, WebIDBCallbacks* callbacks, int transactionId)
{
+ 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)
+void WebIDBObjectStoreImpl::put(const WebSerializedScriptValue& value, const WebIDBKey& key, bool addOnly, WebIDBCallbacks* callbacks, int transactionId)
{
+ 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)
+void WebIDBObjectStoreImpl::remove(const WebIDBKey& key, WebIDBCallbacks* callbacks, int transactionId)
{
+ ASSERT_UNUSED(transactionId, !transactionId); // FIXME: Pass the transaction in.
m_objectStore->remove(key, IDBCallbacksProxy::create(callbacks));
}
@@ -98,8 +101,9 @@ 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)
+void WebIDBObjectStoreImpl::openCursor(const WebIDBKeyRange& keyRange, unsigned short direction, WebIDBCallbacks* callbacks, int transactionId)
{
+ 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 9f31369..68888f4 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*);
- void put(const WebSerializedScriptValue& value, const WebIDBKey& key, bool addOnly, WebIDBCallbacks*);
- void remove(const WebIDBKey& key, WebIDBCallbacks*);
+ 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 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*);
+ void openCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*, int transactionId);
private:
WTF::RefPtr<WebCore::IDBObjectStoreBackendInterface> m_objectStore;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list