Changeset 122172 in webkit


Ignore:
Timestamp:
Jul 9, 2012 5:41:16 PM (12 years ago)
Author:
jsbell@chromium.org
Message:

IndexedDB: Remove obsolete accessor plumbing
​https://bugs.webkit.org/show_bug.cgi?id=90812

Reviewed by Tony Chang.

Source/WebCore:

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.

Source/WebKit/chromium:

  • 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.
Location:
trunk/Source
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r122170 r122172  
     12012-07-09  Joshua Bell  <jsbell@chromium.org>
     2
     3        IndexedDB: Remove obsolete accessor plumbing
     4        https://bugs.webkit.org/show_bug.cgi?id=90812
     5
     6        Reviewed by Tony Chang.
     7
     8        No new tests - just deleting code.
     9
     10        * Modules/indexeddb/IDBTransaction.cpp:
     11        (WebCore::IDBTransaction::IDBTransaction): Since backend mode() is disconnected, can no
     12        longer assert that front-end/back-end modes match; not worth it to keeping the plumbing.
     13
    1142012-07-09  Dana Jansens  <danakj@chromium.org>
    215

  • trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp

    r121492 r122172  
    9090{
    9191    ASSERT(m_backend);
    92     ASSERT(m_mode == m_backend->mode());
    9392
    9493    if (mode == VERSION_CHANGE) {

  • trunk/Source/WebKit/chromium/ChangeLog

    r122171 r122172  
     12012-07-09  Joshua Bell  <jsbell@chromium.org>
     2
     3        IndexedDB: Remove obsolete accessor plumbing
     4        https://bugs.webkit.org/show_bug.cgi?id=90812
     5
     6        Reviewed by Tony Chang.
     7
     8        * public/WebIDBCursor.h: Remove direction.
     9        * public/WebIDBDatabase.h: Remove name, version, objectStoreNames;
     10        (WebKit::WebIDBDatabase::metadata):
     11        * public/WebIDBIndex.h: Remove name, keyPath, unique, multiEntry;
     12        * public/WebIDBObjectStore.h: Remove name, keyPath, indexNames, autoIncrement;
     13        * src/IDBDatabaseBackendProxy.cpp: Remove plumbing.
     14        * src/IDBDatabaseBackendProxy.h: Remove plumbing.
     15        (IDBDatabaseBackendProxy):
     16        * src/IDBIndexBackendProxy.cpp: Remove plumbing.
     17        * src/IDBIndexBackendProxy.h: Remove plumbing.
     18        (IDBIndexBackendProxy):
     19        * src/IDBObjectStoreBackendProxy.cpp: Remove plumbing.
     20        * src/IDBObjectStoreBackendProxy.h: Remove plumbing.
     21        (IDBObjectStoreBackendProxy):
     22        * src/IDBTransactionBackendProxy.cpp: Remove plumbing.
     23        * src/IDBTransactionBackendProxy.h: Assert stub is not used - only needed
     24        by real IDBTransactionBackendImpl
     25        (WebKit::IDBTransactionBackendProxy::mode):
     26        * src/WebIDBTransactionImpl.cpp: Remove plumbing.
     27        * src/WebIDBTransactionImpl.h: Remove plumbing.
     28
    1292012-07-09  Sheriff Bot  <webkit.review.bot@gmail.com>
    230

  • trunk/Source/WebKit/chromium/public/WebIDBCursor.h

    r114647 r122172  
    4141    virtual ~WebIDBCursor() { }
    4242
    43     virtual unsigned short direction() const
    44     {
    45         WEBKIT_ASSERT_NOT_REACHED();
    46         return 0;
    47     }
    4843    virtual WebIDBKey key() const
    4944    {

  • trunk/Source/WebKit/chromium/public/WebIDBDatabase.h

    r120753 r122172  
    5151        return WebIDBMetadata();
    5252    }
    53     virtual WebString name() const
    54     {
    55         WEBKIT_ASSERT_NOT_REACHED();
    56         return WebString();
    57     }
    58     virtual WebString version() const
    59     {
    60         WEBKIT_ASSERT_NOT_REACHED();
    61         return WebString();
    62     }
    63     virtual WebDOMStringList objectStoreNames() const
    64     {
    65         WEBKIT_ASSERT_NOT_REACHED();
    66         return WebDOMStringList();
    67     }
    6853    virtual WebIDBObjectStore* createObjectStore(const WebString&, const WebIDBKeyPath&, bool, const WebIDBTransaction&, WebExceptionCode&)
    6954    {

  • trunk/Source/WebKit/chromium/public/WebIDBIndex.h

    r117817 r122172  
    4343    virtual ~WebIDBIndex() { }
    4444
    45     virtual WebString name() const
    46     {
    47         WEBKIT_ASSERT_NOT_REACHED();
    48         return WebString();
    49     }
    50     virtual WebIDBKeyPath keyPath() const
    51     {
    52         WEBKIT_ASSERT_NOT_REACHED();
    53         return WebIDBKeyPath::createNull();
    54     }
    55     virtual bool unique() const
    56     {
    57         WEBKIT_ASSERT_NOT_REACHED();
    58         return false;
    59     }
    60     virtual bool multiEntry() const
    61     {
    62         WEBKIT_ASSERT_NOT_REACHED();
    63         return false;
    64     }
    65 
    6645    virtual void openObjectCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
    6746    virtual void openKeyCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }

  • trunk/Source/WebKit/chromium/public/WebIDBObjectStore.h

    r120888 r122172  
    4444    virtual ~WebIDBObjectStore() { }
    4545
    46     virtual WebString name() const
    47     {
    48         WEBKIT_ASSERT_NOT_REACHED();
    49         return WebString();
    50     }
    51     virtual WebIDBKeyPath keyPath() const
    52     {
    53         WEBKIT_ASSERT_NOT_REACHED();
    54         return WebIDBKeyPath::createNull();
    55     }
    56     virtual WebDOMStringList indexNames() const
    57     {
    58         WEBKIT_ASSERT_NOT_REACHED();
    59         return WebDOMStringList();
    60     }
    61     virtual bool autoIncrement() const
    62     {
    63         WEBKIT_ASSERT_NOT_REACHED();
    64         return false;
    65     }
    66 
    6746    virtual void get(const WebIDBKeyRange&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
    6847
    … …  
    7453
    7554    virtual void put(const WebSerializedScriptValue&, const WebIDBKey&, PutMode, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
    76     // FIXME: Remove the following overload when all callers are updated.
    77     virtual void deleteFunction(const WebIDBKey&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
    7855    virtual void deleteFunction(const WebIDBKeyRange&, WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }
    7956    virtual void clear(WebIDBCallbacks*, const WebIDBTransaction&, WebExceptionCode&) { WEBKIT_ASSERT_NOT_REACHED(); }

  • trunk/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.cpp

    r121059 r122172  
    6767}
    6868
    69 String IDBDatabaseBackendProxy::name() const
    70 {
    71     return m_webIDBDatabase->name();
    72 }
    73 
    74 String IDBDatabaseBackendProxy::version() const
    75 {
    76     return m_webIDBDatabase->version();
    77 }
    78 
    79 PassRefPtr<DOMStringList> IDBDatabaseBackendProxy::objectStoreNames() const
    80 {
    81     return m_webIDBDatabase->objectStoreNames();
    82 }
    83 
    8469PassRefPtr<IDBObjectStoreBackendInterface> IDBDatabaseBackendProxy::createObjectStore(const String& name, const IDBKeyPath& keyPath, bool autoIncrement, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)
    8570{

  • trunk/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.h

    r121059 r122172  
    4444
    4545    virtual WebCore::IDBDatabaseMetadata metadata() const;
    46     virtual String name() const;
    47     virtual String version() const;
    48     virtual PassRefPtr<WebCore::DOMStringList> objectStoreNames() const;
    4946
    5047    virtual PassRefPtr<WebCore::IDBObjectStoreBackendInterface> createObjectStore(const String& name, const WebCore::IDBKeyPath&, bool autoIncrement, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);

  • trunk/Source/WebKit/chromium/src/IDBIndexBackendProxy.cpp

    r117817 r122172  
    5757}
    5858
    59 String IDBIndexBackendProxy::name()
    60 {
    61     return m_webIDBIndex->name();
    62 }
    63 
    64 IDBKeyPath IDBIndexBackendProxy::keyPath()
    65 {
    66     return m_webIDBIndex->keyPath();
    67 }
    68 
    69 bool IDBIndexBackendProxy::unique()
    70 {
    71     return m_webIDBIndex->unique();
    72 }
    73 
    74 bool IDBIndexBackendProxy::multiEntry()
    75 {
    76     return m_webIDBIndex->multiEntry();
    77 }
    78 
    7959void IDBIndexBackendProxy::openCursor(PassRefPtr<IDBKeyRange> keyRange, unsigned short direction, PassRefPtr<IDBCallbacks> callbacks, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)
    8060{

  • trunk/Source/WebKit/chromium/src/IDBIndexBackendProxy.h

    r117817 r122172  
    4343    virtual ~IDBIndexBackendProxy();
    4444
    45     virtual String name();
    46     virtual WebCore::IDBKeyPath keyPath();
    47     virtual bool unique();
    48     virtual bool multiEntry();
    49 
    5045    virtual void openCursor(PassRefPtr<WebCore::IDBKeyRange>, unsigned short direction, PassRefPtr<WebCore::IDBCallbacks>, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);
    5146    virtual void openKeyCursor(PassRefPtr<WebCore::IDBKeyRange>, unsigned short direction, PassRefPtr<WebCore::IDBCallbacks>, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);

  • trunk/Source/WebKit/chromium/src/IDBObjectStoreBackendProxy.cpp

    r120888 r122172  
    5858IDBObjectStoreBackendProxy::~IDBObjectStoreBackendProxy()
    5959{
    60 }
    61 
    62 String IDBObjectStoreBackendProxy::name() const
    63 {
    64     return m_webIDBObjectStore->name();
    65 }
    66 
    67 IDBKeyPath IDBObjectStoreBackendProxy::keyPath() const
    68 {
    69     return m_webIDBObjectStore->keyPath();
    70 }
    71 
    72 PassRefPtr<DOMStringList> IDBObjectStoreBackendProxy::indexNames() const
    73 {
    74     return m_webIDBObjectStore->indexNames();
    75 }
    76 
    77 bool IDBObjectStoreBackendProxy::autoIncrement() const
    78 {
    79     return m_webIDBObjectStore->autoIncrement();
    8060}
    8161

  • trunk/Source/WebKit/chromium/src/IDBObjectStoreBackendProxy.h

    r120888 r122172  
    4444    virtual ~IDBObjectStoreBackendProxy();
    4545
    46     virtual String name() const;
    47     virtual WebCore::IDBKeyPath keyPath() const;
    48     virtual PassRefPtr<WebCore::DOMStringList> indexNames() const;
    49     virtual bool autoIncrement() const;
    50 
    5146    virtual void get(PassRefPtr<WebCore::IDBKeyRange>, PassRefPtr<WebCore::IDBCallbacks>, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);
    5247    virtual void put(PassRefPtr<WebCore::SerializedScriptValue>, PassRefPtr<WebCore::IDBKey>, PutMode, PassRefPtr<WebCore::IDBCallbacks>, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&);

  • trunk/Source/WebKit/chromium/src/IDBTransactionBackendProxy.cpp

    r121492 r122172  
    6363}
    6464
    65 unsigned short IDBTransactionBackendProxy::mode() const
    66 {
    67     return m_webIDBTransaction->mode();
    68 }
    69 
    7065void IDBTransactionBackendProxy::commit()
    7166{

  • trunk/Source/WebKit/chromium/src/IDBTransactionBackendProxy.h

    r121492 r122172  
    4343
    4444    virtual PassRefPtr<WebCore::IDBObjectStoreBackendInterface> objectStore(const String& name, WebCore::ExceptionCode&);
    45     virtual unsigned short mode() const;
     45    virtual unsigned short mode() const
     46    {
     47        ASSERT_NOT_REACHED();
     48        return 0;
     49    }
    4650    virtual void commit();
    4751    virtual void abort();

  • trunk/Source/WebKit/chromium/src/WebIDBTransactionImpl.cpp

    r121492 r122172  
    4747}
    4848
    49 int WebIDBTransactionImpl::mode() const
    50 {
    51     return m_backend->mode();
    52 }
    53 
    5449WebIDBObjectStore* WebIDBTransactionImpl::objectStore(const WebString& name, ExceptionCode& ec)
    5550{

  • trunk/Source/WebKit/chromium/src/WebIDBTransactionImpl.h

    r121492 r122172  
    4242    virtual ~WebIDBTransactionImpl(); 
    4343
    44     virtual int mode() const;
    4544    virtual WebIDBObjectStore* objectStore(const WebString& name, WebExceptionCode&);
    4645    virtual void commit();
Note: See TracChangeset for help on using the changeset viewer.