Diff
Modified: trunk/Source/WebCore/ChangeLog (122171 => 122172)
--- trunk/Source/WebCore/ChangeLog 2012-07-10 00:20:51 UTC (rev 122171)
+++ trunk/Source/WebCore/ChangeLog 2012-07-10 00:41:16 UTC (rev 122172)
@@ -1,3 +1,16 @@
+2012-07-09 Joshua Bell <[email protected]>
+
+ IndexedDB: Remove obsolete accessor plumbing
+ https://bugs.webkit.org/show_bug.cgi?id=90812
+
+ Reviewed by Tony Chang.
+
+ No new tests - just deleting code.
+
+ * Modules/indexeddb/IDBTransaction.cpp:
+ (WebCore::IDBTransaction::IDBTransaction): Since backend mode() is disconnected, can no
+ longer assert that front-end/back-end modes match; not worth it to keeping the plumbing.
+
2012-07-09 Dana Jansens <[email protected]>
[chromium] Remove HashMap workaround for layers with id=0 in CCDamageTracker
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp (122171 => 122172)
--- trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp 2012-07-10 00:20:51 UTC (rev 122171)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp 2012-07-10 00:41:16 UTC (rev 122172)
@@ -89,7 +89,6 @@
, m_contextStopped(false)
{
ASSERT(m_backend);
- ASSERT(m_mode == m_backend->mode());
if (mode == VERSION_CHANGE) {
// Not active until the callback.
Modified: trunk/Source/WebKit/chromium/ChangeLog (122171 => 122172)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-07-10 00:20:51 UTC (rev 122171)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-07-10 00:41:16 UTC (rev 122172)
@@ -1,3 +1,31 @@
+2012-07-09 Joshua Bell <[email protected]>
+
+ IndexedDB: Remove obsolete accessor plumbing
+ https://bugs.webkit.org/show_bug.cgi?id=90812
+
+ Reviewed by Tony Chang.
+
+ * public/WebIDBCursor.h: Remove direction.
+ * public/WebIDBDatabase.h: Remove name, version, objectStoreNames;
+ (WebKit::WebIDBDatabase::metadata):
+ * public/WebIDBIndex.h: Remove name, keyPath, unique, multiEntry;
+ * public/WebIDBObjectStore.h: Remove name, keyPath, indexNames, autoIncrement;
+ * src/IDBDatabaseBackendProxy.cpp: Remove plumbing.
+ * src/IDBDatabaseBackendProxy.h: Remove plumbing.
+ (IDBDatabaseBackendProxy):
+ * src/IDBIndexBackendProxy.cpp: Remove plumbing.
+ * src/IDBIndexBackendProxy.h: Remove plumbing.
+ (IDBIndexBackendProxy):
+ * src/IDBObjectStoreBackendProxy.cpp: Remove plumbing.
+ * src/IDBObjectStoreBackendProxy.h: Remove plumbing.
+ (IDBObjectStoreBackendProxy):
+ * src/IDBTransactionBackendProxy.cpp: Remove plumbing.
+ * src/IDBTransactionBackendProxy.h: Assert stub is not used - only needed
+ by real IDBTransactionBackendImpl
+ (WebKit::IDBTransactionBackendProxy::mode):
+ * src/WebIDBTransactionImpl.cpp: Remove plumbing.
+ * src/WebIDBTransactionImpl.h: Remove plumbing.
+
2012-07-09 Sheriff Bot <[email protected]>
Unreviewed, rolling out r122161.
Modified: trunk/Source/WebKit/chromium/public/WebIDBCursor.h (122171 => 122172)
--- trunk/Source/WebKit/chromium/public/WebIDBCursor.h 2012-07-10 00:20:51 UTC (rev 122171)
+++ trunk/Source/WebKit/chromium/public/WebIDBCursor.h 2012-07-10 00:41:16 UTC (rev 122172)
@@ -40,11 +40,6 @@
public:
virtual ~WebIDBCursor() { }
- virtual unsigned short direction() const
- {
- WEBKIT_ASSERT_NOT_REACHED();
- return 0;
- }
virtual WebIDBKey key() const
{
WEBKIT_ASSERT_NOT_REACHED();
Modified: trunk/Source/WebKit/chromium/public/WebIDBDatabase.h (122171 => 122172)
--- trunk/Source/WebKit/chromium/public/WebIDBDatabase.h 2012-07-10 00:20:51 UTC (rev 122171)
+++ trunk/Source/WebKit/chromium/public/WebIDBDatabase.h 2012-07-10 00:41:16 UTC (rev 122172)
@@ -50,21 +50,6 @@
WEBKIT_ASSERT_NOT_REACHED();
return WebIDBMetadata();
}
- virtual WebString name() const
- {
- WEBKIT_ASSERT_NOT_REACHED();
- return WebString();
- }
- virtual WebString version() const
- {
- WEBKIT_ASSERT_NOT_REACHED();
- return WebString();
- }
- virtual WebDOMStringList objectStoreNames() const
- {
- WEBKIT_ASSERT_NOT_REACHED();
- return WebDOMStringList();
- }
virtual WebIDBObjectStore* createObjectStore(const WebString&, const WebIDBKeyPath&, bool, const WebIDBTransaction&, WebExceptionCode&)
{
WEBKIT_ASSERT_NOT_REACHED();
Modified: trunk/Source/WebKit/chromium/public/WebIDBIndex.h (122171 => 122172)
--- trunk/Source/WebKit/chromium/public/WebIDBIndex.h 2012-07-10 00:20:51 UTC (rev 122171)
+++ trunk/Source/WebKit/chromium/public/WebIDBIndex.h 2012-07-10 00:41:16 UTC (rev 122172)
@@ -42,27 +42,6 @@
public:
virtual ~WebIDBIndex() { }
- virtual WebString name() const
- {
- WEBKIT_ASSERT_NOT_REACHED();
- return WebString();
- }
- virtual WebIDBKeyPath keyPath() const
- {
- WEBKIT_ASSERT_NOT_REACHED();
- return WebIDBKeyPath::createNull();
- }
- virtual bool unique() const
- {
- WEBKIT_ASSERT_NOT_REACHED();
- return false;
- }
- virtual bool multiEntry() const
- {
- WEBKIT_ASSERT_NOT_REACHED();
- return false;
- }
-
virtual void openObjectCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
virtual void openKeyCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
virtual void count(const WebIDBKeyRange&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
Modified: trunk/Source/WebKit/chromium/public/WebIDBObjectStore.h (122171 => 122172)
--- trunk/Source/WebKit/chromium/public/WebIDBObjectStore.h 2012-07-10 00:20:51 UTC (rev 122171)
+++ trunk/Source/WebKit/chromium/public/WebIDBObjectStore.h 2012-07-10 00:41:16 UTC (rev 122172)
@@ -43,27 +43,6 @@
public:
virtual ~WebIDBObjectStore() { }
- virtual WebString name() const
- {
- WEBKIT_ASSERT_NOT_REACHED();
- return WebString();
- }
- virtual WebIDBKeyPath keyPath() const
- {
- WEBKIT_ASSERT_NOT_REACHED();
- return WebIDBKeyPath::createNull();
- }
- virtual WebDOMStringList indexNames() const
- {
- WEBKIT_ASSERT_NOT_REACHED();
- return WebDOMStringList();
- }
- virtual bool autoIncrement() const
- {
- WEBKIT_ASSERT_NOT_REACHED();
- return false;
- }
-
virtual void get(const WebIDBKeyRange&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
enum PutMode {
@@ -73,8 +52,6 @@
};
virtual void put(const WebSerializedScriptValue&, const WebIDBKey&, PutMode, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
- // FIXME: Remove the following overload when all callers are updated.
- virtual void deleteFunction(const WebIDBKey&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
virtual void deleteFunction(const WebIDBKeyRange&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
virtual void clear(WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
virtual WebIDBIndex* createIndex(const WebString&, const WebIDBKeyPath&, bool, bool, const WebIDBTransaction&, WebExceptionCode&)
Modified: trunk/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.cpp (122171 => 122172)
--- trunk/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.cpp 2012-07-10 00:20:51 UTC (rev 122171)
+++ trunk/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.cpp 2012-07-10 00:41:16 UTC (rev 122172)
@@ -66,21 +66,6 @@
return m_webIDBDatabase->metadata();
}
-String IDBDatabaseBackendProxy::name() const
-{
- return m_webIDBDatabase->name();
-}
-
-String IDBDatabaseBackendProxy::version() const
-{
- return m_webIDBDatabase->version();
-}
-
-PassRefPtr<DOMStringList> IDBDatabaseBackendProxy::objectStoreNames() const
-{
- return m_webIDBDatabase->objectStoreNames();
-}
-
PassRefPtr<IDBObjectStoreBackendInterface> IDBDatabaseBackendProxy::createObjectStore(const String& name, const IDBKeyPath& keyPath, bool autoIncrement, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)
{
// The transaction pointer is guaranteed to be a pointer to a proxy object as, in the renderer,
Modified: trunk/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.h (122171 => 122172)
--- trunk/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.h 2012-07-10 00:20:51 UTC (rev 122171)
+++ trunk/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.h 2012-07-10 00:41:16 UTC (rev 122172)
@@ -43,9 +43,6 @@
virtual ~IDBDatabaseBackendProxy();
virtual WebCore::IDBDatabaseMetadata metadata() const;
- virtual String name() const;
- virtual String version() const;
- virtual PassRefPtr<WebCore::DOMStringList> objectStoreNames() const;
virtual PassRefPtr<WebCore::IDBObjectStoreBackendInterface> createObjectStore(const String& name, const WebCore::IDBKeyPath&, bool autoIncrement, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);
virtual void deleteObjectStore(const String& name, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);
Modified: trunk/Source/WebKit/chromium/src/IDBIndexBackendProxy.cpp (122171 => 122172)
--- trunk/Source/WebKit/chromium/src/IDBIndexBackendProxy.cpp 2012-07-10 00:20:51 UTC (rev 122171)
+++ trunk/Source/WebKit/chromium/src/IDBIndexBackendProxy.cpp 2012-07-10 00:41:16 UTC (rev 122172)
@@ -56,26 +56,6 @@
{
}
-String IDBIndexBackendProxy::name()
-{
- return m_webIDBIndex->name();
-}
-
-IDBKeyPath IDBIndexBackendProxy::keyPath()
-{
- return m_webIDBIndex->keyPath();
-}
-
-bool IDBIndexBackendProxy::unique()
-{
- return m_webIDBIndex->unique();
-}
-
-bool IDBIndexBackendProxy::multiEntry()
-{
- return m_webIDBIndex->multiEntry();
-}
-
void IDBIndexBackendProxy::openCursor(PassRefPtr<IDBKeyRange> keyRange, unsigned short direction, PassRefPtr<IDBCallbacks> callbacks, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)
{
// The transaction pointer is guaranteed to be a pointer to a proxy object as, in the renderer,
Modified: trunk/Source/WebKit/chromium/src/IDBIndexBackendProxy.h (122171 => 122172)
--- trunk/Source/WebKit/chromium/src/IDBIndexBackendProxy.h 2012-07-10 00:20:51 UTC (rev 122171)
+++ trunk/Source/WebKit/chromium/src/IDBIndexBackendProxy.h 2012-07-10 00:41:16 UTC (rev 122172)
@@ -42,11 +42,6 @@
static PassRefPtr<IDBIndexBackendInterface> create(PassOwnPtr<WebIDBIndex>);
virtual ~IDBIndexBackendProxy();
- virtual String name();
- virtual WebCore::IDBKeyPath keyPath();
- virtual bool unique();
- virtual bool multiEntry();
-
virtual void openCursor(PassRefPtr<WebCore::IDBKeyRange>, unsigned short direction, PassRefPtr<WebCore::IDBCallbacks>, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);
virtual void openKeyCursor(PassRefPtr<WebCore::IDBKeyRange>, unsigned short direction, PassRefPtr<WebCore::IDBCallbacks>, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);
virtual void count(PassRefPtr<WebCore::IDBKeyRange>, PassRefPtr<WebCore::IDBCallbacks>, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);
Modified: trunk/Source/WebKit/chromium/src/IDBObjectStoreBackendProxy.cpp (122171 => 122172)
--- trunk/Source/WebKit/chromium/src/IDBObjectStoreBackendProxy.cpp 2012-07-10 00:20:51 UTC (rev 122171)
+++ trunk/Source/WebKit/chromium/src/IDBObjectStoreBackendProxy.cpp 2012-07-10 00:41:16 UTC (rev 122172)
@@ -59,26 +59,6 @@
{
}
-String IDBObjectStoreBackendProxy::name() const
-{
- return m_webIDBObjectStore->name();
-}
-
-IDBKeyPath IDBObjectStoreBackendProxy::keyPath() const
-{
- return m_webIDBObjectStore->keyPath();
-}
-
-PassRefPtr<DOMStringList> IDBObjectStoreBackendProxy::indexNames() const
-{
- return m_webIDBObjectStore->indexNames();
-}
-
-bool IDBObjectStoreBackendProxy::autoIncrement() const
-{
- return m_webIDBObjectStore->autoIncrement();
-}
-
void IDBObjectStoreBackendProxy::get(PassRefPtr<IDBKeyRange> keyRange, PassRefPtr<IDBCallbacks> callbacks, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)
{
// The transaction pointer is guaranteed to be a pointer to a proxy object as, in the renderer,
Modified: trunk/Source/WebKit/chromium/src/IDBObjectStoreBackendProxy.h (122171 => 122172)
--- trunk/Source/WebKit/chromium/src/IDBObjectStoreBackendProxy.h 2012-07-10 00:20:51 UTC (rev 122171)
+++ trunk/Source/WebKit/chromium/src/IDBObjectStoreBackendProxy.h 2012-07-10 00:41:16 UTC (rev 122172)
@@ -43,11 +43,6 @@
static PassRefPtr<WebCore::IDBObjectStoreBackendInterface> create(PassOwnPtr<WebIDBObjectStore>);
virtual ~IDBObjectStoreBackendProxy();
- virtual String name() const;
- virtual WebCore::IDBKeyPath keyPath() const;
- virtual PassRefPtr<WebCore::DOMStringList> indexNames() const;
- virtual bool autoIncrement() const;
-
virtual void get(PassRefPtr<WebCore::IDBKeyRange>, PassRefPtr<WebCore::IDBCallbacks>, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);
virtual void put(PassRefPtr<WebCore::SerializedScriptValue>, PassRefPtr<WebCore::IDBKey>, PutMode, PassRefPtr<WebCore::IDBCallbacks>, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);
virtual void deleteFunction(PassRefPtr<WebCore::IDBKeyRange>, PassRefPtr<WebCore::IDBCallbacks>, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);
Modified: trunk/Source/WebKit/chromium/src/IDBTransactionBackendProxy.cpp (122171 => 122172)
--- trunk/Source/WebKit/chromium/src/IDBTransactionBackendProxy.cpp 2012-07-10 00:20:51 UTC (rev 122171)
+++ trunk/Source/WebKit/chromium/src/IDBTransactionBackendProxy.cpp 2012-07-10 00:41:16 UTC (rev 122172)
@@ -62,11 +62,6 @@
return IDBObjectStoreBackendProxy::create(objectStore.release());
}
-unsigned short IDBTransactionBackendProxy::mode() const
-{
- return m_webIDBTransaction->mode();
-}
-
void IDBTransactionBackendProxy::commit()
{
m_webIDBTransaction->commit();
Modified: trunk/Source/WebKit/chromium/src/IDBTransactionBackendProxy.h (122171 => 122172)
--- trunk/Source/WebKit/chromium/src/IDBTransactionBackendProxy.h 2012-07-10 00:20:51 UTC (rev 122171)
+++ trunk/Source/WebKit/chromium/src/IDBTransactionBackendProxy.h 2012-07-10 00:41:16 UTC (rev 122172)
@@ -42,7 +42,11 @@
virtual ~IDBTransactionBackendProxy();
virtual PassRefPtr<WebCore::IDBObjectStoreBackendInterface> objectStore(const String& name, WebCore::ExceptionCode&);
- virtual unsigned short mode() const;
+ virtual unsigned short mode() const
+ {
+ ASSERT_NOT_REACHED();
+ return 0;
+ }
virtual void commit();
virtual void abort();
virtual bool scheduleTask(PassOwnPtr<WebCore::ScriptExecutionContext::Task>, PassOwnPtr<WebCore::ScriptExecutionContext::Task>);
Modified: trunk/Source/WebKit/chromium/src/WebIDBTransactionImpl.cpp (122171 => 122172)
--- trunk/Source/WebKit/chromium/src/WebIDBTransactionImpl.cpp 2012-07-10 00:20:51 UTC (rev 122171)
+++ trunk/Source/WebKit/chromium/src/WebIDBTransactionImpl.cpp 2012-07-10 00:41:16 UTC (rev 122172)
@@ -46,11 +46,6 @@
{
}
-int WebIDBTransactionImpl::mode() const
-{
- return m_backend->mode();
-}
-
WebIDBObjectStore* WebIDBTransactionImpl::objectStore(const WebString& name, ExceptionCode& ec)
{
RefPtr<IDBObjectStoreBackendInterface> objectStore = m_backend->objectStore(name, ec);
Modified: trunk/Source/WebKit/chromium/src/WebIDBTransactionImpl.h (122171 => 122172)
--- trunk/Source/WebKit/chromium/src/WebIDBTransactionImpl.h 2012-07-10 00:20:51 UTC (rev 122171)
+++ trunk/Source/WebKit/chromium/src/WebIDBTransactionImpl.h 2012-07-10 00:41:16 UTC (rev 122172)
@@ -41,7 +41,6 @@
WebIDBTransactionImpl(WTF::PassRefPtr<WebCore::IDBTransactionBackendInterface>);
virtual ~WebIDBTransactionImpl();
- virtual int mode() const;
virtual WebIDBObjectStore* objectStore(const WebString& name, WebExceptionCode&);
virtual void commit();
virtual void abort();
