Changeset 141523 in webkit


Ignore:
Timestamp:
Jan 31, 2013, 7:01:27 PM (13 years ago)
Author:
alecflett@chromium.org
Message:

IndexedDB: remove old transaction backend bootstrap code
​https://bugs.webkit.org/show_bug.cgi?id=103923

Reviewed by Dimitri Glazkov.

Source/WebCore:

Finally remove all leftover code from the IndexedDB "giant
async refactor of 2012." This includes removal of all
IDBTransaction* interfaces that were shared between
the frontend and backend and a few straggling methods
like onUpgradeNeeded and onSuccess that were left from
the last stage of refactoring.

  • Modules/indexeddb/IDBCallbacks.h:
  • Modules/indexeddb/IDBDatabaseBackendImpl.cpp:
  • Modules/indexeddb/IDBDatabaseBackendImpl.h:

(WebCore):
(WebCore::IDBDatabaseBackendImpl::metadata):
(IDBDatabaseBackendImpl):

  • Modules/indexeddb/IDBDatabaseBackendInterface.h:

(WebCore):
(IDBDatabaseBackendInterface):

  • Modules/indexeddb/IDBObjectStoreBackendImpl.h:

(WebCore):

  • Modules/indexeddb/IDBTransaction.h:

(WebCore):
(IDBTransaction):

  • Modules/indexeddb/IDBTransactionBackendImpl.h:

(WebCore):
(IDBTransactionBackendImpl):

  • Modules/indexeddb/IDBTransactionBackendInterface.h: Removed.
  • Modules/indexeddb/IDBTransactionCallbacks.h: Removed.
  • Modules/indexeddb/IDBTransactionCoordinator.h:

(WebCore):

  • Target.pri:
  • WebCore.gypi:
  • WebCore.xcodeproj/project.pbxproj:

Source/WebKit/chromium:

Remove all deprecated WebKit APIs from
the IDB backend.

  • WebKit.gyp:
  • public/WebIDBCallbacks.h:

(WebKit):

  • public/WebIDBDatabase.h:

(WebKit):

  • public/WebIDBTransaction.h: Removed.
  • public/WebIDBTransactionCallbacks.h: Removed.
  • src/AssertMatchingEnums.cpp:
  • src/IDBCallbacksProxy.cpp:
  • src/IDBDatabaseBackendProxy.cpp:
  • src/IDBDatabaseBackendProxy.h:

(IDBDatabaseBackendProxy):

  • src/IDBTransactionBackendProxy.cpp: Removed.
  • src/IDBTransactionBackendProxy.h: Removed.
  • src/IDBTransactionCallbacksProxy.cpp: Removed.
  • src/IDBTransactionCallbacksProxy.h: Removed.
  • src/WebIDBCallbacksImpl.cpp:
  • src/WebIDBDatabaseImpl.cpp:

(WebKit):

  • src/WebIDBDatabaseImpl.h:

(WebKit):
(WebIDBDatabaseImpl):

  • src/WebIDBTransactionCallbacksImpl.cpp: Removed.
  • src/WebIDBTransactionCallbacksImpl.h: Removed.
  • src/WebIDBTransactionImpl.cpp: Removed.
  • src/WebIDBTransactionImpl.h: Removed.
  • tests/IDBAbortOnCorruptTest.cpp:
  • tests/IDBDatabaseBackendTest.cpp:
