Changeset 64577 in webkit


Ignore:
Timestamp:
Aug 3, 2010 12:20:09 PM (14 years ago)
Author:
andreip@google.com
Message:

2010-08-03 Andrei Popescu <​andreip@google.com>

Reviewed by Jeremy Orlow.

[IndexedDB] IDBObjectStoreRequest should be called IDBObjectStore
​https://bugs.webkit.org/show_bug.cgi?id=43420

Renaming IDBObjectStoreRequest to IDBObjectStore.

No new tests needed, just refactoring.

  • Android.derived.jscbindings.mk:
  • Android.derived.v8bindings.mk:
  • Android.mk:
  • CMakeLists.txt:
  • DerivedSources.cpp:
  • DerivedSources.make:
  • GNUmakefile.am:
  • WebCore.gypi:
  • WebCore.pri:
  • WebCore.pro:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • bindings/js/JSIDBAnyCustom.cpp: (WebCore::toJS):
  • bindings/v8/custom/V8IDBAnyCustom.cpp: (WebCore::toV8):
  • storage/IDBAny.cpp: (WebCore::IDBAny::idbObjectStore): (WebCore::IDBAny::set):
  • storage/IDBAny.h: (WebCore::IDBAny::):
  • storage/IDBCallbacks.h:
  • storage/IDBDatabase.cpp: (WebCore::IDBDatabase::objectStore):
  • storage/IDBDatabase.h:
  • storage/IDBDatabaseBackendImpl.cpp: (WebCore::IDBDatabaseBackendImpl::createObjectStore): (WebCore::IDBDatabaseBackendImpl::objectStore):
  • storage/IDBDatabaseBackendImpl.h:
  • storage/IDBDatabaseBackendInterface.h:
  • storage/IDBObjectStore.cpp: Added. (WebCore::IDBObjectStore::IDBObjectStore): (WebCore::IDBObjectStore::name): (WebCore::IDBObjectStore::keyPath): (WebCore::IDBObjectStore::indexNames): (WebCore::IDBObjectStore::get): (WebCore::IDBObjectStore::add): (WebCore::IDBObjectStore::put): (WebCore::IDBObjectStore::remove): (WebCore::IDBObjectStore::createIndex): (WebCore::IDBObjectStore::index): (WebCore::IDBObjectStore::removeIndex):
  • storage/IDBObjectStore.h: (WebCore::IDBObjectStore::create): (WebCore::IDBObjectStore::~IDBObjectStore):
  • storage/IDBObjectStore.idl: Added.
  • storage/IDBObjectStoreBackendImpl.cpp: Added. (WebCore::IDBObjectStoreBackendImpl::~IDBObjectStoreBackendImpl): (WebCore::IDBObjectStoreBackendImpl::IDBObjectStoreBackendImpl): (WebCore::IDBObjectStoreBackendImpl::indexNames): (WebCore::IDBObjectStoreBackendImpl::get): (WebCore::IDBObjectStoreBackendImpl::put): (WebCore::IDBObjectStoreBackendImpl::remove): (WebCore::IDBObjectStoreBackendImpl::createIndex): (WebCore::IDBObjectStoreBackendImpl::index): (WebCore::IDBObjectStoreBackendImpl::removeIndex):
  • storage/IDBObjectStoreBackendImpl.h: Added. (WebCore::IDBObjectStoreBackendImpl::create): (WebCore::IDBObjectStoreBackendImpl::name): (WebCore::IDBObjectStoreBackendImpl::keyPath):
  • storage/IDBObjectStoreBackendInterface.h: Added. (WebCore::IDBObjectStoreBackendInterface::~IDBObjectStoreBackendInterface):
  • storage/IDBObjectStoreImpl.cpp: Removed.
  • storage/IDBObjectStoreImpl.h: Removed.
  • storage/IDBObjectStoreRequest.cpp: Removed.
  • storage/IDBObjectStoreRequest.h: Removed.
  • storage/IDBObjectStoreRequest.idl: Removed.
  • storage/IDBRequest.cpp: (WebCore::IDBRequest::onSuccess):
  • storage/IDBRequest.h:

2010-08-03 Andrei Popescu <​andreip@google.com>

Reviewed by Jeremy Orlow.

[IndexedDB] IDBObjectStoreRequest should be called IDBObjectStore
​https://bugs.webkit.org/show_bug.cgi?id=43420

  • src/IDBCallbacksProxy.cpp: (WebCore::IDBCallbacksProxy::onSuccess):
  • src/IDBCallbacksProxy.h:
  • src/IDBDatabaseProxy.cpp: (WebCore::IDBDatabaseProxy::objectStore):
  • src/IDBDatabaseProxy.h:
  • src/IDBObjectStoreProxy.cpp: (WebCore::IDBObjectStoreProxy::create):
  • src/IDBObjectStoreProxy.h:
  • src/WebIDBObjectStoreImpl.cpp: (WebKit::WebIDBObjectStoreImpl::WebIDBObjectStoreImpl):
  • src/WebIDBObjectStoreImpl.h:
