Diff
Modified: trunk/Source/WebCore/ChangeLog (138962 => 138963)
--- trunk/Source/WebCore/ChangeLog 2013-01-07 18:40:55 UTC (rev 138962)
+++ trunk/Source/WebCore/ChangeLog 2013-01-07 18:53:47 UTC (rev 138963)
@@ -1,3 +1,19 @@
+2013-01-07 Alec Flett <alecfl...@chromium.org>
+
+ IndexedDB: Stub out async IDBDatabaseBackendInterface::createObjectStore
+ https://bugs.webkit.org/show_bug.cgi?id=106148
+
+ Reviewed by Adam Barth.
+
+ These methods are becoming async in multiprocess ports, so stub out
+ versions that have no return values.
+
+ * Modules/indexeddb/IDBDatabaseBackendImpl.h:
+ (WebCore::IDBDatabaseBackendImpl::createObjectStore):
+ (WebCore::IDBDatabaseBackendImpl::deleteObjectStore):
+ * Modules/indexeddb/IDBDatabaseBackendInterface.h:
+ (IDBDatabaseBackendInterface):
+
2013-01-04 Alexey Proskuryakov <a...@apple.com>
ResourceHandle::willLoadFromCache is evil
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.h (138962 => 138963)
--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.h 2013-01-07 18:40:55 UTC (rev 138962)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.h 2013-01-07 18:53:47 UTC (rev 138963)
@@ -61,7 +61,9 @@
// IDBDatabaseBackendInterface
virtual IDBDatabaseMetadata metadata() const;
virtual PassRefPtr<IDBObjectStoreBackendInterface> createObjectStore(int64_t id, const String& name, const IDBKeyPath&, bool autoIncrement, IDBTransactionBackendInterface*, ExceptionCode&);
+ virtual void createObjectStore(int64_t transactionId, int64_t objectStoreId, const String& name, const IDBKeyPath&, bool autoIncrement) { ASSERT_NOT_REACHED(); }
virtual void deleteObjectStore(int64_t, IDBTransactionBackendInterface*, ExceptionCode&);
+ virtual void deleteObjectStore(int64_t transactionId, int64_t objectStoreId) { ASSERT_NOT_REACHED(); }
// FIXME: Remove this method in https://bugs.webkit.org/show_bug.cgi?id=103923.
virtual PassRefPtr<IDBTransactionBackendInterface> createTransaction(int64_t transactionId, const Vector<int64_t>& objectStoreIds, IDBTransaction::Mode);
virtual void createTransaction(int64_t transactionId, PassRefPtr<IDBDatabaseCallbacks>, const Vector<int64_t>& objectStoreIds, unsigned short mode);
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendInterface.h (138962 => 138963)
--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendInterface.h 2013-01-07 18:40:55 UTC (rev 138962)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendInterface.h 2013-01-07 18:53:47 UTC (rev 138963)
@@ -56,7 +56,9 @@
virtual IDBDatabaseMetadata metadata() const = 0;
virtual PassRefPtr<IDBObjectStoreBackendInterface> createObjectStore(int64_t, const String& name, const IDBKeyPath&, bool autoIncrement, IDBTransactionBackendInterface*, ExceptionCode&) = 0;
+ virtual void createObjectStore(int64_t transactionId, int64_t objectStoreId, const String& name, const IDBKeyPath&, bool autoIncrement) = 0;
virtual void deleteObjectStore(int64_t, IDBTransactionBackendInterface*, ExceptionCode&) = 0;
+ virtual void deleteObjectStore(int64_t transactionId, int64_t objectStoreId) = 0;
// FIXME: Remove this method in https://bugs.webkit.org/show_bug.cgi?id=103923.
virtual PassRefPtr<IDBTransactionBackendInterface> createTransaction(int64_t transactionId, const Vector<int64_t>& objectStoreIds, IDBTransaction::Mode) = 0;
virtual void createTransaction(int64_t transactionId, PassRefPtr<IDBDatabaseCallbacks>, const Vector<int64_t>& objectStoreIds, unsigned short mode) = 0;
Modified: trunk/Source/WebKit/chromium/ChangeLog (138962 => 138963)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-01-07 18:40:55 UTC (rev 138962)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-01-07 18:53:47 UTC (rev 138963)
@@ -1,3 +1,27 @@
+2013-01-07 Alec Flett <alecfl...@chromium.org>
+
+ IndexedDB: Stub out async IDBDatabaseBackendInterface::createObjectStore
+ https://bugs.webkit.org/show_bug.cgi?id=106148
+
+ Reviewed by Adam Barth.
+
+ Stub out WebKit API for async createObjectStore.
+
+ * public/WebIDBDatabase.h:
+ (WebIDBDatabase):
+ * src/IDBDatabaseBackendProxy.cpp:
+ (WebKit::IDBDatabaseBackendProxy::createObjectStore):
+ (WebKit):
+ (WebKit::IDBDatabaseBackendProxy::deleteObjectStore):
+ * src/IDBDatabaseBackendProxy.h:
+ (IDBDatabaseBackendProxy):
+ * src/WebIDBDatabaseImpl.cpp:
+ (WebKit::WebIDBDatabaseImpl::createObjectStore):
+ (WebKit):
+ (WebKit::WebIDBDatabaseImpl::deleteObjectStore):
+ * src/WebIDBDatabaseImpl.h:
+ (WebIDBDatabaseImpl):
+
2013-01-07 Stephen Chenney <schen...@chromium.org>
Add comment to WebKit skia gyp
Modified: trunk/Source/WebKit/chromium/public/WebIDBDatabase.h (138962 => 138963)
--- trunk/Source/WebKit/chromium/public/WebIDBDatabase.h 2013-01-07 18:40:55 UTC (rev 138962)
+++ trunk/Source/WebKit/chromium/public/WebIDBDatabase.h 2013-01-07 18:53:47 UTC (rev 138963)
@@ -58,7 +58,9 @@
WEBKIT_ASSERT_NOT_REACHED();
return 0;
}
+ virtual void createObjectStore(long long transactionId, long long objectStoreId, const WebString& name, const WebIDBKeyPath&, bool autoIncrement) { WEBKIT_ASSERT_NOT_REACHED(); }
virtual void deleteObjectStore(long long objectStoreId, const WebIDBTransaction& transaction, WebExceptionCode& ec) { WEBKIT_ASSERT_NOT_REACHED(); }
+ virtual void deleteObjectStore(long long transactionId, long long objectStoreId) { WEBKIT_ASSERT_NOT_REACHED(); }
// FIXME: Remove this method in https://bugs.webkit.org/show_bug.cgi?id=103923.
virtual WebIDBTransaction* createTransaction(long long id, const WebVector<long long>&, unsigned short mode) { WEBKIT_ASSERT_NOT_REACHED(); return 0; }
virtual void createTransaction(long long id, WebIDBDatabaseCallbacks* callbacks, const WebVector<long long>&, unsigned short mode) { WEBKIT_ASSERT_NOT_REACHED(); }
Modified: trunk/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.cpp (138962 => 138963)
--- trunk/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.cpp 2013-01-07 18:40:55 UTC (rev 138962)
+++ trunk/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.cpp 2013-01-07 18:53:47 UTC (rev 138963)
@@ -79,6 +79,12 @@
return IDBObjectStoreBackendProxy::create(objectStore.release());
}
+void IDBDatabaseBackendProxy::createObjectStore(int64_t transactionId, int64_t objectStoreId, const String& name, const IDBKeyPath& keyPath, bool autoIncrement)
+{
+ if (m_webIDBDatabase)
+ m_webIDBDatabase->createObjectStore(transactionId, objectStoreId, name, keyPath, autoIncrement);
+}
+
void IDBDatabaseBackendProxy::deleteObjectStore(int64_t objectStoreId, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)
{
// The transaction pointer is guaranteed to be a pointer to a proxy object as, in the renderer,
@@ -87,6 +93,12 @@
m_webIDBDatabase->deleteObjectStore(objectStoreId, *transactionProxy->getWebIDBTransaction(), ec);
}
+void IDBDatabaseBackendProxy::deleteObjectStore(int64_t transactionId, int64_t objectStoreId)
+{
+ if (m_webIDBDatabase)
+ m_webIDBDatabase->deleteObjectStore(transactionId, objectStoreId);
+}
+
PassRefPtr<IDBTransactionBackendInterface> IDBDatabaseBackendProxy::createTransaction(int64_t id, const Vector<int64_t>& objectStoreIds, IDBTransaction::Mode mode)
{
OwnPtr<WebIDBTransaction> transaction = adoptPtr(m_webIDBDatabase->createTransaction(id, objectStoreIds, mode));
Modified: trunk/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.h (138962 => 138963)
--- trunk/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.h 2013-01-07 18:40:55 UTC (rev 138962)
+++ trunk/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.h 2013-01-07 18:53:47 UTC (rev 138963)
@@ -45,7 +45,9 @@
virtual WebCore::IDBDatabaseMetadata metadata() const;
virtual PassRefPtr<WebCore::IDBObjectStoreBackendInterface> createObjectStore(int64_t, const String& name, const WebCore::IDBKeyPath&, bool autoIncrement, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);
+ virtual void createObjectStore(int64_t transactionId, int64_t objectStoreId, const String& name, const WebCore::IDBKeyPath&, bool autoIncrement);
virtual void deleteObjectStore(int64_t, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);
+ virtual void deleteObjectStore(int64_t transactionId, int64_t objectStoreId);
// FIXME: Remove this method in https://bugs.webkit.org/show_bug.cgi?id=103923.
virtual PassRefPtr<WebCore::IDBTransactionBackendInterface> createTransaction(int64_t, const Vector<int64_t>&, WebCore::IDBTransaction::Mode);
virtual void createTransaction(int64_t, PassRefPtr<WebCore::IDBDatabaseCallbacks>, const Vector<int64_t>&, unsigned short mode);
Modified: trunk/Source/WebKit/chromium/src/WebIDBDatabaseImpl.cpp (138962 => 138963)
--- trunk/Source/WebKit/chromium/src/WebIDBDatabaseImpl.cpp 2013-01-07 18:40:55 UTC (rev 138962)
+++ trunk/Source/WebKit/chromium/src/WebIDBDatabaseImpl.cpp 2013-01-07 18:53:47 UTC (rev 138963)
@@ -72,11 +72,22 @@
return new WebIDBObjectStoreImpl(objectStore);
}
+void WebIDBDatabaseImpl::createObjectStore(long long transactionId, long long objectStoreId, const WebString& name, const WebIDBKeyPath& keyPath, bool autoIncrement)
+{
+ m_databaseBackend->createObjectStore(transactionId, objectStoreId, name, keyPath, autoIncrement);
+}
+
void WebIDBDatabaseImpl::deleteObjectStore(long long objectStoreId, const WebIDBTransaction& transaction, WebExceptionCode& ec)
{
m_databaseBackend->deleteObjectStore(objectStoreId, transaction.getIDBTransactionBackendInterface(), ec);
}
+void WebIDBDatabaseImpl::deleteObjectStore(long long transactionId, long long objectStoreId)
+{
+ m_databaseBackend->deleteObjectStore(transactionId, objectStoreId);
+}
+
+
// FIXME: Remove this method in https://bugs.webkit.org/show_bug.cgi?id=103923.
WebIDBTransaction* WebIDBDatabaseImpl::createTransaction(long long id, const WebVector<long long>& objectStoreIds, unsigned short mode)
{
Modified: trunk/Source/WebKit/chromium/src/WebIDBDatabaseImpl.h (138962 => 138963)
--- trunk/Source/WebKit/chromium/src/WebIDBDatabaseImpl.h 2013-01-07 18:40:55 UTC (rev 138962)
+++ trunk/Source/WebKit/chromium/src/WebIDBDatabaseImpl.h 2013-01-07 18:53:47 UTC (rev 138963)
@@ -54,7 +54,9 @@
virtual WebIDBMetadata metadata() const;
virtual WebIDBObjectStore* createObjectStore(long long, const WebString& name, const WebIDBKeyPath&, bool autoIncrement, const WebIDBTransaction&, WebExceptionCode&);
+ virtual void createObjectStore(long long transactionId, long long objectStoreId, const WebString& name, const WebIDBKeyPath&, bool autoIncrement);
virtual void deleteObjectStore(long long objectStoreId, const WebIDBTransaction&, WebExceptionCode&);
+ virtual void deleteObjectStore(long long objectStoreId, long long transactionId);
// FIXME: Remove this method in https://bugs.webkit.org/show_bug.cgi?id=103923.
virtual WebIDBTransaction* createTransaction(long long id, const WebVector<long long>&, unsigned short mode);
virtual void createTransaction(long long id, WebIDBDatabaseCallbacks*, const WebVector<long long>&, unsigned short mode);
Modified: trunk/Source/WebKit/chromium/tests/IDBDatabaseBackendTest.cpp (138962 => 138963)
--- trunk/Source/WebKit/chromium/tests/IDBDatabaseBackendTest.cpp 2013-01-07 18:40:55 UTC (rev 138962)
+++ trunk/Source/WebKit/chromium/tests/IDBDatabaseBackendTest.cpp 2013-01-07 18:53:47 UTC (rev 138963)
@@ -151,9 +151,10 @@
}
virtual IDBDatabaseMetadata metadata() const { return IDBDatabaseMetadata(); }
- virtual PassRefPtr<IDBObjectStoreBackendInterface> createObjectStore(int64_t, const String& name, const IDBKeyPath&, bool autoIncrement, IDBTransactionBackendInterface*, ExceptionCode&) { return 0; }
- virtual void deleteObjectStore(const String& name, IDBTransactionBackendInterface*, ExceptionCode&) { }
- virtual void deleteObjectStore(int64_t, IDBTransactionBackendInterface*, ExceptionCode&) { }
+ virtual PassRefPtr<IDBObjectStoreBackendInterface> createObjectStore(int64_t, const String& name, const IDBKeyPath&, bool autoIncrement, IDBTransactionBackendInterface*, ExceptionCode&) OVERRIDE { return 0; }
+ virtual void createObjectStore(int64_t transactionId, int64_t objectStoreId, const String& name, const IDBKeyPath&, bool autoIncrement) OVERRIDE { };
+ virtual void deleteObjectStore(int64_t transactionId, int64_t objectStoreId) OVERRIDE { }
+ virtual void deleteObjectStore(int64_t, IDBTransactionBackendInterface*, ExceptionCode&) OVERRIDE { }
// FIXME: Remove this method in https://bugs.webkit.org/show_bug.cgi?id=103923.
virtual PassRefPtr<IDBTransactionBackendInterface> createTransaction(int64_t, const Vector<int64_t>&, IDBTransaction::Mode) OVERRIDE { return 0; }
virtual void createTransaction(int64_t, PassRefPtr<IDBDatabaseCallbacks>, const Vector<int64_t>&, unsigned short mode) OVERRIDE { }