Location:
trunk/Source
Files:
12 deleted
25 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r141518 r141523  
     12013-01-31  Alec Flett  <alecflett@chromium.org>
     2
     3        IndexedDB: remove old transaction backend bootstrap code
     4        https://bugs.webkit.org/show_bug.cgi?id=103923
     5
     6        Reviewed by Dimitri Glazkov.
     7
     8        Finally remove all leftover code from the IndexedDB "giant
     9        async refactor of 2012." This includes removal of all
     10        IDBTransaction* interfaces that were shared between
     11        the frontend and backend and a few straggling methods
     12        like onUpgradeNeeded and onSuccess that were left from
     13        the last stage of refactoring.
     14
     15        * Modules/indexeddb/IDBCallbacks.h:
     16        * Modules/indexeddb/IDBDatabaseBackendImpl.cpp:
     17        * Modules/indexeddb/IDBDatabaseBackendImpl.h:
     18        (WebCore):
     19        (WebCore::IDBDatabaseBackendImpl::metadata):
     20        (IDBDatabaseBackendImpl):
     21        * Modules/indexeddb/IDBDatabaseBackendInterface.h:
     22        (WebCore):
     23        (IDBDatabaseBackendInterface):
     24        * Modules/indexeddb/IDBObjectStoreBackendImpl.h:
     25        (WebCore):
     26        * Modules/indexeddb/IDBTransaction.h:
     27        (WebCore):
     28        (IDBTransaction):
     29        * Modules/indexeddb/IDBTransactionBackendImpl.h:
     30        (WebCore):
     31        (IDBTransactionBackendImpl):
     32        * Modules/indexeddb/IDBTransactionBackendInterface.h: Removed.
     33        * Modules/indexeddb/IDBTransactionCallbacks.h: Removed.
     34        * Modules/indexeddb/IDBTransactionCoordinator.h:
     35        (WebCore):
     36        * Target.pri:
     37        * WebCore.gypi:
     38        * WebCore.xcodeproj/project.pbxproj:
     39
    1402013-01-31  Kentaro Hara  <haraken@chromium.org>
    241

  • trunk/Source/WebCore/Modules/indexeddb/IDBCallbacks.h

    r141142 r141523  
    3434#include "IDBKey.h"
    3535#include "IDBKeyPath.h"
    36 #include "IDBTransactionBackendInterface.h"
    3736#include "SerializedScriptValue.h"
    3837#include <wtf/RefCounted.h>

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

    r141338 r141523  
    549549}
    550550
    551 IDBDatabaseMetadata IDBDatabaseBackendImpl::metadata() const
    552 {
    553     return m_metadata;
    554 }
    555 
    556551void IDBDatabaseBackendImpl::createObjectStore(int64_t transactionId, int64_t objectStoreId, const String& name, const IDBKeyPath& keyPath, bool autoIncrement)
    557552{
    … …  
    11681163}
    11691164
    1170 // FIXME: Remove this method in https://bugs.webkit.org/show_bug.cgi?id=103923.
    1171 PassRefPtr<IDBTransactionBackendInterface> IDBDatabaseBackendImpl::createTransaction(int64_t transactionId, const Vector<int64_t>& objectStoreIds, IDBTransaction::Mode mode)
    1172 {
    1173     ASSERT_NOT_REACHED();
    1174     return 0;
    1175 }
    1176 
    11771165void IDBDatabaseBackendImpl::createTransaction(int64_t transactionId, PassRefPtr<IDBDatabaseCallbacks> callbacks, const Vector<int64_t>& objectStoreIds, unsigned short mode)
    11781166{

  • trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.h

    r141128 r141523  
    4242class IDBFactoryBackendImpl;
    4343class IDBTransactionBackendImpl;
    44 class IDBTransactionBackendInterface;
    4544class IDBTransactionCoordinator;
    4645
    … …  
    6160    void openConnection(PassRefPtr<IDBCallbacks>, PassRefPtr<IDBDatabaseCallbacks>, int64_t transactionId, int64_t version);
    6261    void deleteDatabase(PassRefPtr<IDBCallbacks>);
     62    const IDBDatabaseMetadata& metadata() const { return m_metadata; }
    6363
    6464    // IDBDatabaseBackendInterface
    65     virtual IDBDatabaseMetadata metadata() const;
    6665    virtual void createObjectStore(int64_t transactionId, int64_t objectStoreId, const String& name, const IDBKeyPath&, bool autoIncrement);
    6766    virtual void deleteObjectStore(int64_t transactionId, int64_t objectStoreId);
    68     // FIXME: Remove this method in https://bugs.webkit.org/show_bug.cgi?id=103923.
    69     virtual PassRefPtr<IDBTransactionBackendInterface> createTransaction(int64_t transactionId, const Vector<int64_t>& objectStoreIds, IDBTransaction::Mode);
    7067    virtual void createTransaction(int64_t transactionId, PassRefPtr<IDBDatabaseCallbacks>, const Vector<int64_t>& objectStoreIds, unsigned short mode);
    7168    virtual void close(PassRefPtr<IDBDatabaseCallbacks>);

  • trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendInterface.h

    r141128 r141523  
    4141class IDBKeyPath;
    4242class IDBKeyRange;
    43 class IDBTransactionBackendInterface;
    4443struct IDBDatabaseMetadata;
    4544
    … …  
    5352    virtual ~IDBDatabaseBackendInterface() { }
    5453
    55     virtual IDBDatabaseMetadata metadata() const = 0;
    56 
    5754    virtual void createObjectStore(int64_t transactionId, int64_t objectStoreId, const String& name, const IDBKeyPath&, bool autoIncrement) = 0;
    5855    virtual void deleteObjectStore(int64_t transactionId, int64_t objectStoreId) = 0;
    59     virtual PassRefPtr<IDBTransactionBackendInterface> createTransaction(int64_t transactionId, const Vector<int64_t>& objectStoreIds, IDBTransaction::Mode) = 0;
    6056    virtual void createTransaction(int64_t transactionId, PassRefPtr<IDBDatabaseCallbacks>, const Vector<int64_t>& objectStoreIds, unsigned short mode) = 0;
    6157    virtual void close(PassRefPtr<IDBDatabaseCallbacks>) = 0;

  • trunk/Source/WebCore/Modules/indexeddb/IDBObjectStoreBackendImpl.h

    r139666 r141523  
    4040class IDBDatabaseBackendImpl;
    4141class IDBTransactionBackendImpl;
    42 class IDBTransactionBackendInterface;
    4342struct IDBObjectStoreMetadata;
    4443

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

    r140219 r141523  
    3636#include "EventTarget.h"
    3737#include "IDBMetadata.h"
    38 #include "IDBTransactionCallbacks.h"
    3938#include "ScriptWrappable.h"
    4039#include <wtf/HashSet.h>
    … …  
    4544class IDBCursor;
    4645class IDBDatabase;
     46class IDBDatabaseBackendInterface;
     47class IDBDatabaseError;
    4748class IDBObjectStore;
    4849class IDBOpenDBRequest;
    49 class IDBDatabaseBackendInterface;
    5050struct IDBObjectStoreMetadata;
    5151
    52 class IDBTransaction : public ScriptWrappable, public IDBTransactionCallbacks, public EventTarget, public ActiveDOMObject {
     52class IDBTransaction : public ScriptWrappable, public RefCounted<IDBTransaction>, public EventTarget, public ActiveDOMObject {
    5353public:
    5454    enum Mode {
    … …  
    108108    DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
    109109
    110     // IDBTransactionCallbacks
    111110    virtual void onAbort(PassRefPtr<IDBDatabaseError>);
    112111    virtual void onComplete();
    … …  
    124123    virtual void stop() OVERRIDE;
    125124
    126     using RefCounted<IDBTransactionCallbacks>::ref;
    127     using RefCounted<IDBTransactionCallbacks>::deref;
     125    using RefCounted<IDBTransaction>::ref;
     126    using RefCounted<IDBTransaction>::deref;
    128127
    129128private:

  • trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendImpl.h

    r141332 r141523  
    3030
    3131#include "IDBBackingStore.h"
     32#include "IDBDatabaseBackendInterface.h"
    3233#include "IDBDatabaseError.h"
    3334#include "IDBTransaction.h"
    34 #include "IDBTransactionBackendInterface.h"
    35 #include "IDBTransactionCallbacks.h"
    3635#include "Timer.h"
    3736#include <wtf/Deque.h>
    … …  
    4241
    4342class IDBDatabaseBackendImpl;
     43class IDBCursorBackendImpl;
     44class IDBDatabaseCallbacks;
    4445
    45 class IDBTransactionBackendImpl : public IDBTransactionBackendInterface {
     46class IDBTransactionBackendImpl : public RefCounted<IDBTransactionBackendImpl> {
    4647public:
    4748    static PassRefPtr<IDBTransactionBackendImpl> create(int64_t transactionId, PassRefPtr<IDBDatabaseCallbacks>, const Vector<int64_t>&, IDBTransaction::Mode, IDBDatabaseBackendImpl*);
    48     static IDBTransactionBackendImpl* from(IDBTransactionBackendInterface* interface)
    49     {
    50         return static_cast<IDBTransactionBackendImpl*>(interface);
    51     }
    5249    virtual ~IDBTransactionBackendImpl();
    5350
    54     // IDBTransactionBackendInterface
    5551    virtual void abort();
    5652    void commit();
    57     virtual void setCallbacks(IDBTransactionCallbacks* callbacks) { }
    5853
    5954    class Operation {

  • trunk/Source/WebCore/Modules/indexeddb/IDBTransactionCoordinator.h

    r136782 r141523  
    3636
    3737class IDBTransactionBackendImpl;
    38 class IDBTransactionCallbacks;
    3938class IDBDatabaseBackendImpl;
    4039

  • trunk/Source/WebCore/Target.pri

    r141494 r141523  
    30663066        Modules/indexeddb/IDBObjectStoreBackendImpl.h \
    30673067        Modules/indexeddb/IDBRequest.h \
    3068         Modules/indexeddb/IDBTransaction.h \
    3069         Modules/indexeddb/IDBTransactionBackendInterface.h
     3068        Modules/indexeddb/IDBTransaction.h
    30703069
    30713070    SOURCES += \

  • trunk/Source/WebCore/WebCore.gypi

    r141494 r141523  
    770770            'Modules/indexeddb/IDBTransactionBackendImpl.cpp',
    771771            'Modules/indexeddb/IDBTransactionBackendImpl.h',
    772             'Modules/indexeddb/IDBTransactionBackendInterface.h',
    773             'Modules/indexeddb/IDBTransactionCallbacks.h',
    774772            'Modules/indexeddb/IDBTransactionCoordinator.cpp',
    775773            'Modules/indexeddb/IDBTransactionCoordinator.h',

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r141494 r141523  
    35183518                9712A5F815004EDA0048AF10 /* IDBTransactionBackendImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9712A59F15004EDA0048AF10 /* IDBTransactionBackendImpl.cpp */; };
    35193519                9712A5F915004EDA0048AF10 /* IDBTransactionBackendImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 9712A5A015004EDA0048AF10 /* IDBTransactionBackendImpl.h */; };
    3520                 9712A5FA15004EDA0048AF10 /* IDBTransactionBackendInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 9712A5A115004EDA0048AF10 /* IDBTransactionBackendInterface.h */; };
    35213520                9712A5FB15004EDA0048AF10 /* IDBTransactionCallbacks.h in Headers */ = {isa = PBXBuildFile; fileRef = 9712A5A215004EDA0048AF10 /* IDBTransactionCallbacks.h */; };
    35223521                9712A5FC15004EDA0048AF10 /* IDBTransactionCoordinator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9712A5A315004EDA0048AF10 /* IDBTransactionCoordinator.cpp */; };
    … …  
    1090810907                9712A59F15004EDA0048AF10 /* IDBTransactionBackendImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IDBTransactionBackendImpl.cpp; path = Modules/indexeddb/IDBTransactionBackendImpl.cpp; sourceTree = "<group>"; };
    1090910908                9712A5A015004EDA0048AF10 /* IDBTransactionBackendImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IDBTransactionBackendImpl.h; path = Modules/indexeddb/IDBTransactionBackendImpl.h; sourceTree = "<group>"; };
    10910                 9712A5A115004EDA0048AF10 /* IDBTransactionBackendInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IDBTransactionBackendInterface.h; path = Modules/indexeddb/IDBTransactionBackendInterface.h; sourceTree = "<group>"; };
    1091110909                9712A5A215004EDA0048AF10 /* IDBTransactionCallbacks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IDBTransactionCallbacks.h; path = Modules/indexeddb/IDBTransactionCallbacks.h; sourceTree = "<group>"; };
    1091210910                9712A5A315004EDA0048AF10 /* IDBTransactionCoordinator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IDBTransactionCoordinator.cpp; path = Modules/indexeddb/IDBTransactionCoordinator.cpp; sourceTree = "<group>"; };
    … …  
    1832418322                                9712A59F15004EDA0048AF10 /* IDBTransactionBackendImpl.cpp */,
    1832518323                                9712A5A015004EDA0048AF10 /* IDBTransactionBackendImpl.h */,
    18326                                 9712A5A115004EDA0048AF10 /* IDBTransactionBackendInterface.h */,
    1832718324                                9712A5A215004EDA0048AF10 /* IDBTransactionCallbacks.h */,
    1832818325                                9712A5A315004EDA0048AF10 /* IDBTransactionCoordinator.cpp */,
    … …  
    2442324420                                9712A5F615004EDA0048AF10 /* IDBTransaction.h in Headers */,
    2442424421                                9712A5F915004EDA0048AF10 /* IDBTransactionBackendImpl.h in Headers */,
    24425                                 9712A5FA15004EDA0048AF10 /* IDBTransactionBackendInterface.h in Headers */,
    2442624422                                9712A5FB15004EDA0048AF10 /* IDBTransactionCallbacks.h in Headers */,
    2442724423                                9712A5FD15004EDA0048AF10 /* IDBTransactionCoordinator.h in Headers */,

  • trunk/Source/WebKit/chromium/ChangeLog

    r141519 r141523  
     12013-01-31  Alec Flett  <alecflett@chromium.org>
     2
     3        IndexedDB: remove old transaction backend bootstrap code
     4        https://bugs.webkit.org/show_bug.cgi?id=103923
     5
     6        Reviewed by Dimitri Glazkov.
     7
     8        Remove all deprecated WebKit APIs from
     9        the IDB backend.
     10
     11        * WebKit.gyp:
     12        * public/WebIDBCallbacks.h:
     13        (WebKit):
     14        * public/WebIDBDatabase.h:
     15        (WebKit):
     16        * public/WebIDBTransaction.h: Removed.
     17        * public/WebIDBTransactionCallbacks.h: Removed.
     18        * src/AssertMatchingEnums.cpp:
     19        * src/IDBCallbacksProxy.cpp:
     20        * src/IDBDatabaseBackendProxy.cpp:
     21        * src/IDBDatabaseBackendProxy.h:
     22        (IDBDatabaseBackendProxy):
     23        * src/IDBTransactionBackendProxy.cpp: Removed.
     24        * src/IDBTransactionBackendProxy.h: Removed.
     25        * src/IDBTransactionCallbacksProxy.cpp: Removed.
     26        * src/IDBTransactionCallbacksProxy.h: Removed.
     27        * src/WebIDBCallbacksImpl.cpp:
     28        * src/WebIDBDatabaseImpl.cpp:
     29        (WebKit):
     30        * src/WebIDBDatabaseImpl.h:
     31        (WebKit):
     32        (WebIDBDatabaseImpl):
     33        * src/WebIDBTransactionCallbacksImpl.cpp: Removed.
     34        * src/WebIDBTransactionCallbacksImpl.h: Removed.
     35        * src/WebIDBTransactionImpl.cpp: Removed.
     36        * src/WebIDBTransactionImpl.h: Removed.
     37        * tests/IDBAbortOnCorruptTest.cpp:
     38        * tests/IDBDatabaseBackendTest.cpp:
     39
    1402013-01-31  Rouslan Solomakhin  <rouslan@chromium.org>
    241

  • trunk/Source/WebKit/chromium/WebKit.gyp

    r141474 r141523  
    189189                'public/WebIDBKeyRange.h',
    190190                'public/WebIDBMetadata.h',
    191                 'public/WebIDBTransaction.h',
    192                 'public/WebIDBTransactionCallbacks.h',
    193191                'public/WebIconLoadingCompletion.h',
    194192                'public/WebIconURL.h',
    … …  
    376374                'src/IDBFactoryBackendProxy.cpp',
    377375                'src/IDBFactoryBackendProxy.h',
    378                 'src/IDBTransactionBackendProxy.cpp',
    379                 'src/IDBTransactionBackendProxy.h',
    380                 'src/IDBTransactionCallbacksProxy.cpp',
    381                 'src/IDBTransactionCallbacksProxy.h',
    382376                'src/InspectorClientImpl.cpp',
    383377                'src/InspectorClientImpl.h',
    … …  
    516510                'src/WebIDBKeyRange.cpp',
    517511                'src/WebIDBMetadata.cpp',
    518                 'src/WebIDBTransactionImpl.cpp',
    519                 'src/WebIDBTransactionImpl.h',
    520                 'src/WebIDBTransactionCallbacksImpl.cpp',
    521                 'src/WebIDBTransactionCallbacksImpl.h',
    522512                'src/WebImageDecoder.cpp',
    523513                'src/WebImageSkia.cpp',

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

    r141142 r141523  
    3939class WebIDBKeyPath;
    4040class WebIDBIndex;
    41 class WebIDBTransaction;
    4241class WebSerializedScriptValue;
    4342struct WebIDBMetadata;
    … …  
    6463    virtual void onBlocked(long long oldVersion) { WEBKIT_ASSERT_NOT_REACHED(); }
    6564    virtual void onSuccessWithPrefetch(const WebVector<WebIDBKey>& keys, const WebVector<WebIDBKey>& primaryKeys, const WebVector<WebSerializedScriptValue>& values) { WEBKIT_ASSERT_NOT_REACHED(); }
    66     virtual void onUpgradeNeeded(long long oldVersion, WebIDBTransaction*, WebIDBDatabase*) { WEBKIT_ASSERT_NOT_REACHED(); }
    6765    virtual void onUpgradeNeeded(long long oldVersion, WebIDBDatabase*, const WebIDBMetadata&) { WEBKIT_ASSERT_NOT_REACHED(); }
    6866};

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

    r141128 r141523  
    3131#include "WebExceptionCode.h"
    3232#include "WebIDBMetadata.h"
    33 #include "WebIDBTransaction.h"
    3433
    3534namespace WebKit {
    … …  
    4241class WebIDBKeyPath;
    4342class WebIDBKeyRange;
    44 class WebIDBTransaction;
    4543
    4644// See comment in WebIDBFactory for a high level overview of these classes.
    … …  
    4947    virtual ~WebIDBDatabase() { }
    5048
    51     virtual WebIDBMetadata metadata() const
    52     {
    53         WEBKIT_ASSERT_NOT_REACHED();
    54         return WebIDBMetadata();
    55     }
    5649    virtual void createObjectStore(long long transactionId, long long objectStoreId, const WebString& name, const WebIDBKeyPath&, bool autoIncrement) { WEBKIT_ASSERT_NOT_REACHED(); }
    5750    virtual void deleteObjectStore(long long transactionId, long long objectStoreId) { WEBKIT_ASSERT_NOT_REACHED(); }
    58     // FIXME: Remove this method in https://bugs.webkit.org/show_bug.cgi?id=103923.
    59     virtual WebIDBTransaction* createTransaction(long long id, const WebVector<long long>&, unsigned short mode) { WEBKIT_ASSERT_NOT_REACHED(); return 0; }
    6051    virtual void createTransaction(long long id, WebIDBDatabaseCallbacks* callbacks, const WebVector<long long>&, unsigned short mode) { WEBKIT_ASSERT_NOT_REACHED(); }
    6152    virtual void close() { WEBKIT_ASSERT_NOT_REACHED(); }

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

    r141234 r141523  
    5555#include "HTMLInputElement.h"
    5656#include "IDBCursor.h"
     57#include "IDBDatabaseBackendInterface.h"
    5758#include "IDBDatabaseException.h"
    5859#include "IDBFactoryBackendInterface.h"
    … …  
    6061#include "IDBKeyPath.h"
    6162#include "IDBMetadata.h"
    62 #include "IDBTransactionBackendInterface.h"
    6363#include "IconURL.h"
    6464#include "MediaPlayer.h"
    … …  
    9696#include "WebGeolocationPosition.h"
    9797#include "WebIDBCursor.h"
     98#include "WebIDBDatabase.h"
    9899#include "WebIDBDatabaseException.h"
    99100#include "WebIDBFactory.h"
    … …  
    101102#include "WebIDBKeyPath.h"
    102103#include "WebIDBMetadata.h"
    103 #include "WebIDBTransaction.h"
    104104#include "WebIconURL.h"
    105105#include "WebInputElement.h"
    … …  
    506506COMPILE_ASSERT_MATCHING_ENUM(WebIDBCursor::PrevNoDuplicate, IDBCursor::PREV_NO_DUPLICATE);
    507507
    508 COMPILE_ASSERT_MATCHING_ENUM(WebIDBTransaction::PreemptiveTask, IDBDatabaseBackendInterface::PreemptiveTask);
    509 COMPILE_ASSERT_MATCHING_ENUM(WebIDBTransaction::NormalTask, IDBDatabaseBackendInterface::NormalTask);
     508COMPILE_ASSERT_MATCHING_ENUM(WebIDBDatabase::PreemptiveTask, IDBDatabaseBackendInterface::PreemptiveTask);
     509COMPILE_ASSERT_MATCHING_ENUM(WebIDBDatabase::NormalTask, IDBDatabaseBackendInterface::NormalTask);
    510510#endif
    511511

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

    r141438 r141523  
    3939#include "IDBDatabaseError.h"
    4040#include "IDBMetadata.h"
    41 #include "IDBTransactionBackendInterface.h"
    4241#include "WebIDBCallbacks.h"
    4342#include "WebIDBCursorImpl.h"
    … …  
    4746#include "WebIDBDatabaseImpl.h"
    4847#include "WebIDBKey.h"
    49 #include "WebIDBTransactionImpl.h"
     48#include "WebIDBMetadata.h"
    5049#include "WebSerializedScriptValue.h"
    5150

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

    r141128 r141523  
    3434#include "IDBKeyRange.h"
    3535#include "IDBMetadata.h"
    36 #include "IDBTransactionBackendProxy.h"
    3736#include "WebDOMStringList.h"
    3837#include "WebFrameImpl.h"
    … …  
    4342#include "WebIDBDatabaseError.h"
    4443#include "WebIDBKeyRange.h"
    45 #include "WebIDBTransaction.h"
    4644
    4745using namespace WebCore;
    … …  
    6361}
    6462
    65 IDBDatabaseMetadata IDBDatabaseBackendProxy::metadata() const
    66 {
    67     return m_webIDBDatabase->metadata();
    68 }
    69 
    7063void IDBDatabaseBackendProxy::createObjectStore(int64_t transactionId, int64_t objectStoreId, const String& name, const IDBKeyPath& keyPath, bool autoIncrement)
    7164{
    … …  
    7871    if (m_webIDBDatabase)
    7972        m_webIDBDatabase->deleteObjectStore(transactionId, objectStoreId);
    80 }
    81 
    82 PassRefPtr<IDBTransactionBackendInterface> IDBDatabaseBackendProxy::createTransaction(int64_t id, const Vector<int64_t>& objectStoreIds, IDBTransaction::Mode mode)
    83 {
    84     OwnPtr<WebIDBTransaction> transaction = adoptPtr(m_webIDBDatabase->createTransaction(id, objectStoreIds, mode));
    85     if (!transaction)
    86         return 0;
    87 
    88     return IDBTransactionBackendProxy::create(transaction.release());
    8973}
    9074

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

    r141128 r141523  
    4343    virtual ~IDBDatabaseBackendProxy();
    4444
    45     virtual WebCore::IDBDatabaseMetadata metadata() const;
    46 
    4745    virtual void createObjectStore(int64_t transactionId, int64_t objectStoreId, const String& name, const WebCore::IDBKeyPath&, bool autoIncrement);
    4846    virtual void deleteObjectStore(int64_t transactionId, int64_t objectStoreId);
    49     // FIXME: Remove this method in https://bugs.webkit.org/show_bug.cgi?id=103923.
    50     virtual PassRefPtr<WebCore::IDBTransactionBackendInterface> createTransaction(int64_t, const Vector<int64_t>&, WebCore::IDBTransaction::Mode);
    5147    virtual void createTransaction(int64_t, PassRefPtr<WebCore::IDBDatabaseCallbacks>, const Vector<int64_t>&, unsigned short mode);
    5248    virtual void close(PassRefPtr<WebCore::IDBDatabaseCallbacks>);

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

    r141438 r141523  
    3535#include "IDBDatabaseError.h"
    3636#include "IDBKey.h"
    37 #include "IDBTransactionBackendProxy.h"
    3837#include "WebDOMStringList.h"
    3938#include "WebIDBCallbacks.h"
    … …  
    4140#include "WebIDBDatabaseError.h"
    4241#include "WebIDBKey.h"
    43 #include "WebIDBTransaction.h"
    4442#include "WebSerializedScriptValue.h"
    4543

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

    r141128 r141523  
    3636#include "IDBKeyRange.h"
    3737#include "IDBMetadata.h"
    38 #include "IDBTransactionBackendInterface.h"
    3938#include "WebIDBCallbacks.h"
    4039#include "WebIDBDatabaseCallbacks.h"
    … …  
    4342#include "WebIDBKeyRange.h"
    4443#include "WebIDBMetadata.h"
    45 #include "WebIDBTransactionImpl.h"
    4644
    4745using namespace WebCore;
    … …  
    5957}
    6058
    61 WebIDBMetadata WebIDBDatabaseImpl::metadata() const
    62 {
    63     return m_databaseBackend->metadata();
    64 }
    65 
    6659void WebIDBDatabaseImpl::createObjectStore(long long transactionId, long long objectStoreId, const WebString& name, const WebIDBKeyPath& keyPath, bool autoIncrement)
    6760{
    … …  
    7467}
    7568
    76 
    77 // FIXME: Remove this method in https://bugs.webkit.org/show_bug.cgi?id=103923.
    78 WebIDBTransaction* WebIDBDatabaseImpl::createTransaction(long long id, const WebVector<long long>& objectStoreIds, unsigned short mode)
    79 {
    80     Vector<int64_t> objectStoreIdList(objectStoreIds.size());
    81     for (size_t i = 0; i < objectStoreIds.size(); ++i)
    82         objectStoreIdList[i] = objectStoreIds[i];
    83     RefPtr<IDBTransactionBackendInterface> transaction = m_databaseBackend->createTransaction(id, objectStoreIdList, static_cast<IDBTransaction::Mode>(mode));
    84     if (!transaction)
    85         return 0;
    86     return new WebIDBTransactionImpl(transaction);
    87 }
    8869
    8970void WebIDBDatabaseImpl::createTransaction(long long id, WebIDBDatabaseCallbacks* callbacks, const WebVector<long long>& objectStoreIds, unsigned short mode)

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

    r141128 r141523  
    3232#include "WebExceptionCode.h"
    3333#include "WebIDBDatabase.h"
    34 #include "WebIDBTransaction.h"
    3534#include <public/WebCommon.h>
    3635#include <wtf/PassRefPtr.h>
    … …  
    4443class WebIDBDatabaseError;
    4544class WebIDBDatabaseMetadata;
    46 class WebIDBTransaction;
    4745
    4846// See comment in WebIDBFactory for a high level overview these classes.
    … …  
    5250    virtual ~WebIDBDatabaseImpl();
    5351
    54     virtual WebIDBMetadata metadata() const;
    55 
    5652    virtual void createObjectStore(long long transactionId, long long objectStoreId, const WebString& name, const WebIDBKeyPath&, bool autoIncrement);
    5753    virtual void deleteObjectStore(long long objectStoreId, long long transactionId);
    58     // FIXME: Remove this method in https://bugs.webkit.org/show_bug.cgi?id=103923.
    59     virtual WebIDBTransaction* createTransaction(long long id, const WebVector<long long>&, unsigned short mode);
    6054    virtual void createTransaction(long long id, WebIDBDatabaseCallbacks*, const WebVector<long long>&, unsigned short mode);
    6155    virtual void forceClose();

  • trunk/Source/WebKit/chromium/tests/IDBAbortOnCorruptTest.cpp

    r141142 r141523  
    6363    }
    6464    virtual void onSuccess(PassRefPtr<IDBKey>) { }
    65     virtual void onSuccess(PassRefPtr<IDBTransactionBackendInterface>) { }
    6665    virtual void onSuccess(PassRefPtr<SerializedScriptValue>) { }
    6766    virtual void onSuccess(PassRefPtr<SerializedScriptValue>, PassRefPtr<IDBKey>, const IDBKeyPath&) { }

  • trunk/Source/WebKit/chromium/tests/IDBDatabaseBackendTest.cpp

    r141142 r141523  
    139139    virtual void createObjectStore(int64_t transactionId, int64_t objectStoreId, const String& name, const IDBKeyPath&, bool autoIncrement) OVERRIDE { };
    140140    virtual void deleteObjectStore(int64_t transactionId, int64_t objectStoreId) OVERRIDE { }
    141     // FIXME: Remove this method in https://bugs.webkit.org/show_bug.cgi?id=103923.
    142     virtual PassRefPtr<IDBTransactionBackendInterface> createTransaction(int64_t, const Vector<int64_t>&, IDBTransaction::Mode) OVERRIDE { return 0; }
    143141    virtual void createTransaction(int64_t, PassRefPtr<IDBDatabaseCallbacks>, const Vector<int64_t>&, unsigned short mode) OVERRIDE { }
    144142
Note: See TracChangeset for help on using the changeset viewer.