Location:
trunk
Files:
1 deleted
37 edited
1 copied
4 moved

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/Android.derived.jscbindings.mk

    r64543 r64577  
    371371    $(intermediates)/storage/JSIDBKey.h \
    372372    $(intermediates)/storage/JSIDBKeyRange.h \
     373    $(intermediates)/storage/JSIDBObjectStore.h \
    373374    $(intermediates)/storage/JSIDBRequest.h \
    374375    $(intermediates)/storage/JSIDBSuccessEvent.h

  • trunk/WebCore/Android.derived.v8bindings.mk

    r64543 r64577  
    352352    $(intermediates)/bindings/V8IDBKey.h \
    353353    $(intermediates)/bindings/V8IDBKeyRange.h \
     354    $(intermediates)/bindings/V8IDBObjectStore.h \
    354355    $(intermediates)/bindings/V8IDBRequest.h \
    355356    $(intermediates)/bindings/V8IDBSuccessEvent.h

  • trunk/WebCore/Android.mk

    r64543 r64577  
    752752        storage/IDBKey.cpp \
    753753        storage/IDBKeyRange.cpp \
    754         storage/IDBObjectStoreImpl.cpp \
    755         storage/IDBObjectStoreRequest.cpp \
     754        storage/IDBObjectStore.cpp \
     755        storage/IDBObjectStoreBackendImpl.cpp \
    756756        storage/IDBRequest.cpp \
    757757        storage/IDBSuccessEvent.cpp \

  • trunk/WebCore/CMakeLists.txt

    r64543 r64577  
    344344    storage/IDBKey.idl
    345345    storage/IDBKeyRange.idl
    346     storage/IDBObjectStoreRequest.idl
     346    storage/IDBObjectStore.idl
    347347    storage/IDBRequest.idl
    348348    storage/IDBSuccessEvent.idl
    … …  
    14461446    storage/IDBKeyRange.cpp
    14471447    storage/IDBRequest.cpp
    1448     storage/IDBObjectStoreImpl.cpp
    1449     storage/IDBObjectStoreRequest.cpp
     1448    storage/IDBObjectStore.cpp
     1449    storage/IDBObjectStoreBackendImpl.cpp
    14501450    storage/IDBSuccessEvent.cpp
    14511451    storage/IDBFactory.cpp

  • trunk/WebCore/ChangeLog

    r64573 r64577  
     12010-08-03  Andrei Popescu  <andreip@google.com>
     2
     3        Reviewed by Jeremy Orlow.
     4
     5        [IndexedDB] IDBObjectStoreRequest should be called IDBObjectStore
     6        https://bugs.webkit.org/show_bug.cgi?id=43420
     7
     8        Renaming IDBObjectStoreRequest to IDBObjectStore.
     9
     10        No new tests needed, just refactoring.
     11
     12        * Android.derived.jscbindings.mk:
     13        * Android.derived.v8bindings.mk:
     14        * Android.mk:
     15        * CMakeLists.txt:
     16        * DerivedSources.cpp:
     17        * DerivedSources.make:
     18        * GNUmakefile.am:
     19        * WebCore.gypi:
     20        * WebCore.pri:
     21        * WebCore.pro:
     22        * WebCore.vcproj/WebCore.vcproj:
     23        * WebCore.xcodeproj/project.pbxproj:
     24        * bindings/js/JSIDBAnyCustom.cpp:
     25        (WebCore::toJS):
     26        * bindings/v8/custom/V8IDBAnyCustom.cpp:
     27        (WebCore::toV8):
     28        * storage/IDBAny.cpp:
     29        (WebCore::IDBAny::idbObjectStore):
     30        (WebCore::IDBAny::set):
     31        * storage/IDBAny.h:
     32        (WebCore::IDBAny::):
     33        * storage/IDBCallbacks.h:
     34        * storage/IDBDatabase.cpp:
     35        (WebCore::IDBDatabase::objectStore):
     36        * storage/IDBDatabase.h:
     37        * storage/IDBDatabaseBackendImpl.cpp:
     38        (WebCore::IDBDatabaseBackendImpl::createObjectStore):
     39        (WebCore::IDBDatabaseBackendImpl::objectStore):
     40        * storage/IDBDatabaseBackendImpl.h:
     41        * storage/IDBDatabaseBackendInterface.h:
     42        * storage/IDBObjectStore.cpp: Added.
     43        (WebCore::IDBObjectStore::IDBObjectStore):
     44        (WebCore::IDBObjectStore::name):
     45        (WebCore::IDBObjectStore::keyPath):
     46        (WebCore::IDBObjectStore::indexNames):
     47        (WebCore::IDBObjectStore::get):
     48        (WebCore::IDBObjectStore::add):
     49        (WebCore::IDBObjectStore::put):
     50        (WebCore::IDBObjectStore::remove):
     51        (WebCore::IDBObjectStore::createIndex):
     52        (WebCore::IDBObjectStore::index):
     53        (WebCore::IDBObjectStore::removeIndex):
     54        * storage/IDBObjectStore.h:
     55        (WebCore::IDBObjectStore::create):
     56        (WebCore::IDBObjectStore::~IDBObjectStore):
     57        * storage/IDBObjectStore.idl: Added.
     58        * storage/IDBObjectStoreBackendImpl.cpp: Added.
     59        (WebCore::IDBObjectStoreBackendImpl::~IDBObjectStoreBackendImpl):
     60        (WebCore::IDBObjectStoreBackendImpl::IDBObjectStoreBackendImpl):
     61        (WebCore::IDBObjectStoreBackendImpl::indexNames):
     62        (WebCore::IDBObjectStoreBackendImpl::get):
     63        (WebCore::IDBObjectStoreBackendImpl::put):
     64        (WebCore::IDBObjectStoreBackendImpl::remove):
     65        (WebCore::IDBObjectStoreBackendImpl::createIndex):
     66        (WebCore::IDBObjectStoreBackendImpl::index):
     67        (WebCore::IDBObjectStoreBackendImpl::removeIndex):
     68        * storage/IDBObjectStoreBackendImpl.h: Added.
     69        (WebCore::IDBObjectStoreBackendImpl::create):
     70        (WebCore::IDBObjectStoreBackendImpl::name):
     71        (WebCore::IDBObjectStoreBackendImpl::keyPath):
     72        * storage/IDBObjectStoreBackendInterface.h: Added.
     73        (WebCore::IDBObjectStoreBackendInterface::~IDBObjectStoreBackendInterface):
     74        * storage/IDBObjectStoreImpl.cpp: Removed.
     75        * storage/IDBObjectStoreImpl.h: Removed.
     76        * storage/IDBObjectStoreRequest.cpp: Removed.
     77        * storage/IDBObjectStoreRequest.h: Removed.
     78        * storage/IDBObjectStoreRequest.idl: Removed.
     79        * storage/IDBRequest.cpp:
     80        (WebCore::IDBRequest::onSuccess):
     81        * storage/IDBRequest.h:
     82
    1832010-08-03  Martin Robinson  <mrobinson@igalia.com>
    284

  • trunk/WebCore/DerivedSources.cpp

    r64543 r64577  
    186186#include "JSIDBKey.cpp"
    187187#include "JSIDBKeyRange.cpp"
    188 #include "JSIDBObjectStoreRequest.cpp"
     188#include "JSIDBObjectStore.cpp"
    189189#include "JSIDBRequest.cpp"
    190190#include "JSIDBSuccessEvent.cpp"

  • trunk/WebCore/DerivedSources.make

    r64543 r64577  
    236236    IDBKey \
    237237    IDBKeyRange \
    238     IDBObjectStoreRequest \
     238    IDBObjectStore \
    239239    IDBRequest \
    240240    IDBSuccessEvent \

  • trunk/WebCore/GNUmakefile.am

    r64543 r64577  
    28502850        DerivedSources/WebCore/JSIDBKeyRange.cpp \
    28512851        DerivedSources/WebCore/JSIDBKeyRange.h \
    2852         DerivedSources/WebCore/JSIDBObjectStoreRequest.cpp \
    2853         DerivedSources/WebCore/JSIDBObjectStoreRequest.h \
     2852        DerivedSources/WebCore/JSIDBObjectStore.cpp \
     2853        DerivedSources/WebCore/JSIDBObjectStore.h \
    28542854        DerivedSources/WebCore/JSIDBRequest.cpp \
    28552855        DerivedSources/WebCore/JSIDBRequest.h \
    … …  
    28792879        WebCore/storage/IDBKeyRange.cpp \
    28802880        WebCore/storage/IDBKeyRange.h \
     2881        WebCore/storage/IDBObjectStore.cpp \
    28812882        WebCore/storage/IDBObjectStore.h \
    2882         WebCore/storage/IDBObjectStoreImpl.cpp \
    2883         WebCore/storage/IDBObjectStoreImpl.h \
    2884         WebCore/storage/IDBObjectStoreRequest.cpp \
    2885         WebCore/storage/IDBObjectStoreRequest.h \
     2883        WebCore/storage/IDBObjectStoreBackendImpl.cpp \
     2884        WebCore/storage/IDBObjectStoreBackendImpl.h \
     2885        WebCore/storage/IDBObjectStoreBackendInterface.h \
    28862886        WebCore/storage/IDBRequest.cpp \
    28872887        WebCore/storage/IDBRequest.h \

  • trunk/WebCore/WebCore.gypi

    r64544 r64577  
    247247            'storage/IDBKey.idl',
    248248            'storage/IDBKeyRange.idl',
    249             'storage/IDBObjectStoreRequest.idl',
     249            'storage/IDBObjectStore.idl',
    250250            'storage/IDBRequest.idl',
    251251            'storage/IDBSuccessEvent.idl',
    … …  
    35253525            'storage/IDBKeyRange.h',
    35263526            'storage/IDBKeyTree.h',
     3527            'storage/IDBObjectStore.cpp',
    35273528            'storage/IDBObjectStore.h',
    3528             'storage/IDBObjectStoreImpl.cpp',
    3529             'storage/IDBObjectStoreImpl.h',
    3530             'storage/IDBObjectStoreRequest.cpp',
    3531             'storage/IDBObjectStoreRequest.h',
     3529            'storage/IDBObjectStoreBackendImpl.cpp',
     3530            'storage/IDBObjectStoreBackendImpl.h',
     3531            'storage/IDBObjectStoreBackendInterface.h',
    35323532            'storage/IDBRequest.cpp',
    35333533            'storage/IDBRequest.h',

  • trunk/WebCore/WebCore.pri

    r64543 r64577  
    492492    storage/IDBKey.idl \
    493493    storage/IDBKeyRange.idl \
    494     storage/IDBObjectStoreRequest.idl \
     494    storage/IDBObjectStore.idl \
    495495    storage/IDBRequest.idl \
    496496    storage/IDBSuccessEvent.idl \

  • trunk/WebCore/WebCore.pro

    r64543 r64577  
    24422442        storage/IDBKeyRange.h \
    24432443        storage/IDBObjectStore.h \
    2444         storage/IDBObjectStoreImpl.h \
    2445         storage/IDBObjectStoreRequest.h \
     2444        storage/IDBObjectStoreBackendImpl.h \
     2445        storage/IDBObjectStoreBackendInterface.h \
    24462446        storage/IDBRequest.h \
    24472447        storage/IDBSuccessEvent.h
    … …  
    24632463        storage/IDBKey.cpp \
    24642464        storage/IDBKeyRange.cpp \
    2465         storage/IDBObjectStoreImpl.cpp \
    2466         storage/IDBObjectStoreRequest.cpp \
     2465        storage/IDBObjectStore.cpp \
     2466        storage/IDBObjectStoreBackendImpl.cpp \
    24672467        storage/IDBRequest.cpp \
    24682468        storage/IDBSuccessEvent.cpp

  • trunk/WebCore/WebCore.vcproj/WebCore.vcproj

    r64543 r64577  
    4501345013                                </File>
    4501445014                                <File
    45015                                         RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBObjectStoreRequest.cpp"
     45015                                        RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBObjectStore.cpp"
    4501645016                                        >
    4501745017                                        <FileConfiguration
    … …  
    4506545065                                </File>
    4506645066                                <File
    45067                                         RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBObjectStoreRequest.cpp"
     45067                                        RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBObjectStore.cpp"
    4506845068                                        >
    4506945069                                        <FileConfiguration
    … …  
    4511745117                                </File>
    4511845118                                <File
    45119                                         RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBObjectStoreRequest.h"
     45119                                        RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBObjectStore.h"
    4512045120                                        >
    4512145121                                </File>
    … …  
    5021850218                        </File>
    5021950219                        <File
     50220                                RelativePath="..\storage\IDBObjectStore.cpp"
     50221                                >
     50222                        </File>
     50223                        <File
    5022050224                                RelativePath="..\storage\IDBObjectStore.h"
    5022150225                                >
    5022250226                        </File>
    5022350227                        <File
    50224                                 RelativePath="..\storage\IDBObjectStoreImpl.cpp"
    50225                                 >
    50226                         </File>
    50227                         <File
    50228                                 RelativePath="..\storage\IDBObjectStoreImpl.h"
    50229                                 >
    50230                         </File>
    50231                         <File
    50232                                 RelativePath="..\storage\IDBObjectStoreRequest.cpp"
    50233                                 >
    50234                         </File>
    50235                         <File
    50236                                 RelativePath="..\storage\IDBObjectStoreRequest.h"
     50228                                RelativePath="..\storage\IDBObjectStoreBackendImpl.cpp"
     50229                                >
     50230                        </File>
     50231                        <File
     50232                                RelativePath="..\storage\IDBObjectStoreBackendImpl.h"
     50233                                >
     50234                        </File>
     50235                        <File
     50236                                RelativePath="..\storage\IDBObjectStoreBackendInterface.h"
    5023750237                                >
    5023850238                        </File>

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

    r64543 r64577  
    49544954                C585A68C11D4FB08004C3E4B /* JSIDBKeyRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A67411D4FB07004C3E4B /* JSIDBKeyRange.cpp */; };
    49554955                C585A68D11D4FB08004C3E4B /* JSIDBKeyRange.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A67511D4FB07004C3E4B /* JSIDBKeyRange.h */; };
    4956                 C585A68E11D4FB08004C3E4B /* JSIDBObjectStoreRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A67611D4FB07004C3E4B /* JSIDBObjectStoreRequest.cpp */; };
    4957                 C585A68F11D4FB08004C3E4B /* JSIDBObjectStoreRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A67711D4FB07004C3E4B /* JSIDBObjectStoreRequest.h */; };
     4956                C585A68E11D4FB08004C3E4B /* JSIDBObjectStore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A67611D4FB07004C3E4B /* JSIDBObjectStore.cpp */; };
     4957                C585A68F11D4FB08004C3E4B /* JSIDBObjectStore.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A67711D4FB07004C3E4B /* JSIDBObjectStore.h */; };
    49584958                C585A69011D4FB08004C3E4B /* JSIDBRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A67811D4FB07004C3E4B /* JSIDBRequest.cpp */; };
    49594959                C585A69111D4FB08004C3E4B /* JSIDBRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A67911D4FB07004C3E4B /* JSIDBRequest.h */; };
    … …  
    49794979                C585A6EC11D4FB3D004C3E4B /* IDBKeyTree.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A6B811D4FB3D004C3E4B /* IDBKeyTree.h */; };
    49804980                C585A6ED11D4FB3D004C3E4B /* IDBObjectStore.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A6B911D4FB3D004C3E4B /* IDBObjectStore.h */; };
    4981                 C585A6EE11D4FB3D004C3E4B /* IDBObjectStoreImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A6BA11D4FB3D004C3E4B /* IDBObjectStoreImpl.cpp */; };
    4982                 C585A6EF11D4FB3D004C3E4B /* IDBObjectStoreImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A6BB11D4FB3D004C3E4B /* IDBObjectStoreImpl.h */; };
    4983                 C585A6F011D4FB3D004C3E4B /* IDBObjectStoreRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A6BC11D4FB3D004C3E4B /* IDBObjectStoreRequest.cpp */; };
    4984                 C585A6F111D4FB3D004C3E4B /* IDBObjectStoreRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A6BD11D4FB3D004C3E4B /* IDBObjectStoreRequest.h */; };
     4981                C585A6F011D4FB3D004C3E4B /* IDBObjectStore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A6BC11D4FB3D004C3E4B /* IDBObjectStore.cpp */; };
     4982                C585A6EE11D4FB3D004C3E4B /* IDBObjectStoreBackendImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A6BA11D4FB3D004C3E4B /* IDBObjectStoreBackendImpl.cpp */; };
     4983                C585A6EF11D4FB3D004C3E4B /* IDBObjectStoreBackendImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A6BB11D4FB3D004C3E4B /* IDBObjectStoreBackendImpl.h */; };
     4984                C585A6F111D4FB3D004C3E4B /* IDBObjectStoreBackendInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A6BD11D4FB3D004C3E4B /* IDBObjectStoreBackendInterface.h */; };
    49854985                C585A6F311D4FB3D004C3E4B /* IDBRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A6BF11D4FB3D004C3E4B /* IDBRequest.cpp */; };
    49864986                C585A6F411D4FB3D004C3E4B /* IDBRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A6C011D4FB3D004C3E4B /* IDBRequest.h */; };
    … …  
    1065710657                C585A67411D4FB07004C3E4B /* JSIDBKeyRange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSIDBKeyRange.cpp; sourceTree = "<group>"; };
    1065810658                C585A67511D4FB07004C3E4B /* JSIDBKeyRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSIDBKeyRange.h; sourceTree = "<group>"; };
    10659                 C585A67611D4FB07004C3E4B /* JSIDBObjectStoreRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSIDBObjectStoreRequest.cpp; sourceTree = "<group>"; };
    10660                 C585A67711D4FB07004C3E4B /* JSIDBObjectStoreRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSIDBObjectStoreRequest.h; sourceTree = "<group>"; };
     10659                C585A67611D4FB07004C3E4B /* JSIDBObjectStore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSIDBObjectStore.cpp; sourceTree = "<group>"; };
     10660                C585A67711D4FB07004C3E4B /* JSIDBObjectStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSIDBObjectStore.h; sourceTree = "<group>"; };
    1066110661                C585A67811D4FB07004C3E4B /* JSIDBRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSIDBRequest.cpp; sourceTree = "<group>"; };
    1066210662                C585A67911D4FB07004C3E4B /* JSIDBRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSIDBRequest.h; sourceTree = "<group>"; };
    … …  
    1069010690                C585A6B711D4FB3D004C3E4B /* IDBKeyRange.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = IDBKeyRange.idl; sourceTree = "<group>"; };
    1069110691                C585A6B811D4FB3D004C3E4B /* IDBKeyTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBKeyTree.h; sourceTree = "<group>"; };
     10692                C585A6BC11D4FB3D004C3E4B /* IDBObjectStore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBObjectStore.cpp; sourceTree = "<group>"; };
    1069210693                C585A6B911D4FB3D004C3E4B /* IDBObjectStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBObjectStore.h; sourceTree = "<group>"; };
    10693                 C585A6BA11D4FB3D004C3E4B /* IDBObjectStoreImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBObjectStoreImpl.cpp; sourceTree = "<group>"; };
    10694                 C585A6BB11D4FB3D004C3E4B /* IDBObjectStoreImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBObjectStoreImpl.h; sourceTree = "<group>"; };
    10695                 C585A6BC11D4FB3D004C3E4B /* IDBObjectStoreRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBObjectStoreRequest.cpp; sourceTree = "<group>"; };
    10696                 C585A6BD11D4FB3D004C3E4B /* IDBObjectStoreRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBObjectStoreRequest.h; sourceTree = "<group>"; };
    10697                 C585A6BE11D4FB3D004C3E4B /* IDBObjectStoreRequest.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = IDBObjectStoreRequest.idl; sourceTree = "<group>"; };
     10694                C585A6BE11D4FB3D004C3E4B /* IDBObjectStore.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = IDBObjectStore.idl; sourceTree = "<group>"; };
     10695                C585A6BA11D4FB3D004C3E4B /* IDBObjectStoreBackendImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBObjectStoreBackendImpl.cpp; sourceTree = "<group>"; };
     10696                C585A6BB11D4FB3D004C3E4B /* IDBObjectStoreBackendImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBObjectStoreBackendImpl.h; sourceTree = "<group>"; };
     10697                C585A6BD11D4FB3D004C3E4B /* IDBObjectStoreBackendInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBObjectStoreBackendInterface.h; sourceTree = "<group>"; };
    1069810698                C585A6BF11D4FB3D004C3E4B /* IDBRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBRequest.cpp; sourceTree = "<group>"; };
    1069910699                C585A6C011D4FB3D004C3E4B /* IDBRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBRequest.h; sourceTree = "<group>"; };
    … …  
    1142611426                                C585A6B711D4FB3D004C3E4B /* IDBKeyRange.idl */,
    1142711427                                C585A6B811D4FB3D004C3E4B /* IDBKeyTree.h */,
     11428                                C585A6BC11D4FB3D004C3E4B /* IDBObjectStore.cpp */,
    1142811429                                C585A6B911D4FB3D004C3E4B /* IDBObjectStore.h */,
    11429                                 C585A6BA11D4FB3D004C3E4B /* IDBObjectStoreImpl.cpp */,
    11430                                 C585A6BB11D4FB3D004C3E4B /* IDBObjectStoreImpl.h */,
    11431                                 C585A6BC11D4FB3D004C3E4B /* IDBObjectStoreRequest.cpp */,
    11432                                 C585A6BD11D4FB3D004C3E4B /* IDBObjectStoreRequest.h */,
    11433                                 C585A6BE11D4FB3D004C3E4B /* IDBObjectStoreRequest.idl */,
     11430                                C585A6BE11D4FB3D004C3E4B /* IDBObjectStore.idl */,
     11431                                C585A6BA11D4FB3D004C3E4B /* IDBObjectStoreBackendImpl.cpp */,
     11432                                C585A6BB11D4FB3D004C3E4B /* IDBObjectStoreBackendImpl.h */,
     11433                                C585A6BD11D4FB3D004C3E4B /* IDBObjectStoreBackendInterface.h */,
    1143411434                                C585A6BF11D4FB3D004C3E4B /* IDBRequest.cpp */,
    1143511435                                C585A6C011D4FB3D004C3E4B /* IDBRequest.h */,
    … …  
    1487014870                                C585A67411D4FB07004C3E4B /* JSIDBKeyRange.cpp */,
    1487114871                                C585A67511D4FB07004C3E4B /* JSIDBKeyRange.h */,
    14872                                 C585A67611D4FB07004C3E4B /* JSIDBObjectStoreRequest.cpp */,
    14873                                 C585A67711D4FB07004C3E4B /* JSIDBObjectStoreRequest.h */,
     14872                                C585A67611D4FB07004C3E4B /* JSIDBObjectStore.cpp */,
     14873                                C585A67711D4FB07004C3E4B /* JSIDBObjectStore.h */,
    1487414874                                C585A67811D4FB07004C3E4B /* JSIDBRequest.cpp */,
    1487514875                                C585A67911D4FB07004C3E4B /* JSIDBRequest.h */,
    … …  
    1860418604                                C585A6EC11D4FB3D004C3E4B /* IDBKeyTree.h in Headers */,
    1860518605                                C585A6ED11D4FB3D004C3E4B /* IDBObjectStore.h in Headers */,
    18606                                 C585A6EF11D4FB3D004C3E4B /* IDBObjectStoreImpl.h in Headers */,
    18607                                 C585A6F111D4FB3D004C3E4B /* IDBObjectStoreRequest.h in Headers */,
     18606                                C585A6EF11D4FB3D004C3E4B /* IDBObjectStoreBackendImpl.h in Headers */,
     18607                                C585A6F111D4FB3D004C3E4B /* IDBObjectStoreBackendInterface.h in Headers */,
    1860818608                                C585A6F411D4FB3D004C3E4B /* IDBRequest.h in Headers */,
    1860918609                                C585A6F711D4FB3D004C3E4B /* IDBSuccessEvent.h in Headers */,
    … …  
    1885118851                                C585A68B11D4FB08004C3E4B /* JSIDBKey.h in Headers */,
    1885218852                                C585A68D11D4FB08004C3E4B /* JSIDBKeyRange.h in Headers */,
    18853                                 C585A68F11D4FB08004C3E4B /* JSIDBObjectStoreRequest.h in Headers */,
     18853                                C585A68F11D4FB08004C3E4B /* JSIDBObjectStore.h in Headers */,
    1885418854                                C585A69111D4FB08004C3E4B /* JSIDBRequest.h in Headers */,
    1885518855                                C585A69311D4FB08004C3E4B /* JSIDBSuccessEvent.h in Headers */,
    … …  
    2103321033                                C585A6E611D4FB3D004C3E4B /* IDBKey.cpp in Sources */,
    2103421034                                C585A6E911D4FB3D004C3E4B /* IDBKeyRange.cpp in Sources */,
    21035                                 C585A6EE11D4FB3D004C3E4B /* IDBObjectStoreImpl.cpp in Sources */,
    21036                                 C585A6F011D4FB3D004C3E4B /* IDBObjectStoreRequest.cpp in Sources */,
     21035                                C585A6F011D4FB3D004C3E4B /* IDBObjectStore.cpp in Sources */,
     21036                                C585A6EE11D4FB3D004C3E4B /* IDBObjectStoreBackendImpl.cpp in Sources */,
    2103721037                                C585A6F311D4FB3D004C3E4B /* IDBRequest.cpp in Sources */,
    2103821038                                C585A6F611D4FB3D004C3E4B /* IDBSuccessEvent.cpp in Sources */,
    … …  
    2132421324                                C585A65F11D4FAB2004C3E4B /* JSIDBKeyCustom.cpp in Sources */,
    2132521325                                C585A68C11D4FB08004C3E4B /* JSIDBKeyRange.cpp in Sources */,
    21326                                 C585A68E11D4FB08004C3E4B /* JSIDBObjectStoreRequest.cpp in Sources */,
     21326                                C585A68E11D4FB08004C3E4B /* JSIDBObjectStore.cpp in Sources */,
    2132721327                                C585A69011D4FB08004C3E4B /* JSIDBRequest.cpp in Sources */,
    2132821328                                C585A69211D4FB08004C3E4B /* JSIDBSuccessEvent.cpp in Sources */,

  • trunk/WebCore/bindings/js/JSIDBAnyCustom.cpp

    r64543 r64577  
    3737#include "IDBIndex.h"
    3838#include "IDBKey.h"
    39 #include "IDBObjectStoreRequest.h"
     39#include "IDBObjectStore.h"
    4040#include "JSIDBDatabase.h"
    4141#include "JSIDBFactory.h"
    4242#include "JSIDBIndex.h"
    4343#include "JSIDBKey.h"
    44 #include "JSIDBObjectStoreRequest.h"
     44#include "JSIDBObjectStore.h"
    4545#include "SerializedScriptValue.h"
    4646
    … …  
    6565    case IDBAny::IDBKeyType:
    6666        return toJS(exec, globalObject, idbAny->idbKey());
    67     case IDBAny::IDBObjectStoreRequestType:
    68         return toJS(exec, globalObject, idbAny->idbObjectStoreRequest());
     67    case IDBAny::IDBObjectStoreType:
     68        return toJS(exec, globalObject, idbAny->idbObjectStore());
    6969    case IDBAny::IDBFactoryType:
    7070        return toJS(exec, globalObject, idbAny->idbFactory());

  • trunk/WebCore/bindings/v8/custom/V8IDBAnyCustom.cpp

    r64543 r64577  
    3737#include "V8IDBIndex.h"
    3838#include "V8IDBKey.h"
    39 #include "V8IDBObjectStoreRequest.h"
     39#include "V8IDBObjectStore.h"
    4040
    4141namespace WebCore {
    … …  
    5757    case IDBAny::IDBKeyType:
    5858        return toV8(impl->idbKey());
    59     case IDBAny::IDBObjectStoreRequestType:
    60         return toV8(impl->idbObjectStoreRequest());
     59    case IDBAny::IDBObjectStoreType:
     60        return toV8(impl->idbObjectStore());
    6161    case IDBAny::IDBFactoryType:
    6262        return toV8(impl->idbFactory());

  • trunk/WebCore/storage/IDBAny.cpp

    r64543 r64577  
    3232#include "IDBFactory.h"
    3333#include "IDBIndex.h"
    34 #include "IDBObjectStoreRequest.h"
     34#include "IDBObjectStore.h"
    3535#include "SerializedScriptValue.h"
    3636
    … …  
    6969}
    7070
    71 PassRefPtr<IDBObjectStoreRequest> IDBAny::idbObjectStoreRequest()
     71PassRefPtr<IDBObjectStore> IDBAny::idbObjectStore()
    7272{
    73     ASSERT(m_type == IDBObjectStoreRequestType);
    74     return m_idbObjectStoreRequest;
     73    ASSERT(m_type == IDBObjectStoreType);
     74    return m_idbObjectStore;
    7575}
    7676
    … …  
    114114}
    115115
    116 void IDBAny::set(PassRefPtr<IDBObjectStoreRequest> value)
     116void IDBAny::set(PassRefPtr<IDBObjectStore> value)
    117117{
    118118    ASSERT(m_type == UndefinedType);
    119     m_type = IDBObjectStoreRequestType;
    120     m_idbObjectStoreRequest = value;
     119    m_type = IDBObjectStoreType;
     120    m_idbObjectStore = value;
    121121}
    122122

  • trunk/WebCore/storage/IDBAny.h

    r64543 r64577  
    3838class IDBIndex;
    3939class IDBKey;
    40 class IDBObjectStoreRequest;
     40class IDBObjectStore;
    4141class IDBFactory;
    4242class SerializedScriptValue;
    … …  
    6161        IDBIndexType,
    6262        IDBKeyType,
    63         IDBObjectStoreRequestType,
     63        IDBObjectStoreType,
    6464        SerializedScriptValueType
    6565    };
    … …  
    7171    PassRefPtr<IDBIndex> idbIndex();
    7272    PassRefPtr<IDBKey> idbKey();
    73     PassRefPtr<IDBObjectStoreRequest> idbObjectStoreRequest();
     73    PassRefPtr<IDBObjectStore> idbObjectStore();
    7474    PassRefPtr<SerializedScriptValue> serializedScriptValue();
    7575
    … …  
    8080    void set(PassRefPtr<IDBIndex>);
    8181    void set(PassRefPtr<IDBKey>);
    82     void set(PassRefPtr<IDBObjectStoreRequest>);
     82    void set(PassRefPtr<IDBObjectStore>);
    8383    void set(PassRefPtr<SerializedScriptValue>);
    8484
    … …  
    9393    RefPtr<IDBIndex> m_idbIndex;
    9494    RefPtr<IDBKey> m_idbKey;
    95     RefPtr<IDBObjectStoreRequest> m_idbObjectStoreRequest;
     95    RefPtr<IDBObjectStore> m_idbObjectStore;
    9696    RefPtr<SerializedScriptValue> m_serializedScriptValue;
    9797};

  • trunk/WebCore/storage/IDBCallbacks.h

    r64543 r64577  
    3434#include "IDBIndexBackendInterface.h"
    3535#include "IDBKey.h"
    36 #include "IDBObjectStore.h"
     36#include "IDBObjectStoreBackendInterface.h"
    3737#include "SerializedScriptValue.h"
    3838#include <wtf/RefCounted.h>
    … …  
    5151    virtual void onSuccess(PassRefPtr<IDBIndexBackendInterface>) = 0;
    5252    virtual void onSuccess(PassRefPtr<IDBKey>) = 0;
    53     virtual void onSuccess(PassRefPtr<IDBObjectStore>) = 0;
     53    virtual void onSuccess(PassRefPtr<IDBObjectStoreBackendInterface>) = 0;
    5454    virtual void onSuccess(PassRefPtr<SerializedScriptValue>) = 0;
    5555};

  • trunk/WebCore/storage/IDBDatabase.cpp

    r64543 r64577  
    2929#include "IDBAny.h"
    3030#include "IDBFactoryBackendInterface.h"
    31 #include "IDBObjectStoreRequest.h"
     31#include "IDBObjectStore.h"
    3232#include "IDBRequest.h"
    3333#include "ScriptExecutionContext.h"
    … …  
    5555}
    5656
    57 PassRefPtr<IDBObjectStoreRequest> IDBDatabase::objectStore(const String& name, unsigned short mode)
     57PassRefPtr<IDBObjectStore> IDBDatabase::objectStore(const String& name, unsigned short mode)
    5858{
    59     RefPtr<IDBObjectStore> objectStore = m_backend->objectStore(name, mode);
     59    RefPtr<IDBObjectStoreBackendInterface> objectStore = m_backend->objectStore(name, mode);
    6060    ASSERT(objectStore); // FIXME: If this is null, we should raise a NOT_FOUND_ERR.
    61     return IDBObjectStoreRequest::create(objectStore.release());
     61    return IDBObjectStore::create(objectStore.release());
    6262}
    6363

  • trunk/WebCore/storage/IDBDatabase.h

    r64543 r64577  
    3838
    3939class IDBAny;
    40 class IDBObjectStoreRequest;
     40class IDBObjectStore;
    4141class IDBRequest;
    4242class ScriptExecutionContext;
    … …  
    5757
    5858    PassRefPtr<IDBRequest> createObjectStore(ScriptExecutionContext*, const String& name, const String& keyPath = String(), bool autoIncrement = false);
    59     PassRefPtr<IDBObjectStoreRequest> objectStore(const String& name, unsigned short mode = 0); // FIXME: Use constant rather than 0.
     59    PassRefPtr<IDBObjectStore> objectStore(const String& name, unsigned short mode = 0); // FIXME: Use constant rather than 0.
    6060    PassRefPtr<IDBRequest> removeObjectStore(ScriptExecutionContext*, const String& name);
    6161

  • trunk/WebCore/storage/IDBDatabase.idl

    r64543 r64577  
    3939        [CallWith=ScriptExecutionContext] IDBRequest createObjectStore(in DOMString name, in [Optional, ConvertNullToNullString] DOMString keyPath, in [Optional] boolean autoIncrement);
    4040        // FIXME: objectStore needs to be able to raise an IDBDatabaseException.
    41         IDBObjectStoreRequest objectStore(in DOMString name, in [Optional] unsigned short mode);
     41        IDBObjectStore objectStore(in DOMString name, in [Optional] unsigned short mode);
    4242        [CallWith=ScriptExecutionContext] IDBRequest removeObjectStore(in DOMString name);
    4343    };

  • trunk/WebCore/storage/IDBDatabaseBackendImpl.cpp

    r64543 r64577  
    2929#include "DOMStringList.h"
    3030#include "IDBDatabaseException.h"
    31 #include "IDBObjectStoreImpl.h"
     31#include "IDBObjectStoreBackendImpl.h"
    3232
    3333#if ENABLE(INDEXED_DATABASE)
    … …  
    6161    }
    6262
    63     RefPtr<IDBObjectStore> objectStore = IDBObjectStoreImpl::create(name, keyPath, autoIncrement);
     63    RefPtr<IDBObjectStoreBackendInterface> objectStore = IDBObjectStoreBackendImpl::create(name, keyPath, autoIncrement);
    6464    m_objectStores.set(name, objectStore);
    6565    callbacks->onSuccess(objectStore.release());
    6666}
    6767
    68 PassRefPtr<IDBObjectStore> IDBDatabaseBackendImpl::objectStore(const String& name, unsigned short mode)
     68PassRefPtr<IDBObjectStoreBackendInterface> IDBDatabaseBackendImpl::objectStore(const String& name, unsigned short mode)
    6969{
    7070    // FIXME: If no transaction is running, this should implicitly start one.

  • trunk/WebCore/storage/IDBDatabaseBackendImpl.h

    r64543 r64577  
    5151
    5252    virtual void createObjectStore(const String& name, const String& keyPath, bool autoIncrement, PassRefPtr<IDBCallbacks>);
    53     virtual PassRefPtr<IDBObjectStore> objectStore(const String& name, unsigned short mode);
     53    virtual PassRefPtr<IDBObjectStoreBackendInterface> objectStore(const String& name, unsigned short mode);
    5454    virtual void removeObjectStore(const String& name, PassRefPtr<IDBCallbacks>);
    5555
    … …  
    6161    String m_version;
    6262
    63     typedef HashMap<String, RefPtr<IDBObjectStore> > ObjectStoreMap;
     63    typedef HashMap<String, RefPtr<IDBObjectStoreBackendInterface> > ObjectStoreMap;
    6464    ObjectStoreMap m_objectStores;
    6565};

  • trunk/WebCore/storage/IDBDatabaseBackendInterface.h

    r64543 r64577  
    3838class Frame;
    3939class IDBCallbacks;
    40 class IDBObjectStore;
     40class IDBObjectStoreBackendInterface;
    4141
    4242// This class is shared by IDBDatabase (async) and IDBDatabaseSync (sync).
    … …  
    5656
    5757    virtual void createObjectStore(const String& name, const String& keyPath, bool autoIncrement, PassRefPtr<IDBCallbacks>) = 0;
    58     virtual PassRefPtr<IDBObjectStore> objectStore(const String& name, unsigned short mode) = 0;
     58    virtual PassRefPtr<IDBObjectStoreBackendInterface> objectStore(const String& name, unsigned short mode) = 0;
    5959    virtual void removeObjectStore(const String& name, PassRefPtr<IDBCallbacks>) = 0;
    6060};

  • trunk/WebCore/storage/IDBObjectStore.cpp

    r64573 r64577  
    2525
    2626#include "config.h"
    27 #include "IDBObjectStoreRequest.h"
     27#include "IDBObjectStore.h"
    2828
    2929#include "DOMStringList.h"
    … …  
    3838namespace WebCore {
    3939
    40 IDBObjectStoreRequest::IDBObjectStoreRequest(PassRefPtr<IDBObjectStore> idbObjectStore)
     40IDBObjectStore::IDBObjectStore(PassRefPtr<IDBObjectStoreBackendInterface> idbObjectStore)
    4141    : m_objectStore(idbObjectStore)
    4242{
    … …  
    4545}
    4646
    47 String IDBObjectStoreRequest::name() const
     47String IDBObjectStore::name() const
    4848{
    4949    return m_objectStore->name();
    5050}
    5151
    52 String IDBObjectStoreRequest::keyPath() const
     52String IDBObjectStore::keyPath() const
    5353{
    5454    return m_objectStore->keyPath();
    5555}
    5656
    57 PassRefPtr<DOMStringList> IDBObjectStoreRequest::indexNames() const
     57PassRefPtr<DOMStringList> IDBObjectStore::indexNames() const
    5858{
    5959    return m_objectStore->indexNames();
    6060}
    6161
    62 PassRefPtr<IDBRequest> IDBObjectStoreRequest::get(ScriptExecutionContext* context, PassRefPtr<IDBKey> key)
     62PassRefPtr<IDBRequest> IDBObjectStore::get(ScriptExecutionContext* context, PassRefPtr<IDBKey> key)
    6363{
    6464    RefPtr<IDBRequest> request = IDBRequest::create(context, IDBAny::create(this));
    … …  
    6767}
    6868
    69 PassRefPtr<IDBRequest> IDBObjectStoreRequest::add(ScriptExecutionContext* context, PassRefPtr<SerializedScriptValue> value, PassRefPtr<IDBKey> key)
     69PassRefPtr<IDBRequest> IDBObjectStore::add(ScriptExecutionContext* context, PassRefPtr<SerializedScriptValue> value, PassRefPtr<IDBKey> key)
    7070{
    7171    RefPtr<IDBRequest> request = IDBRequest::create(context, IDBAny::create(this));
    … …  
    7474}
    7575
    76 PassRefPtr<IDBRequest> IDBObjectStoreRequest::put(ScriptExecutionContext* context, PassRefPtr<SerializedScriptValue> value, PassRefPtr<IDBKey> key)
     76PassRefPtr<IDBRequest> IDBObjectStore::put(ScriptExecutionContext* context, PassRefPtr<SerializedScriptValue> value, PassRefPtr<IDBKey> key)
    7777{
    7878    RefPtr<IDBRequest> request = IDBRequest::create(context, IDBAny::create(this));
    … …  
    8181}
    8282
    83 PassRefPtr<IDBRequest> IDBObjectStoreRequest::remove(ScriptExecutionContext* context, PassRefPtr<IDBKey> key)
     83PassRefPtr<IDBRequest> IDBObjectStore::remove(ScriptExecutionContext* context, PassRefPtr<IDBKey> key)
    8484{
    8585    RefPtr<IDBRequest> request = IDBRequest::create(context, IDBAny::create(this));
    … …  
    8888}
    8989
    90 PassRefPtr<IDBRequest> IDBObjectStoreRequest::createIndex(ScriptExecutionContext* context, const String& name, const String& keyPath, bool unique)
     90PassRefPtr<IDBRequest> IDBObjectStore::createIndex(ScriptExecutionContext* context, const String& name, const String& keyPath, bool unique)
    9191{
    9292    RefPtr<IDBRequest> request = IDBRequest::create(context, IDBAny::create(this));
    … …  
    9595}
    9696
    97 PassRefPtr<IDBIndex> IDBObjectStoreRequest::index(const String& name)
     97PassRefPtr<IDBIndex> IDBObjectStore::index(const String& name)
    9898{
    9999    RefPtr<IDBIndexBackendInterface> index = m_objectStore->index(name);
    … …  
    102102}
    103103
    104 PassRefPtr<IDBRequest> IDBObjectStoreRequest::removeIndex(ScriptExecutionContext* context, const String& name)
     104PassRefPtr<IDBRequest> IDBObjectStore::removeIndex(ScriptExecutionContext* context, const String& name)
    105105{
    106106    RefPtr<IDBRequest> request = IDBRequest::create(context, IDBAny::create(this));

  • trunk/WebCore/storage/IDBObjectStore.h

    r64358 r64577  
    2727#define IDBObjectStore_h
    2828
     29#include "IDBObjectStoreBackendInterface.h"
     30#include "IDBRequest.h"
    2931#include "PlatformString.h"
    30 #include <wtf/Threading.h>
     32#include <wtf/PassRefPtr.h>
     33#include <wtf/RefCounted.h>
     34#include <wtf/RefPtr.h>
    3135
    3236#if ENABLE(INDEXED_DATABASE)
    … …  
    3539
    3640class DOMStringList;
    37 class IDBCallbacks;
    38 class IDBIndexBackendInterface;
     41class IDBAny;
     42class IDBIndexRequest;
    3943class IDBKey;
    4044class SerializedScriptValue;
    4145
    42 class IDBObjectStore : public ThreadSafeShared<IDBObjectStore> {
     46class IDBObjectStore : public RefCounted<IDBObjectStore> {
    4347public:
    44     virtual ~IDBObjectStore() { }
     48    static PassRefPtr<IDBObjectStore> create(PassRefPtr<IDBObjectStoreBackendInterface> idbObjectStore)
     49    {
     50        return adoptRef(new IDBObjectStore(idbObjectStore));
     51    }
     52    ~IDBObjectStore() { }
    4553
    46     virtual String name() const = 0;
    47     virtual String keyPath() const = 0;
    48     virtual PassRefPtr<DOMStringList> indexNames() const = 0;
     54    String name() const;
     55    String keyPath() const;
     56    PassRefPtr<DOMStringList> indexNames() const;
    4957
    50     virtual void get(PassRefPtr<IDBKey> key, PassRefPtr<IDBCallbacks>) = 0;
    51     virtual void put(PassRefPtr<SerializedScriptValue> value, PassRefPtr<IDBKey> key, bool addOnly, PassRefPtr<IDBCallbacks>) = 0;
    52     virtual void remove(PassRefPtr<IDBKey> key, PassRefPtr<IDBCallbacks>) = 0;
     58    PassRefPtr<IDBRequest> get(ScriptExecutionContext*, PassRefPtr<IDBKey> key);
     59    PassRefPtr<IDBRequest> add(ScriptExecutionContext*, PassRefPtr<SerializedScriptValue> value, PassRefPtr<IDBKey> key = 0);
     60    PassRefPtr<IDBRequest> put(ScriptExecutionContext*, PassRefPtr<SerializedScriptValue> value, PassRefPtr<IDBKey> key = 0);
     61    PassRefPtr<IDBRequest> remove(ScriptExecutionContext*, PassRefPtr<IDBKey> key);
    5362
    54     virtual void createIndex(const String& name, const String& keyPath, bool unique, PassRefPtr<IDBCallbacks>) = 0;
    55     virtual PassRefPtr<IDBIndexBackendInterface> index(const String& name) = 0;
    56     virtual void removeIndex(const String& name, PassRefPtr<IDBCallbacks>) = 0;
     63    PassRefPtr<IDBRequest> createIndex(ScriptExecutionContext*, const String& name, const String& keyPath, bool unique = false);
     64    PassRefPtr<IDBIndex> index(const String& name);
     65    PassRefPtr<IDBRequest> removeIndex(ScriptExecutionContext*, const String& name);
     66
     67private:
     68    IDBObjectStore(PassRefPtr<IDBObjectStoreBackendInterface>);
     69
     70    RefPtr<IDBObjectStoreBackendInterface> m_objectStore;
    5771};
    5872

  • trunk/WebCore/storage/IDBObjectStore.idl

    r64573 r64577  
    2828    interface [
    2929        Conditional=INDEXED_DATABASE
    30     ] IDBObjectStoreRequest {
     30    ] IDBObjectStore {
    3131        [CallWith=ScriptExecutionContext] IDBRequest get(in IDBKey key);       
    3232        // FIXME: Come to concensus re getAll.

  • trunk/WebCore/storage/IDBObjectStoreBackendImpl.cpp

    r64573 r64577  
    2525
    2626#include "config.h"
    27 #include "IDBObjectStoreImpl.h"
     27#include "IDBObjectStoreBackendImpl.h"
    2828
    2929#include "DOMStringList.h"
    … …  
    3838namespace WebCore {
    3939
    40 IDBObjectStoreImpl::~IDBObjectStoreImpl()
     40IDBObjectStoreBackendImpl::~IDBObjectStoreBackendImpl()
    4141{
    4242}
    4343
    44 IDBObjectStoreImpl::IDBObjectStoreImpl(const String& name, const String& keyPath, bool autoIncrement)
     44IDBObjectStoreBackendImpl::IDBObjectStoreBackendImpl(const String& name, const String& keyPath, bool autoIncrement)
    4545    : m_name(name)
    4646    , m_keyPath(keyPath)
    … …  
    5050}
    5151
    52 PassRefPtr<DOMStringList> IDBObjectStoreImpl::indexNames() const
     52PassRefPtr<DOMStringList> IDBObjectStoreBackendImpl::indexNames() const
    5353{
    5454    RefPtr<DOMStringList> indexNames = DOMStringList::create();
    … …  
    5858}
    5959
    60 void IDBObjectStoreImpl::get(PassRefPtr<IDBKey> key, PassRefPtr<IDBCallbacks> callbacks)
     60void IDBObjectStoreBackendImpl::get(PassRefPtr<IDBKey> key, PassRefPtr<IDBCallbacks> callbacks)
    6161{
    6262    RefPtr<SerializedScriptValue> value = m_tree->get(key.get());
    … …  
    6868}
    6969
    70 void IDBObjectStoreImpl::put(PassRefPtr<SerializedScriptValue> value, PassRefPtr<IDBKey> prpKey, bool addOnly, PassRefPtr<IDBCallbacks> callbacks)
     70void IDBObjectStoreBackendImpl::put(PassRefPtr<SerializedScriptValue> value, PassRefPtr<IDBKey> prpKey, bool addOnly, PassRefPtr<IDBCallbacks> callbacks)
    7171{
    7272    RefPtr<IDBKey> key = prpKey;
    … …  
    9696}
    9797
    98 void IDBObjectStoreImpl::remove(PassRefPtr<IDBKey> key, PassRefPtr<IDBCallbacks> callbacks)
     98void IDBObjectStoreBackendImpl::remove(PassRefPtr<IDBKey> key, PassRefPtr<IDBCallbacks> callbacks)
    9999{
    100100    m_tree->remove(key.get());
    … …  
    102102}
    103103
    104 void IDBObjectStoreImpl::createIndex(const String& name, const String& keyPath, bool unique, PassRefPtr<IDBCallbacks> callbacks)
     104void IDBObjectStoreBackendImpl::createIndex(const String& name, const String& keyPath, bool unique, PassRefPtr<IDBCallbacks> callbacks)
    105105{
    106106    if (m_indexes.contains(name)) {
    … …  
    115115}
    116116
    117 PassRefPtr<IDBIndexBackendInterface> IDBObjectStoreImpl::index(const String& name)
     117PassRefPtr<IDBIndexBackendInterface> IDBObjectStoreBackendImpl::index(const String& name)
    118118{
    119119    return m_indexes.get(name);
    120120}
    121121
    122 void IDBObjectStoreImpl::removeIndex(const String& name, PassRefPtr<IDBCallbacks> callbacks)
     122void IDBObjectStoreBackendImpl::removeIndex(const String& name, PassRefPtr<IDBCallbacks> callbacks)
    123123{
    124124    if (!m_indexes.contains(name)) {

  • trunk/WebCore/storage/IDBObjectStoreBackendImpl.h

    r64573 r64577  
    2424 */
    2525
    26 #ifndef IDBObjectStoreImpl_h
    27 #define IDBObjectStoreImpl_h
     26#ifndef IDBObjectStoreBackendImpl_h
     27#define IDBObjectStoreBackendImpl_h
    2828
    29 #include "IDBObjectStore.h"
     29#include "IDBObjectStoreBackendInterface.h"
    3030#include "StringHash.h"
    3131#include <wtf/HashMap.h>
    … …  
    3737template <typename ValueType> class IDBKeyTree;
    3838
    39 class IDBObjectStoreImpl : public IDBObjectStore {
     39class IDBObjectStoreBackendImpl : public IDBObjectStoreBackendInterface {
    4040public:
    41     static PassRefPtr<IDBObjectStore> create(const String& name, const String& keyPath, bool autoIncrement)
     41    static PassRefPtr<IDBObjectStoreBackendInterface> create(const String& name, const String& keyPath, bool autoIncrement)
    4242    {
    43         return adoptRef(new IDBObjectStoreImpl(name, keyPath, autoIncrement));
     43        return adoptRef(new IDBObjectStoreBackendImpl(name, keyPath, autoIncrement));
    4444    }
    45     ~IDBObjectStoreImpl();
     45    ~IDBObjectStoreBackendImpl();
    4646
    4747    String name() const { return m_name; }
    … …  
    5858
    5959private:
    60     IDBObjectStoreImpl(const String& name, const String& keyPath, bool autoIncrement);
     60    IDBObjectStoreBackendImpl(const String& name, const String& keyPath, bool autoIncrement);
    6161
    6262    String m_name;
    … …  
    7575#endif
    7676
    77 #endif // IDBObjectStoreImpl_h
     77#endif // IDBObjectStoreBackendImpl_h

  • trunk/WebCore/storage/IDBObjectStoreBackendInterface.h

    r64573 r64577  
    2424 */
    2525
    26 #ifndef IDBObjectStore_h
    27 #define IDBObjectStore_h
     26#ifndef IDBObjectStoreBackendInterface_h
     27#define IDBObjectStoreBackendInterface_h
    2828
    2929#include "PlatformString.h"
    … …  
    4040class SerializedScriptValue;
    4141
    42 class IDBObjectStore : public ThreadSafeShared<IDBObjectStore> {
     42class IDBObjectStoreBackendInterface : public ThreadSafeShared<IDBObjectStoreBackendInterface> {
    4343public:
    44     virtual ~IDBObjectStore() { }
     44    virtual ~IDBObjectStoreBackendInterface() { }
    4545
    4646    virtual String name() const = 0;
    … …  
    6161#endif
    6262
    63 #endif // IDBObjectStore_h
     63#endif // IDBObjectStoreBackendInterface_h
    6464

  • trunk/WebCore/storage/IDBRequest.cpp

    r64543 r64577  
    3939#include "IDBIndex.h"
    4040#include "IDBErrorEvent.h"
    41 #include "IDBObjectStoreRequest.h"
     41#include "IDBObjectStore.h"
    4242#include "IDBSuccessEvent.h"
    4343#include "ScriptExecutionContext.h"
    … …  
    7474}
    7575
    76 void IDBRequest::onSuccess(PassRefPtr<IDBDatabaseBackendInterface> idbDatabaseBackend)
     76void IDBRequest::onSuccess(PassRefPtr<IDBDatabaseBackendInterface> backend)
    7777{
    7878    onEventCommon();
    79     m_result->set(IDBDatabase::create(idbDatabaseBackend));
     79    m_result->set(IDBDatabase::create(backend));
    8080}
    8181
    … …  
    9292}
    9393
    94 void IDBRequest::onSuccess(PassRefPtr<IDBObjectStore> idbObjectStore)
     94void IDBRequest::onSuccess(PassRefPtr<IDBObjectStoreBackendInterface> backend)
    9595{
    9696    onEventCommon();
    97     m_result->set(IDBObjectStoreRequest::create(idbObjectStore));
     97    m_result->set(IDBObjectStore::create(backend));
    9898}
    9999

  • trunk/WebCore/storage/IDBRequest.h

    r64543 r64577  
    6666    virtual void onSuccess(PassRefPtr<IDBIndexBackendInterface>);
    6767    virtual void onSuccess(PassRefPtr<IDBKey>);
    68     virtual void onSuccess(PassRefPtr<IDBObjectStore>);
     68    virtual void onSuccess(PassRefPtr<IDBObjectStoreBackendInterface>);
    6969    virtual void onSuccess(PassRefPtr<SerializedScriptValue>);
    7070

  • trunk/WebKit/chromium/ChangeLog

    r64554 r64577  
     12010-08-03  Andrei Popescu  <andreip@google.com>
     2
     3        Reviewed by Jeremy Orlow.
     4
     5        [IndexedDB] IDBObjectStoreRequest should be called IDBObjectStore
     6        https://bugs.webkit.org/show_bug.cgi?id=43420
     7
     8        * src/IDBCallbacksProxy.cpp:
     9        (WebCore::IDBCallbacksProxy::onSuccess):
     10        * src/IDBCallbacksProxy.h:
     11        * src/IDBDatabaseProxy.cpp:
     12        (WebCore::IDBDatabaseProxy::objectStore):
     13        * src/IDBDatabaseProxy.h:
     14        * src/IDBObjectStoreProxy.cpp:
     15        (WebCore::IDBObjectStoreProxy::create):
     16        * src/IDBObjectStoreProxy.h:
     17        * src/WebIDBObjectStoreImpl.cpp:
     18        (WebKit::WebIDBObjectStoreImpl::WebIDBObjectStoreImpl):
     19        * src/WebIDBObjectStoreImpl.h:
     20
    1212010-08-03  Yury Semikhatsky  <yurys@chromium.org>
    222

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

    r64543 r64577  
    7070}
    7171
    72 void IDBCallbacksProxy::onSuccess(PassRefPtr<IDBDatabaseBackendInterface> idbDatabaseBackend)
     72void IDBCallbacksProxy::onSuccess(PassRefPtr<IDBDatabaseBackendInterface> backend)
    7373{
    74     m_callbacks->onSuccess(new WebKit::WebIDBDatabaseImpl(idbDatabaseBackend));
     74    m_callbacks->onSuccess(new WebKit::WebIDBDatabaseImpl(backend));
    7575    m_callbacks.clear();
    7676}
    … …  
    8888}
    8989
    90 void IDBCallbacksProxy::onSuccess(PassRefPtr<IDBObjectStore> idbObjectStore)
     90void IDBCallbacksProxy::onSuccess(PassRefPtr<IDBObjectStoreBackendInterface> backend)
    9191{
    92     m_callbacks->onSuccess(new WebKit::WebIDBObjectStoreImpl(idbObjectStore));
     92    m_callbacks->onSuccess(new WebKit::WebIDBObjectStoreImpl(backend));
    9393    m_callbacks.clear();
    9494}

  • trunk/WebKit/chromium/src/IDBCallbacksProxy.h

    r64543 r64577  
    5353    virtual void onSuccess(PassRefPtr<IDBIndexBackendInterface>);
    5454    virtual void onSuccess(PassRefPtr<IDBKey>);
    55     virtual void onSuccess(PassRefPtr<IDBObjectStore>);
     55    virtual void onSuccess(PassRefPtr<IDBObjectStoreBackendInterface>);
    5656    virtual void onSuccess(PassRefPtr<SerializedScriptValue>);
    5757

  • trunk/WebKit/chromium/src/IDBDatabaseProxy.cpp

    r64543 r64577  
    7979}
    8080
    81 PassRefPtr<IDBObjectStore> IDBDatabaseProxy::objectStore(const String& name, unsigned short mode)
     81PassRefPtr<IDBObjectStoreBackendInterface> IDBDatabaseProxy::objectStore(const String& name, unsigned short mode)
    8282{
    8383    WebKit::WebIDBObjectStore* objectStore = m_webIDBDatabase->objectStore(name, mode);

  • trunk/WebKit/chromium/src/IDBDatabaseProxy.h

    r64543 r64577  
    5151
    5252    virtual void createObjectStore(const String& name, const String& keyPath, bool autoIncrement, PassRefPtr<IDBCallbacks>);
    53     virtual PassRefPtr<IDBObjectStore> objectStore(const String& name, unsigned short mode);
     53    virtual PassRefPtr<IDBObjectStoreBackendInterface> objectStore(const String& name, unsigned short mode);
    5454    virtual void removeObjectStore(const String& name, PassRefPtr<IDBCallbacks>);
    5555

  • trunk/WebKit/chromium/src/IDBObjectStoreProxy.cpp

    r64358 r64577  
    4040namespace WebCore {
    4141
    42 PassRefPtr<IDBObjectStore> IDBObjectStoreProxy::create(PassOwnPtr<WebKit::WebIDBObjectStore> objectStore)
     42PassRefPtr<IDBObjectStoreBackendInterface> IDBObjectStoreProxy::create(PassOwnPtr<WebKit::WebIDBObjectStore> objectStore)
    4343{
    4444    return adoptRef(new IDBObjectStoreProxy(objectStore));

  • trunk/WebKit/chromium/src/IDBObjectStoreProxy.h

    r64358 r64577  
    2727#define IDBObjectStoreProxy_h
    2828
    29 #include "IDBObjectStore.h"
     29#include "IDBObjectStoreBackendInterface.h"
    3030#include <wtf/OwnPtr.h>
    3131#include <wtf/PassOwnPtr.h>
    … …  
    3838namespace WebCore {
    3939
    40 class IDBObjectStoreProxy : public IDBObjectStore {
     40class IDBObjectStoreProxy : public IDBObjectStoreBackendInterface {
    4141public:
    42     static PassRefPtr<IDBObjectStore> create(PassOwnPtr<WebKit::WebIDBObjectStore>);
     42    static PassRefPtr<IDBObjectStoreBackendInterface> create(PassOwnPtr<WebKit::WebIDBObjectStore>);
    4343    ~IDBObjectStoreProxy();
    4444

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

    r64543 r64577  
    7575WebIDBObjectStore* WebIDBDatabaseImpl::objectStore(const WebString& name, unsigned short mode)
    7676{
    77     RefPtr<IDBObjectStore> objectStore = m_databaseBackend->objectStore(name, mode);
     77    RefPtr<IDBObjectStoreBackendInterface> objectStore = m_databaseBackend->objectStore(name, mode);
    7878    if (!objectStore)
    7979        return 0;

  • trunk/WebKit/chromium/src/WebIDBObjectStoreImpl.cpp

    r64358 r64577  
    2929#include "DOMStringList.h"
    3030#include "IDBCallbacksProxy.h"
    31 #include "IDBObjectStore.h"
     31#include "IDBObjectStoreBackendInterface.h"
    3232#include "WebIDBIndexImpl.h"
    3333#include "WebIDBKey.h"
    … …  
    4040namespace WebKit {
    4141
    42 WebIDBObjectStoreImpl::WebIDBObjectStoreImpl(PassRefPtr<IDBObjectStore> objectStore)
     42WebIDBObjectStoreImpl::WebIDBObjectStoreImpl(PassRefPtr<IDBObjectStoreBackendInterface> objectStore)
    4343    : m_objectStore(objectStore)
    4444{

  • trunk/WebKit/chromium/src/WebIDBObjectStoreImpl.h

    r63064 r64577  
    3232#include <wtf/RefPtr.h>
    3333
    34 namespace WebCore { class IDBObjectStore; }
     34namespace WebCore { class IDBObjectStoreBackendInterface; }
    3535
    3636namespace WebKit {
    … …  
    4141class WebIDBObjectStoreImpl : public WebIDBObjectStore {
    4242public:
    43     WebIDBObjectStoreImpl(WTF::PassRefPtr<WebCore::IDBObjectStore> objectStore);
     43    WebIDBObjectStoreImpl(WTF::PassRefPtr<WebCore::IDBObjectStoreBackendInterface>);
    4444    ~WebIDBObjectStoreImpl();
    4545
    … …  
    5757
    5858 private:
    59     WTF::RefPtr<WebCore::IDBObjectStore> m_objectStore;
     59    WTF::RefPtr<WebCore::IDBObjectStoreBackendInterface> m_objectStore;
    6060};
    6161
Note: See TracChangeset for help on using the changeset viewer.