Changeset 64358 in webkit


Ignore:
Timestamp:
Jul 30, 2010 8:29:58 AM (14 years ago)
Author:
jorlow@chromium.org
Message:

2010-07-29 Jeremy Orlow <jorlow@chromium.org>

Reviewed by Steve Block.

Rename all the IDBIndex classses to match the latest conventions
https://bugs.webkit.org/show_bug.cgi?id=43190

No functionality has changed.

IDBIndexRequest -> IDBIndex in the spec. So that's the first change.
IDBIndex was the name of our interface class though, so we need to rename
it to get it out of the way. While we're at it, we might as well clean
up the naming in general to make things more clear. In the future, we're
going to need another layer (yes, yuck) which will be shared by the async
and sync classes which will do caching and other optimizations. That will
then connect to the backend. We also added "Interface" to make it more
clear that's what the file/class is.

Existing layout tests are enough since nothing should change as far as JavaScript can see.

  • 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.xcodeproj/project.pbxproj:
  • bindings/js/JSIDBAnyCustom.cpp: (WebCore::toJS):
  • bindings/v8/custom/V8IDBAnyCustom.cpp: (WebCore::toV8):
  • storage/IDBAny.cpp: (WebCore::IDBAny::idbIndex): (WebCore::IDBAny::set):
  • storage/IDBAny.h: (WebCore::IDBAny::):
  • storage/IDBCallbacks.h:
  • storage/IDBIndex.cpp: Added. (WebCore::IDBIndex::IDBIndex): (WebCore::IDBIndex::~IDBIndex):
  • storage/IDBIndex.h: (WebCore::IDBIndex::create): (WebCore::IDBIndex::name): (WebCore::IDBIndex::keyPath): (WebCore::IDBIndex::unique):
  • storage/IDBIndex.idl: Added.
  • storage/IDBIndexBackendImpl.cpp: Added. (WebCore::IDBIndexBackendImpl::IDBIndexBackendImpl): (WebCore::IDBIndexBackendImpl::~IDBIndexBackendImpl):
  • storage/IDBIndexBackendImpl.h: Added. (WebCore::IDBIndexBackendImpl::create): (WebCore::IDBIndexBackendImpl::name): (WebCore::IDBIndexBackendImpl::keyPath): (WebCore::IDBIndexBackendImpl::unique):
  • storage/IDBIndexBackendInterface.h: Added. (WebCore::IDBIndexBackendInterface::~IDBIndexBackendInterface):
  • storage/IDBIndexImpl.cpp: Removed.
  • storage/IDBIndexImpl.h: Removed.
  • storage/IDBIndexRequest.cpp: Removed.
  • storage/IDBIndexRequest.h: Removed.
  • storage/IDBIndexRequest.idl: Removed.
  • storage/IDBObjectStore.h:
  • storage/IDBObjectStoreImpl.cpp: (WebCore::IDBObjectStoreImpl::createIndex): (WebCore::IDBObjectStoreImpl::index):
  • storage/IDBObjectStoreImpl.h:
  • storage/IDBObjectStoreRequest.cpp: (WebCore::IDBObjectStoreRequest::index):
  • storage/IDBObjectStoreRequest.h:
  • storage/IDBObjectStoreRequest.idl:
  • storage/IDBRequest.cpp: (WebCore::IDBRequest::onSuccess):
  • storage/IDBRequest.h:

2010-07-29 Jeremy Orlow <jorlow@chromium.org>

Reviewed by Steve Block.

Rename all the IDBIndex classses to match the latest conventions
https://bugs.webkit.org/show_bug.cgi?id=43190

Fix up stuff in WebKit layer to handle the renamings in WebCore.

  • WebKit.gyp:
  • src/IDBCallbacksProxy.cpp: (WebCore::IDBCallbacksProxy::onSuccess):
  • src/IDBCallbacksProxy.h:
  • src/IDBIndexBackendProxy.cpp: Added. (WebCore::IDBIndexBackendProxy::create): (WebCore::IDBIndexBackendProxy::IDBIndexBackendProxy): (WebCore::IDBIndexBackendProxy::~IDBIndexBackendProxy): (WebCore::IDBIndexBackendProxy::name): (WebCore::IDBIndexBackendProxy::keyPath): (WebCore::IDBIndexBackendProxy::unique):
  • src/IDBIndexBackendProxy.h: Added.
  • src/IDBIndexProxy.cpp: Removed.
  • src/IDBIndexProxy.h: Removed.
  • src/IDBObjectStoreProxy.cpp: (WebCore::IDBObjectStoreProxy::index):
  • src/IDBObjectStoreProxy.h:
  • src/WebIDBCallbacksImpl.cpp: (WebCore::WebIDBCallbacksImpl::onSuccess):
  • src/WebIDBIndexImpl.cpp: (WebKit::WebIDBIndexImpl::WebIDBIndexImpl): (WebKit::WebIDBIndexImpl::name): (WebKit::WebIDBIndexImpl::keyPath): (WebKit::WebIDBIndexImpl::unique):
  • src/WebIDBIndexImpl.h:
  • src/WebIDBObjectStoreImpl.cpp: (WebKit::WebIDBObjectStoreImpl::index):
Location:
trunk
Files:
1 deleted
37 edited
1 copied
6 moved

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/Android.derived.jscbindings.mk

    r64344 r64358  
    368368    $(intermediates)/storage/JSIDBEvent.h \
    369369    $(intermediates)/storage/JSIDBFactory.h \
    370     $(intermediates)/storage/JSIDBIndexRequest.h \
     370    $(intermediates)/storage/JSIDBIndex.h \
    371371    $(intermediates)/storage/JSIDBKey.h \
    372372    $(intermediates)/storage/JSIDBKeyRange.h \
  • trunk/WebCore/Android.derived.v8bindings.mk

    r64344 r64358  
    349349    $(intermediates)/bindings/V8IDBEvent.h \
    350350    $(intermediates)/bindings/V8IDBFactory.h \
    351     $(intermediates)/bindings/V8IDBIndexRequest.h \
     351    $(intermediates)/bindings/V8IDBIndex.h \
    352352    $(intermediates)/bindings/V8IDBKey.h \
    353353    $(intermediates)/bindings/V8IDBKeyRange.h \
  • trunk/WebCore/Android.mk

    r64356 r64358  
    748748        storage/IDBErrorEvent.cpp \
    749749        storage/IDBEvent.cpp \
    750         storage/IDBIndexImpl.cpp \
    751         storage/IDBIndexRequest.cpp \
     750        storage/IDBIndex.cpp \
     751        storage/IDBIndexBackendImpl.cpp \
    752752        storage/IDBKey.cpp \
    753753        storage/IDBKeyRange.cpp \
  • trunk/WebCore/CMakeLists.txt

    r64357 r64358  
    340340    storage/IDBEvent.idl
    341341    storage/IDBFactory.idl
    342     storage/IDBIndexRequest.idl
     342    storage/IDBIndex.idl
    343343    storage/IDBKey.idl
    344344    storage/IDBKeyRange.idl
     
    14391439    storage/IDBErrorEvent.cpp
    14401440    storage/IDBEvent.cpp
     1441    storage/IDBIndex.cpp
     1442    storage/IDBIndexBackendImpl.cpp
    14411443    storage/IDBKey.cpp
    14421444    storage/IDBKeyRange.cpp
  • trunk/WebCore/ChangeLog

    r64357 r64358  
     12010-07-29  Jeremy Orlow  <jorlow@chromium.org>
     2
     3        Reviewed by Steve Block.
     4
     5        Rename all the IDBIndex classses to match the latest conventions
     6        https://bugs.webkit.org/show_bug.cgi?id=43190
     7
     8        No functionality has changed.
     9
     10        IDBIndexRequest -> IDBIndex in the spec.  So that's the first change.
     11        IDBIndex was the name of our interface class though, so we need to rename
     12        it to get it out of the way.  While we're at it, we might as well clean
     13        up the naming in general to make things more clear.  In the future, we're
     14        going to need another layer (yes, yuck) which will be shared by the async
     15        and sync classes which will do caching and other optimizations.  That will
     16        then connect to the backend.  We also added "Interface" to make it more
     17        clear that's what the file/class is.
     18
     19        Existing layout tests are enough since nothing should change as far as JavaScript can see.
     20
     21        * Android.derived.jscbindings.mk:
     22        * Android.derived.v8bindings.mk:
     23        * Android.mk:
     24        * CMakeLists.txt:
     25        * DerivedSources.cpp:
     26        * DerivedSources.make:
     27        * GNUmakefile.am:
     28        * WebCore.gypi:
     29        * WebCore.pri:
     30        * WebCore.pro:
     31        * WebCore.xcodeproj/project.pbxproj:
     32        * bindings/js/JSIDBAnyCustom.cpp:
     33        (WebCore::toJS):
     34        * bindings/v8/custom/V8IDBAnyCustom.cpp:
     35        (WebCore::toV8):
     36        * storage/IDBAny.cpp:
     37        (WebCore::IDBAny::idbIndex):
     38        (WebCore::IDBAny::set):
     39        * storage/IDBAny.h:
     40        (WebCore::IDBAny::):
     41        * storage/IDBCallbacks.h:
     42        * storage/IDBIndex.cpp: Added.
     43        (WebCore::IDBIndex::IDBIndex):
     44        (WebCore::IDBIndex::~IDBIndex):
     45        * storage/IDBIndex.h:
     46        (WebCore::IDBIndex::create):
     47        (WebCore::IDBIndex::name):
     48        (WebCore::IDBIndex::keyPath):
     49        (WebCore::IDBIndex::unique):
     50        * storage/IDBIndex.idl: Added.
     51        * storage/IDBIndexBackendImpl.cpp: Added.
     52        (WebCore::IDBIndexBackendImpl::IDBIndexBackendImpl):
     53        (WebCore::IDBIndexBackendImpl::~IDBIndexBackendImpl):
     54        * storage/IDBIndexBackendImpl.h: Added.
     55        (WebCore::IDBIndexBackendImpl::create):
     56        (WebCore::IDBIndexBackendImpl::name):
     57        (WebCore::IDBIndexBackendImpl::keyPath):
     58        (WebCore::IDBIndexBackendImpl::unique):
     59        * storage/IDBIndexBackendInterface.h: Added.
     60        (WebCore::IDBIndexBackendInterface::~IDBIndexBackendInterface):
     61        * storage/IDBIndexImpl.cpp: Removed.
     62        * storage/IDBIndexImpl.h: Removed.
     63        * storage/IDBIndexRequest.cpp: Removed.
     64        * storage/IDBIndexRequest.h: Removed.
     65        * storage/IDBIndexRequest.idl: Removed.
     66        * storage/IDBObjectStore.h:
     67        * storage/IDBObjectStoreImpl.cpp:
     68        (WebCore::IDBObjectStoreImpl::createIndex):
     69        (WebCore::IDBObjectStoreImpl::index):
     70        * storage/IDBObjectStoreImpl.h:
     71        * storage/IDBObjectStoreRequest.cpp:
     72        (WebCore::IDBObjectStoreRequest::index):
     73        * storage/IDBObjectStoreRequest.h:
     74        * storage/IDBObjectStoreRequest.idl:
     75        * storage/IDBRequest.cpp:
     76        (WebCore::IDBRequest::onSuccess):
     77        * storage/IDBRequest.h:
     78
    1792010-07-30  Rafael Antognolli  <antognolli@profusion.mobi>
    280
  • trunk/WebCore/DerivedSources.cpp

    r64344 r64358  
    183183#include "JSIDBEvent.cpp"
    184184#include "JSIDBFactory.cpp"
    185 #include "JSIDBIndexRequest.cpp"
     185#include "JSIDBIndex.cpp"
    186186#include "JSIDBKey.cpp"
    187187#include "JSIDBKeyRange.cpp"
  • trunk/WebCore/DerivedSources.make

    r64344 r64358  
    226226    IDBEvent \
    227227    IDBFactory \
    228     IDBIndexRequest \
     228    IDBIndex \
    229229    IDBKey \
    230230    IDBKeyRange \
  • trunk/WebCore/GNUmakefile.am

    r64356 r64358  
    28392839        DerivedSources/WebCore/JSIDBFactory.cpp \
    28402840        DerivedSources/WebCore/JSIDBFactory.h \
    2841         DerivedSources/WebCore/JSIDBIndexRequest.cpp \
    2842         DerivedSources/WebCore/JSIDBIndexRequest.h \
     2841        DerivedSources/WebCore/JSIDBIndex.cpp \
     2842        DerivedSources/WebCore/JSIDBIndex.h \
    28432843        DerivedSources/WebCore/JSIDBKeyRange.cpp \
    28442844        DerivedSources/WebCore/JSIDBKeyRange.h \
     
    28652865        WebCore/storage/IDBEvent.cpp \
    28662866        WebCore/storage/IDBEvent.h \
     2867        WebCore/storage/IDBIndex.cpp \
    28672868        WebCore/storage/IDBIndex.h \
    2868         WebCore/storage/IDBIndexImpl.cpp \
    2869         WebCore/storage/IDBIndexImpl.h \
    2870         WebCore/storage/IDBIndexRequest.cpp \
    2871         WebCore/storage/IDBIndexRequest.h \
     2869        WebCore/storage/IDBIndexBackendInterface.h \
     2870        WebCore/storage/IDBIndexBackendImpl.cpp \
     2871        WebCore/storage/IDBIndexBackendImpl.h \
    28722872        WebCore/storage/IDBKeyRange.cpp \
    28732873        WebCore/storage/IDBKeyRange.h \
  • trunk/WebCore/WebCore.gypi

    r64356 r64358  
    238238            'storage/IDBEvent.idl',
    239239            'storage/IDBFactory.idl',
    240             'storage/IDBIndexRequest.idl',
     240            'storage/IDBIndex.idl',
    241241            'storage/IDBKey.idl',
    242242            'storage/IDBKeyRange.idl',
     
    34933493            'storage/IDBFactoryBackendImpl.cpp',
    34943494            'storage/IDBFactoryBackendImpl.h',
     3495            'storage/IDBIndex.cpp',
    34953496            'storage/IDBIndex.h',
    3496             'storage/IDBIndexImpl.cpp',
    3497             'storage/IDBIndexImpl.h',
    3498             'storage/IDBIndexRequest.cpp',
    3499             'storage/IDBIndexRequest.h',
     3497            'storage/IDBIndexBackendInterface.h',
     3498            'storage/IDBIndexBackendImpl.cpp',
     3499            'storage/IDBIndexBackendImpl.h',
    35003500            'storage/IDBKey.cpp',
    35013501            'storage/IDBKey.h',
  • trunk/WebCore/WebCore.pri

    r64344 r64358  
    489489    storage/IDBErrorEvent.idl \
    490490    storage/IDBEvent.idl \
    491     storage/IDBIndexRequest.idl \
     491    storage/IDBIndex.idl \
    492492    storage/IDBKey.idl \
    493493    storage/IDBKeyRange.idl \
  • trunk/WebCore/WebCore.pro

    r64356 r64358  
    24342434        storage/IDBFactoryBackendImpl.h \
    24352435        storage/IDBIndex.h \
    2436         storage/IDBIndexImpl.h \
    2437         storage/IDBIndexRequest.h \
     2436        storage/IDBIndexBackendInterface.h \
     2437        storage/IDBIndexBackendImpl.h \
    24382438        storage/IDBKey.h \
    24392439        storage/IDBKeyRange.h \
     
    24562456        storage/IDBFactoryBackendInterface.cpp \
    24572457        storage/IDBFactoryBackendImpl.cpp \
    2458         storage/IDBIndexImpl.cpp \
    2459         storage/IDBIndexRequest.cpp \
     2458        storage/IDBIndex.cpp \
     2459        storage/IDBIndexBackendImpl.cpp \
    24602460        storage/IDBKey.cpp \
    24612461        storage/IDBKeyRange.cpp \
  • trunk/WebCore/WebCore.vcproj/WebCore.vcproj

    r64356 r64358  
    4476544765                                </File>
    4476644766                                <File
    44767                                         RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBIndexRequest.cpp"
     44767                                        RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBIndex.cpp"
    4476844768                                        >
    4476944769                                        <FileConfiguration
     
    4481744817                                </File>
    4481844818                                <File
    44819                                         RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBIndexRequest.h"
     44819                                        RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBIndex.h"
    4482044820                                        >
    4482144821                                </File>
     
    5015450154                        </File>
    5015550155                        <File
     50156                                RelativePath="..\storage\IDBIndex.cpp"
     50157                                >
     50158                        </File>
     50159                        <File
    5015650160                                RelativePath="..\storage\IDBIndex.h"
    5015750161                                >
    5015850162                        </File>
    5015950163                        <File
    50160                                 RelativePath="..\storage\IDBIndexImpl.cpp"
    50161                                 >
    50162                         </File>
    50163                         <File
    50164                                 RelativePath="..\storage\IDBIndexImpl.h"
    50165                                 >
    50166                         </File>
    50167                         <File
    50168                                 RelativePath="..\storage\IDBIndexRequest.cpp"
    50169                                 >
    50170                         </File>
    50171                         <File
    50172                                 RelativePath="..\storage\IDBIndexRequest.h"
     50164                                RelativePath="..\storage\IDBIndexBackendInterface.h"
     50165                                >
     50166                        </File>
     50167                        <File
     50168                                RelativePath="..\storage\IDBIndexBackendImpl.cpp"
     50169                                >
     50170                        </File>
     50171                        <File
     50172                                RelativePath="..\storage\IDBIndexBackendImpl.h"
    5017350173                                >
    5017450174                        </File>
  • trunk/WebCore/WebCore.xcodeproj/project.pbxproj

    r64356 r64358  
    49184918                C55E38BF10040D5D00A56BDB /* StorageNamespaceImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = C55E38BB10040D5D00A56BDB /* StorageNamespaceImpl.h */; };
    49194919                C55E38C010040D5D00A56BDB /* StorageNamespaceImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C55E38BC10040D5D00A56BDB /* StorageNamespaceImpl.cpp */; };
     4920                C572EE0A1201C736007D8F82 /* IDBIndex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C572EE041201C736007D8F82 /* IDBIndex.cpp */; };
     4921                C572EE0B1201C736007D8F82 /* IDBIndex.h in Headers */ = {isa = PBXBuildFile; fileRef = C572EE051201C736007D8F82 /* IDBIndex.h */; };
     4922                C572EE0D1201C736007D8F82 /* IDBIndexBackendImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C572EE071201C736007D8F82 /* IDBIndexBackendImpl.cpp */; };
     4923                C572EE0E1201C736007D8F82 /* IDBIndexBackendImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = C572EE081201C736007D8F82 /* IDBIndexBackendImpl.h */; };
     4924                C572EE0F1201C736007D8F82 /* IDBIndexBackendInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = C572EE091201C736007D8F82 /* IDBIndexBackendInterface.h */; };
     4925                C572EE1E1201C9BC007D8F82 /* JSIDBIndex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C572EE1C1201C9BC007D8F82 /* JSIDBIndex.cpp */; };
     4926                C572EE1F1201C9BC007D8F82 /* JSIDBIndex.h in Headers */ = {isa = PBXBuildFile; fileRef = C572EE1D1201C9BC007D8F82 /* JSIDBIndex.h */; };
    49204927                C585A65E11D4FAB2004C3E4B /* JSIDBAnyCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A65C11D4FAB2004C3E4B /* JSIDBAnyCustom.cpp */; };
    49214928                C585A65F11D4FAB2004C3E4B /* JSIDBKeyCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A65D11D4FAB2004C3E4B /* JSIDBKeyCustom.cpp */; };
     
    49344941                C585A68611D4FB08004C3E4B /* JSIDBEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A66E11D4FB07004C3E4B /* JSIDBEvent.cpp */; };
    49354942                C585A68711D4FB08004C3E4B /* JSIDBEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A66F11D4FB07004C3E4B /* JSIDBEvent.h */; };
    4936                 C585A68811D4FB08004C3E4B /* JSIDBIndexRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A67011D4FB07004C3E4B /* JSIDBIndexRequest.cpp */; };
    4937                 C585A68911D4FB08004C3E4B /* JSIDBIndexRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A67111D4FB07004C3E4B /* JSIDBIndexRequest.h */; };
    49384943                C585A68A11D4FB08004C3E4B /* JSIDBKey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A67211D4FB07004C3E4B /* JSIDBKey.cpp */; };
    49394944                C585A68B11D4FB08004C3E4B /* JSIDBKey.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A67311D4FB07004C3E4B /* JSIDBKey.h */; };
     
    49624967                C585A6DD11D4FB3D004C3E4B /* IDBEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A6A911D4FB3D004C3E4B /* IDBEvent.cpp */; };
    49634968                C585A6DE11D4FB3D004C3E4B /* IDBEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A6AA11D4FB3D004C3E4B /* IDBEvent.h */; };
    4964                 C585A6E011D4FB3D004C3E4B /* IDBIndex.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A6AC11D4FB3D004C3E4B /* IDBIndex.h */; };
    4965                 C585A6E111D4FB3D004C3E4B /* IDBIndexImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A6AD11D4FB3D004C3E4B /* IDBIndexImpl.cpp */; };
    4966                 C585A6E211D4FB3D004C3E4B /* IDBIndexImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A6AE11D4FB3D004C3E4B /* IDBIndexImpl.h */; };
    4967                 C585A6E311D4FB3D004C3E4B /* IDBIndexRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A6AF11D4FB3D004C3E4B /* IDBIndexRequest.cpp */; };
    4968                 C585A6E411D4FB3D004C3E4B /* IDBIndexRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A6B011D4FB3D004C3E4B /* IDBIndexRequest.h */; };
    49694969                C585A6E611D4FB3D004C3E4B /* IDBKey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A6B211D4FB3D004C3E4B /* IDBKey.cpp */; };
    49704970                C585A6E711D4FB3D004C3E4B /* IDBKey.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A6B311D4FB3D004C3E4B /* IDBKey.h */; };
     
    1058310583                C55E38BB10040D5D00A56BDB /* StorageNamespaceImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageNamespaceImpl.h; sourceTree = "<group>"; };
    1058410584                C55E38BC10040D5D00A56BDB /* StorageNamespaceImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageNamespaceImpl.cpp; sourceTree = "<group>"; };
     10585                C572EE041201C736007D8F82 /* IDBIndex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBIndex.cpp; sourceTree = "<group>"; };
     10586                C572EE051201C736007D8F82 /* IDBIndex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBIndex.h; sourceTree = "<group>"; };
     10587                C572EE061201C736007D8F82 /* IDBIndex.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = IDBIndex.idl; sourceTree = "<group>"; };
     10588                C572EE071201C736007D8F82 /* IDBIndexBackendImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBIndexBackendImpl.cpp; sourceTree = "<group>"; };
     10589                C572EE081201C736007D8F82 /* IDBIndexBackendImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBIndexBackendImpl.h; sourceTree = "<group>"; };
     10590                C572EE091201C736007D8F82 /* IDBIndexBackendInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBIndexBackendInterface.h; sourceTree = "<group>"; };
     10591                C572EE1C1201C9BC007D8F82 /* JSIDBIndex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSIDBIndex.cpp; sourceTree = "<group>"; };
     10592                C572EE1D1201C9BC007D8F82 /* JSIDBIndex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSIDBIndex.h; sourceTree = "<group>"; };
    1058510593                C585A65C11D4FAB2004C3E4B /* JSIDBAnyCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSIDBAnyCustom.cpp; sourceTree = "<group>"; };
    1058610594                C585A65D11D4FAB2004C3E4B /* JSIDBKeyCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSIDBKeyCustom.cpp; sourceTree = "<group>"; };
     
    1059910607                C585A66E11D4FB07004C3E4B /* JSIDBEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSIDBEvent.cpp; sourceTree = "<group>"; };
    1060010608                C585A66F11D4FB07004C3E4B /* JSIDBEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSIDBEvent.h; sourceTree = "<group>"; };
    10601                 C585A67011D4FB07004C3E4B /* JSIDBIndexRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSIDBIndexRequest.cpp; sourceTree = "<group>"; };
    10602                 C585A67111D4FB07004C3E4B /* JSIDBIndexRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSIDBIndexRequest.h; sourceTree = "<group>"; };
    1060310609                C585A67211D4FB07004C3E4B /* JSIDBKey.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSIDBKey.cpp; sourceTree = "<group>"; };
    1060410610                C585A67311D4FB07004C3E4B /* JSIDBKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSIDBKey.h; sourceTree = "<group>"; };
     
    1063310639                C585A6AA11D4FB3D004C3E4B /* IDBEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBEvent.h; sourceTree = "<group>"; };
    1063410640                C585A6AB11D4FB3D004C3E4B /* IDBEvent.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = IDBEvent.idl; sourceTree = "<group>"; };
    10635                 C585A6AC11D4FB3D004C3E4B /* IDBIndex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBIndex.h; sourceTree = "<group>"; };
    10636                 C585A6AD11D4FB3D004C3E4B /* IDBIndexImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBIndexImpl.cpp; sourceTree = "<group>"; };
    10637                 C585A6AE11D4FB3D004C3E4B /* IDBIndexImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBIndexImpl.h; sourceTree = "<group>"; };
    10638                 C585A6AF11D4FB3D004C3E4B /* IDBIndexRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBIndexRequest.cpp; sourceTree = "<group>"; };
    10639                 C585A6B011D4FB3D004C3E4B /* IDBIndexRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBIndexRequest.h; sourceTree = "<group>"; };
    10640                 C585A6B111D4FB3D004C3E4B /* IDBIndexRequest.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = IDBIndexRequest.idl; sourceTree = "<group>"; };
    1064110641                C585A6B211D4FB3D004C3E4B /* IDBKey.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBKey.cpp; sourceTree = "<group>"; };
    1064210642                C585A6B311D4FB3D004C3E4B /* IDBKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBKey.h; sourceTree = "<group>"; };
     
    1134411344                                C585A6AA11D4FB3D004C3E4B /* IDBEvent.h */,
    1134511345                                C585A6AB11D4FB3D004C3E4B /* IDBEvent.idl */,
    11346                                 C585A6AC11D4FB3D004C3E4B /* IDBIndex.h */,
    11347                                 C585A6AD11D4FB3D004C3E4B /* IDBIndexImpl.cpp */,
    11348                                 C585A6AE11D4FB3D004C3E4B /* IDBIndexImpl.h */,
    11349                                 C585A6AF11D4FB3D004C3E4B /* IDBIndexRequest.cpp */,
    11350                                 C585A6B011D4FB3D004C3E4B /* IDBIndexRequest.h */,
    11351                                 C585A6B111D4FB3D004C3E4B /* IDBIndexRequest.idl */,
     11346                                C572EE041201C736007D8F82 /* IDBIndex.cpp */,
     11347                                C572EE051201C736007D8F82 /* IDBIndex.h */,
     11348                                C572EE061201C736007D8F82 /* IDBIndex.idl */,
     11349                                C572EE071201C736007D8F82 /* IDBIndexBackendImpl.cpp */,
     11350                                C572EE081201C736007D8F82 /* IDBIndexBackendImpl.h */,
     11351                                C572EE091201C736007D8F82 /* IDBIndexBackendInterface.h */,
    1135211352                                C585A6B211D4FB3D004C3E4B /* IDBKey.cpp */,
    1135311353                                C585A6B311D4FB3D004C3E4B /* IDBKey.h */,
     
    1478214782                                C585A66E11D4FB07004C3E4B /* JSIDBEvent.cpp */,
    1478314783                                C585A66F11D4FB07004C3E4B /* JSIDBEvent.h */,
    14784                                 C585A67011D4FB07004C3E4B /* JSIDBIndexRequest.cpp */,
    14785                                 C585A67111D4FB07004C3E4B /* JSIDBIndexRequest.h */,
     14784                                C572EE1C1201C9BC007D8F82 /* JSIDBIndex.cpp */,
     14785                                C572EE1D1201C9BC007D8F82 /* JSIDBIndex.h */,
    1478614786                                C585A67211D4FB07004C3E4B /* JSIDBKey.cpp */,
    1478714787                                C585A67311D4FB07004C3E4B /* JSIDBKey.h */,
     
    1850118501                                C585A6DB11D4FB3D004C3E4B /* IDBErrorEvent.h in Headers */,
    1850218502                                C585A6DE11D4FB3D004C3E4B /* IDBEvent.h in Headers */,
    18503                                 C585A6E011D4FB3D004C3E4B /* IDBIndex.h in Headers */,
    18504                                 C585A6E211D4FB3D004C3E4B /* IDBIndexImpl.h in Headers */,
    18505                                 C585A6E411D4FB3D004C3E4B /* IDBIndexRequest.h in Headers */,
    1850618503                                C585A6E711D4FB3D004C3E4B /* IDBKey.h in Headers */,
    1850718504                                C585A6EA11D4FB3D004C3E4B /* IDBKeyRange.h in Headers */,
     
    1875418751                                C585A68511D4FB08004C3E4B /* JSIDBErrorEvent.h in Headers */,
    1875518752                                C585A68711D4FB08004C3E4B /* JSIDBEvent.h in Headers */,
    18756                                 C585A68911D4FB08004C3E4B /* JSIDBIndexRequest.h in Headers */,
    1875718753                                C585A68B11D4FB08004C3E4B /* JSIDBKey.h in Headers */,
    1875818754                                C585A68D11D4FB08004C3E4B /* JSIDBKeyRange.h in Headers */,
     
    1988619882                                085B05C311FAE16C004D65F6 /* SVGResourcesCycleSolver.h in Headers */,
    1988719883                                7535BC9512020CFF0037EC45 /* SpeechInputClientMock.h in Headers */,
     19884                                C572EE0B1201C736007D8F82 /* IDBIndex.h in Headers */,
     19885                                C572EE0E1201C736007D8F82 /* IDBIndexBackendImpl.h in Headers */,
     19886                                C572EE0F1201C736007D8F82 /* IDBIndexBackendInterface.h in Headers */,
     19887                                C572EE1F1201C9BC007D8F82 /* JSIDBIndex.h in Headers */,
    1988819888                        );
    1988919889                        runOnlyForDeploymentPostprocessing = 0;
     
    2092620926                                C585A6DA11D4FB3D004C3E4B /* IDBErrorEvent.cpp in Sources */,
    2092720927                                C585A6DD11D4FB3D004C3E4B /* IDBEvent.cpp in Sources */,
    20928                                 C585A6E111D4FB3D004C3E4B /* IDBIndexImpl.cpp in Sources */,
    20929                                 C585A6E311D4FB3D004C3E4B /* IDBIndexRequest.cpp in Sources */,
    2093020928                                C585A6E611D4FB3D004C3E4B /* IDBKey.cpp in Sources */,
    2093120929                                C585A6E911D4FB3D004C3E4B /* IDBKeyRange.cpp in Sources */,
     
    2121921217                                C585A68411D4FB08004C3E4B /* JSIDBErrorEvent.cpp in Sources */,
    2122021218                                C585A68611D4FB08004C3E4B /* JSIDBEvent.cpp in Sources */,
    21221                                 C585A68811D4FB08004C3E4B /* JSIDBIndexRequest.cpp in Sources */,
    2122221219                                C585A68A11D4FB08004C3E4B /* JSIDBKey.cpp in Sources */,
    2122321220                                C585A65F11D4FAB2004C3E4B /* JSIDBKeyCustom.cpp in Sources */,
     
    2228722284                                085B05C211FAE16C004D65F6 /* SVGResourcesCycleSolver.cpp in Sources */,
    2228822285                                7535BC9412020CFF0037EC45 /* SpeechInputClientMock.cpp in Sources */,
     22286                                C572EE0A1201C736007D8F82 /* IDBIndex.cpp in Sources */,
     22287                                C572EE0D1201C736007D8F82 /* IDBIndexBackendImpl.cpp in Sources */,
     22288                                C572EE1E1201C9BC007D8F82 /* JSIDBIndex.cpp in Sources */,
    2228922289                        );
    2229022290                        runOnlyForDeploymentPostprocessing = 0;
  • trunk/WebCore/bindings/js/JSIDBAnyCustom.cpp

    r64344 r64358  
    3535#include "IDBDatabaseRequest.h"
    3636#include "IDBFactory.h"
    37 #include "IDBIndexRequest.h"
     37#include "IDBIndex.h"
    3838#include "IDBKey.h"
    3939#include "IDBObjectStoreRequest.h"
    4040#include "JSIDBDatabaseRequest.h"
    4141#include "JSIDBFactory.h"
    42 #include "JSIDBIndexRequest.h"
     42#include "JSIDBIndex.h"
    4343#include "JSIDBKey.h"
    4444#include "JSIDBObjectStoreRequest.h"
     
    6161    case IDBAny::IDBDatabaseRequestType:
    6262        return toJS(exec, globalObject, idbAny->idbDatabaseRequest());
    63     case IDBAny::IDBIndexRequestType:
    64         return toJS(exec, globalObject, idbAny->idbIndexRequest());
     63    case IDBAny::IDBIndexType:
     64        return toJS(exec, globalObject, idbAny->idbIndex());
    6565    case IDBAny::IDBKeyType:
    6666        return toJS(exec, globalObject, idbAny->idbKey());
  • trunk/WebCore/bindings/v8/custom/V8IDBAnyCustom.cpp

    r64344 r64358  
    3535#include "V8IDBDatabaseRequest.h"
    3636#include "V8IDBFactory.h"
    37 #include "V8IDBIndexRequest.h"
     37#include "V8IDBIndex.h"
    3838#include "V8IDBKey.h"
    3939#include "V8IDBObjectStoreRequest.h"
     
    5353    case IDBAny::IDBDatabaseRequestType:
    5454        return toV8(impl->idbDatabaseRequest());
    55     case IDBAny::IDBIndexRequestType:
    56         return toV8(impl->idbIndexRequest());
     55    case IDBAny::IDBIndexType:
     56        return toV8(impl->idbIndex());
    5757    case IDBAny::IDBKeyType:
    5858        return toV8(impl->idbKey());
  • trunk/WebCore/storage/IDBAny.cpp

    r64344 r64358  
    3131#include "IDBDatabaseRequest.h"
    3232#include "IDBFactory.h"
    33 #include "IDBIndexRequest.h"
     33#include "IDBIndex.h"
    3434#include "IDBObjectStoreRequest.h"
    3535#include "SerializedScriptValue.h"
     
    5757}
    5858
    59 PassRefPtr<IDBIndexRequest> IDBAny::idbIndexRequest()
     59PassRefPtr<IDBIndex> IDBAny::idbIndex()
    6060{
    61     ASSERT(m_type == IDBIndexRequestType);
    62     return m_idbIndexRequest;
     61    ASSERT(m_type == IDBIndexType);
     62    return m_idbIndex;
    6363}
    6464
     
    100100}
    101101
    102 void IDBAny::set(PassRefPtr<IDBIndexRequest> value)
     102void IDBAny::set(PassRefPtr<IDBIndex> value)
    103103{
    104104    ASSERT(m_type == UndefinedType);
    105105    m_type = IDBDatabaseRequestType;
    106     m_idbIndexRequest = value;
     106    m_idbIndex = value;
    107107}
    108108
  • trunk/WebCore/storage/IDBAny.h

    r64344 r64358  
    3636
    3737class IDBDatabaseRequest;
    38 class IDBIndexRequest;
     38class IDBIndex;
    3939class IDBKey;
    4040class IDBObjectStoreRequest;
     
    5858        NullType,
    5959        IDBDatabaseRequestType,
    60         IDBIndexRequestType,
    6160        IDBFactoryType,
     61        IDBIndexType,
    6262        IDBKeyType,
    6363        IDBObjectStoreRequestType,
     
    6868    // Use type() to figure out which one of these you're allowed to call.
    6969    PassRefPtr<IDBDatabaseRequest> idbDatabaseRequest();
    70     PassRefPtr<IDBIndexRequest> idbIndexRequest();
    7170    PassRefPtr<IDBFactory> idbFactory();
     71    PassRefPtr<IDBIndex> idbIndex();
    7272    PassRefPtr<IDBKey> idbKey();
    7373    PassRefPtr<IDBObjectStoreRequest> idbObjectStoreRequest();
     
    7777    void set(); // For "null".
    7878    void set(PassRefPtr<IDBDatabaseRequest>);
    79     void set(PassRefPtr<IDBIndexRequest>);
    8079    void set(PassRefPtr<IDBFactory>);
     80    void set(PassRefPtr<IDBIndex>);
    8181    void set(PassRefPtr<IDBKey>);
    8282    void set(PassRefPtr<IDBObjectStoreRequest>);
     
    9090    // Only one of the following should ever be in use at any given time.
    9191    RefPtr<IDBDatabaseRequest> m_idbDatabaseRequest;
    92     RefPtr<IDBIndexRequest> m_idbIndexRequest;
    9392    RefPtr<IDBFactory> m_idbFactory;
     93    RefPtr<IDBIndex> m_idbIndex;
    9494    RefPtr<IDBKey> m_idbKey;
    9595    RefPtr<IDBObjectStoreRequest> m_idbObjectStoreRequest;
  • trunk/WebCore/storage/IDBCallbacks.h

    r62452 r64358  
    3232#include "IDBDatabase.h"
    3333#include "IDBDatabaseError.h"
    34 #include "IDBIndex.h"
     34#include "IDBIndexBackendInterface.h"
    3535#include "IDBKey.h"
    3636#include "IDBObjectStore.h"
     
    4949    virtual void onSuccess() = 0; // For "null".
    5050    virtual void onSuccess(PassRefPtr<IDBDatabase>) = 0;
    51     virtual void onSuccess(PassRefPtr<IDBIndex>) = 0;
     51    virtual void onSuccess(PassRefPtr<IDBIndexBackendInterface>) = 0;
    5252    virtual void onSuccess(PassRefPtr<IDBKey>) = 0;
    5353    virtual void onSuccess(PassRefPtr<IDBObjectStore>) = 0;
  • trunk/WebCore/storage/IDBIndex.cpp

    r64357 r64358  
    2525
    2626#include "config.h"
    27 #include "IDBIndexRequest.h"
     27#include "IDBIndex.h"
    2828
    2929#if ENABLE(INDEXED_DATABASE)
     
    3131namespace WebCore {
    3232
    33 IDBIndexRequest::IDBIndexRequest(PassRefPtr<IDBIndex> idbIndex)
    34     : m_idbIndex(idbIndex)
     33IDBIndex::IDBIndex(PassRefPtr<IDBIndexBackendInterface> backend)
     34    : m_backend(backend)
    3535{
    3636}
    3737
    38 IDBIndexRequest::~IDBIndexRequest()
     38IDBIndex::~IDBIndex()
    3939{
    4040}
  • trunk/WebCore/storage/IDBIndex.h

    r60357 r64358  
    2727#define IDBIndex_h
    2828
     29#include "IDBIndexBackendInterface.h"
    2930#include "PlatformString.h"
    30 #include <wtf/PassRefPtr.h>
    31 #include <wtf/Threading.h>
     31#include <wtf/Forward.h>
    3232
    3333#if ENABLE(INDEXED_DATABASE)
     
    3535namespace WebCore {
    3636
    37 class IDBIndex : public ThreadSafeShared<IDBIndex> {
     37class IDBIndex : public RefCounted<IDBIndex> {
    3838public:
    39     virtual ~IDBIndex() { }
     39    static PassRefPtr<IDBIndex> create(PassRefPtr<IDBIndexBackendInterface> backend)
     40    {
     41        return adoptRef(new IDBIndex(backend));
     42    }
     43    ~IDBIndex();
    4044
    41     virtual String name() = 0;
    42     virtual String keyPath() = 0;
    43     virtual bool unique() = 0;
     45    // Implement the IDL
     46    String name() const { return m_backend->name(); }
     47    String keyPath() const { return m_backend->keyPath(); }
     48    bool unique() const { return m_backend->unique(); }
     49
     50private:
     51    IDBIndex(PassRefPtr<IDBIndexBackendInterface>);
     52
     53    RefPtr<IDBIndexBackendInterface> m_backend;
    4454};
    4555
  • trunk/WebCore/storage/IDBIndex.idl

    r64357 r64358  
    2828    interface [
    2929        Conditional=INDEXED_DATABASE
    30     ] IDBIndexRequest {
     30    ] IDBIndex {
    3131        // FIXME: Complete this file.
    3232
  • trunk/WebCore/storage/IDBIndexBackendImpl.cpp

    r64357 r64358  
    2525
    2626#include "config.h"
    27 #include "IDBIndexImpl.h"
     27#include "IDBIndexBackendImpl.h"
    2828
    2929#if ENABLE(INDEXED_DATABASE)
     
    3131namespace WebCore {
    3232
    33 IDBIndexImpl::IDBIndexImpl(const String& name, const String& keyPath, bool unique)
     33IDBIndexBackendImpl::IDBIndexBackendImpl(const String& name, const String& keyPath, bool unique)
    3434    : m_name(name)
    3535    , m_keyPath(keyPath)
     
    3838}
    3939
    40 IDBIndexImpl::~IDBIndexImpl()
     40IDBIndexBackendImpl::~IDBIndexBackendImpl()
    4141{
    4242}
  • trunk/WebCore/storage/IDBIndexBackendImpl.h

    • Property svn:eol-style set to LF
    r64357 r64358  
    2424 */
    2525
    26 #ifndef IDBIndexImpl_h
    27 #define IDBIndexImpl_h
     26#ifndef IDBIndexBackendImpl_h
     27#define IDBIndexBackendImpl_h
    2828
    29 #include "IDBIndex.h"
     29#include "IDBIndexBackendInterface.h"
    3030
    3131#if ENABLE(INDEXED_DATABASE)
     
    3333namespace WebCore {
    3434
    35 class IDBIndexImpl : public IDBIndex {
     35class IDBIndexBackendImpl : public IDBIndexBackendInterface {
    3636public:
    37     static PassRefPtr<IDBIndex> create(const String& name, const String& keyPath, bool unique)
     37    static PassRefPtr<IDBIndexBackendImpl> create(const String& name, const String& keyPath, bool unique)
    3838    {
    39         return adoptRef(new IDBIndexImpl(name, keyPath, unique));
     39        return adoptRef(new IDBIndexBackendImpl(name, keyPath, unique));
    4040    }
    41     virtual ~IDBIndexImpl();
     41    virtual ~IDBIndexBackendImpl();
    4242
    43     // Implements IDBIndex
     43    // Implements IDBIndexBackendInterface.
    4444    virtual String name() { return m_name; }
    4545    virtual String keyPath() { return m_keyPath; }
     
    4747
    4848private:
    49     IDBIndexImpl(const String& name, const String& keyPath, bool unique);
     49    IDBIndexBackendImpl(const String& name, const String& keyPath, bool unique);
    5050
    5151    String m_name;
     
    5858#endif
    5959
    60 #endif // IDBIndexImpl_h
     60#endif // IDBIndexBackendImpl_h
  • trunk/WebCore/storage/IDBIndexBackendInterface.h

    r64357 r64358  
    2424 */
    2525
    26 #ifndef IDBIndex_h
    27 #define IDBIndex_h
     26#ifndef IDBIndexBackendInterface_h
     27#define IDBIndexBackendInterface_h
    2828
    2929#include "PlatformString.h"
    30 #include <wtf/PassRefPtr.h>
    31 #include <wtf/Threading.h>
     30#include <wtf/Forward.h>
    3231
    3332#if ENABLE(INDEXED_DATABASE)
     
    3534namespace WebCore {
    3635
    37 class IDBIndex : public ThreadSafeShared<IDBIndex> {
     36class IDBIndexBackendInterface : public ThreadSafeShared<IDBIndexBackendInterface> {
    3837public:
    39     virtual ~IDBIndex() { }
     38    virtual ~IDBIndexBackendInterface() { }
    4039
    4140    virtual String name() = 0;
     
    4847#endif
    4948
    50 #endif // IDBIndex_h
     49#endif // IDBIndexBackendInterface_h
  • trunk/WebCore/storage/IDBObjectStore.h

    r63064 r64358  
    3636class DOMStringList;
    3737class IDBCallbacks;
    38 class IDBIndex;
     38class IDBIndexBackendInterface;
    3939class IDBKey;
    4040class SerializedScriptValue;
     
    5353
    5454    virtual void createIndex(const String& name, const String& keyPath, bool unique, PassRefPtr<IDBCallbacks>) = 0;
    55     virtual PassRefPtr<IDBIndex> index(const String& name) = 0;
     55    virtual PassRefPtr<IDBIndexBackendInterface> index(const String& name) = 0;
    5656    virtual void removeIndex(const String& name, PassRefPtr<IDBCallbacks>) = 0;
    5757};
  • trunk/WebCore/storage/IDBObjectStoreImpl.cpp

    r63064 r64358  
    3131#include "IDBCallbacks.h"
    3232#include "IDBDatabaseException.h"
    33 #include "IDBIndexImpl.h"
     33#include "IDBIndexBackendImpl.h"
    3434#include "IDBKeyTree.h"
    3535
     
    109109    }
    110110
    111     RefPtr<IDBIndex> index = IDBIndexImpl::create(name, keyPath, unique);
     111    RefPtr<IDBIndexBackendInterface> index = IDBIndexBackendImpl::create(name, keyPath, unique);
    112112    ASSERT(index->name() == name);
    113113    m_indexes.set(name, index);
     
    115115}
    116116
    117 PassRefPtr<IDBIndex> IDBObjectStoreImpl::index(const String& name)
     117PassRefPtr<IDBIndexBackendInterface> IDBObjectStoreImpl::index(const String& name)
    118118{
    119119    return m_indexes.get(name);
  • trunk/WebCore/storage/IDBObjectStoreImpl.h

    r63064 r64358  
    5454
    5555    void createIndex(const String& name, const String& keyPath, bool unique, PassRefPtr<IDBCallbacks>);
    56     PassRefPtr<IDBIndex> index(const String& name);
     56    PassRefPtr<IDBIndexBackendInterface> index(const String& name);
    5757    void removeIndex(const String& name, PassRefPtr<IDBCallbacks>);
    5858
     
    6464    bool m_autoIncrement;
    6565
    66     typedef HashMap<String, RefPtr<IDBIndex> > IndexMap;
     66    typedef HashMap<String, RefPtr<IDBIndexBackendInterface> > IndexMap;
    6767    IndexMap m_indexes;
    6868
  • trunk/WebCore/storage/IDBObjectStoreRequest.cpp

    r63211 r64358  
    2929#include "DOMStringList.h"
    3030#include "IDBAny.h"
    31 #include "IDBIndexRequest.h"
     31#include "IDBIndex.h"
    3232#include "IDBKey.h"
    3333#include "SerializedScriptValue.h"
     
    9595}
    9696
    97 PassRefPtr<IDBIndexRequest> IDBObjectStoreRequest::index(const String& name)
     97PassRefPtr<IDBIndex> IDBObjectStoreRequest::index(const String& name)
    9898{
    99     RefPtr<IDBIndex> index = m_objectStore->index(name);
     99    RefPtr<IDBIndexBackendInterface> index = m_objectStore->index(name);
    100100    ASSERT(index); // FIXME: If this is null, we should raise a NOT_FOUND_ERR.
    101     return IDBIndexRequest::create(index.release());
     101    return IDBIndex::create(index.release());
    102102}
    103103
  • trunk/WebCore/storage/IDBObjectStoreRequest.h

    r63211 r64358  
    6262
    6363    PassRefPtr<IDBRequest> createIndex(ScriptExecutionContext*, const String& name, const String& keyPath, bool unique = false);
    64     PassRefPtr<IDBIndexRequest> index(const String& name);
     64    PassRefPtr<IDBIndex> index(const String& name);
    6565    PassRefPtr<IDBRequest> removeIndex(ScriptExecutionContext*, const String& name);
    6666
  • trunk/WebCore/storage/IDBObjectStoreRequest.idl

    r63064 r64358  
    3939        [CallWith=ScriptExecutionContext] IDBRequest createIndex(in DOMString name, in [ConvertNullToNullString] DOMString keyPath, in [Optional] boolean unique);
    4040        // FIXME: This needs to raise an IDBDatabaseException on errors.
    41         IDBIndexRequest index(in DOMString name);
     41        IDBIndex index(in DOMString name);
    4242        [CallWith=ScriptExecutionContext] IDBRequest removeIndex(in DOMString name);
    4343
  • trunk/WebCore/storage/IDBRequest.cpp

    r63064 r64358  
    3737#include "EventNames.h"
    3838#include "IDBDatabaseRequest.h"
    39 #include "IDBIndexRequest.h"
     39#include "IDBIndex.h"
    4040#include "IDBErrorEvent.h"
    4141#include "IDBObjectStoreRequest.h"
     
    8080}
    8181
    82 void IDBRequest::onSuccess(PassRefPtr<IDBIndex> idbIndex)
     82void IDBRequest::onSuccess(PassRefPtr<IDBIndexBackendInterface> backend)
    8383{
    8484    onEventCommon();
    85     m_result->set(IDBIndexRequest::create(idbIndex));
     85    m_result->set(IDBIndex::create(backend));
    8686}
    8787
  • trunk/WebCore/storage/IDBRequest.h

    r62452 r64358  
    6666    virtual void onSuccess(); // For "null".
    6767    virtual void onSuccess(PassRefPtr<IDBDatabase>);
    68     virtual void onSuccess(PassRefPtr<IDBIndex>);
     68    virtual void onSuccess(PassRefPtr<IDBIndexBackendInterface>);
    6969    virtual void onSuccess(PassRefPtr<IDBKey>);
    7070    virtual void onSuccess(PassRefPtr<IDBObjectStore>);
  • trunk/WebKit/chromium/ChangeLog

    r64352 r64358  
     12010-07-29  Jeremy Orlow  <jorlow@chromium.org>
     2
     3        Reviewed by Steve Block.
     4
     5        Rename all the IDBIndex classses to match the latest conventions
     6        https://bugs.webkit.org/show_bug.cgi?id=43190
     7
     8        Fix up stuff in WebKit layer to handle the renamings in WebCore.
     9
     10        * WebKit.gyp:
     11        * src/IDBCallbacksProxy.cpp:
     12        (WebCore::IDBCallbacksProxy::onSuccess):
     13        * src/IDBCallbacksProxy.h:
     14        * src/IDBIndexBackendProxy.cpp: Added.
     15        (WebCore::IDBIndexBackendProxy::create):
     16        (WebCore::IDBIndexBackendProxy::IDBIndexBackendProxy):
     17        (WebCore::IDBIndexBackendProxy::~IDBIndexBackendProxy):
     18        (WebCore::IDBIndexBackendProxy::name):
     19        (WebCore::IDBIndexBackendProxy::keyPath):
     20        (WebCore::IDBIndexBackendProxy::unique):
     21        * src/IDBIndexBackendProxy.h: Added.
     22        * src/IDBIndexProxy.cpp: Removed.
     23        * src/IDBIndexProxy.h: Removed.
     24        * src/IDBObjectStoreProxy.cpp:
     25        (WebCore::IDBObjectStoreProxy::index):
     26        * src/IDBObjectStoreProxy.h:
     27        * src/WebIDBCallbacksImpl.cpp:
     28        (WebCore::WebIDBCallbacksImpl::onSuccess):
     29        * src/WebIDBIndexImpl.cpp:
     30        (WebKit::WebIDBIndexImpl::WebIDBIndexImpl):
     31        (WebKit::WebIDBIndexImpl::name):
     32        (WebKit::WebIDBIndexImpl::keyPath):
     33        (WebKit::WebIDBIndexImpl::unique):
     34        * src/WebIDBIndexImpl.h:
     35        * src/WebIDBObjectStoreImpl.cpp:
     36        (WebKit::WebIDBObjectStoreImpl::index):
     37
    1382010-07-30  Satish Sampath  <satish@chromium.org>
    239
  • trunk/WebKit/chromium/WebKit.gyp

    r64344 r64358  
    324324                'src/IDBFactoryBackendProxy.cpp',
    325325                'src/IDBFactoryBackendProxy.h',
    326                 'src/IDBIndexProxy.cpp',
    327                 'src/IDBIndexProxy.h',
     326                'src/IDBIndexBackendProxy.cpp',
     327                'src/IDBIndexBackendProxy.h',
    328328                'src/IDBObjectStoreProxy.cpp',
    329329                'src/IDBObjectStoreProxy.h',
  • trunk/WebKit/chromium/src/IDBCallbacksProxy.cpp

    r63064 r64358  
    7676}
    7777
    78 void IDBCallbacksProxy::onSuccess(PassRefPtr<IDBIndex> idbIndex)
     78void IDBCallbacksProxy::onSuccess(PassRefPtr<IDBIndexBackendInterface> backend)
    7979{
    80     m_callbacks->onSuccess(new WebKit::WebIDBIndexImpl(idbIndex));
     80    m_callbacks->onSuccess(new WebKit::WebIDBIndexImpl(backend));
    8181    m_callbacks.clear();
    8282}
  • trunk/WebKit/chromium/src/IDBCallbacksProxy.h

    r63064 r64358  
    5151    virtual void onSuccess(); // For "null".
    5252    virtual void onSuccess(PassRefPtr<IDBDatabase>);
    53     virtual void onSuccess(PassRefPtr<IDBIndex>);
     53    virtual void onSuccess(PassRefPtr<IDBIndexBackendInterface>);
    5454    virtual void onSuccess(PassRefPtr<IDBKey>);
    5555    virtual void onSuccess(PassRefPtr<IDBObjectStore>);
  • trunk/WebKit/chromium/src/IDBIndexBackendProxy.cpp

    r64357 r64358  
    2525
    2626#include "config.h"
    27 #include "IDBIndexProxy.h"
     27#include "IDBIndexBackendProxy.h"
    2828
    2929#include "WebIDBDatabaseError.h"
     
    3434namespace WebCore {
    3535
    36 PassRefPtr<IDBIndex> IDBIndexProxy::create(PassOwnPtr<WebKit::WebIDBIndex> Index)
     36PassRefPtr<IDBIndexBackendInterface> IDBIndexBackendProxy::create(PassOwnPtr<WebKit::WebIDBIndex> index)
    3737{
    38     return adoptRef(new IDBIndexProxy(Index));
     38    return adoptRef(new IDBIndexBackendProxy(index));
    3939}
    4040
    41 IDBIndexProxy::IDBIndexProxy(PassOwnPtr<WebKit::WebIDBIndex> Index)
    42     : m_webIDBIndex(Index)
     41IDBIndexBackendProxy::IDBIndexBackendProxy(PassOwnPtr<WebKit::WebIDBIndex> index)
     42    : m_webIDBIndex(index)
    4343{
    4444}
    4545
    46 IDBIndexProxy::~IDBIndexProxy()
     46IDBIndexBackendProxy::~IDBIndexBackendProxy()
    4747{
    4848}
    4949
    50 String IDBIndexProxy::name()
     50String IDBIndexBackendProxy::name()
    5151{
    5252    return m_webIDBIndex->name();
    5353}
    5454
    55 String IDBIndexProxy::keyPath()
     55String IDBIndexBackendProxy::keyPath()
    5656{
    5757    return m_webIDBIndex->keyPath();
    5858}
    5959
    60 bool IDBIndexProxy::unique()
     60bool IDBIndexBackendProxy::unique()
    6161{
    6262    return m_webIDBIndex->unique();
  • trunk/WebKit/chromium/src/IDBIndexBackendProxy.h

    • Property svn:eol-style set to LF
    r64357 r64358  
    2424 */
    2525
    26 #ifndef IDBIndexProxy_h
    27 #define IDBIndexProxy_h
     26#ifndef IDBIndexBackendProxy_h
     27#define IDBIndexBackendProxy_h
    2828
    29 #include "IDBIndex.h"
     29#include "IDBIndexBackendInterface.h"
    3030#include <wtf/OwnPtr.h>
    3131#include <wtf/PassOwnPtr.h>
    32 #include <wtf/PassRefPtr.h>
    3332
    3433#if ENABLE(INDEXED_DATABASE)
     
    3837namespace WebCore {
    3938
    40 class IDBIndexProxy : public IDBIndex {
     39class IDBIndexBackendProxy : public IDBIndexBackendInterface {
    4140public:
    42     static PassRefPtr<IDBIndex> create(PassOwnPtr<WebKit::WebIDBIndex>);
    43     virtual ~IDBIndexProxy();
     41    static PassRefPtr<IDBIndexBackendInterface> create(PassOwnPtr<WebKit::WebIDBIndex>);
     42    virtual ~IDBIndexBackendProxy();
    4443
    4544    virtual String name();
     
    5049
    5150private:
    52     IDBIndexProxy(PassOwnPtr<WebKit::WebIDBIndex>);
     51    IDBIndexBackendProxy(PassOwnPtr<WebKit::WebIDBIndex>);
    5352
    5453    OwnPtr<WebKit::WebIDBIndex> m_webIDBIndex;
     
    5958#endif
    6059
    61 #endif // IDBIndexProxy_h
     60#endif // IDBIndexBackendProxy_h
  • trunk/WebKit/chromium/src/IDBObjectStoreProxy.cpp

    r63064 r64358  
    2929#include "DOMStringList.h"
    3030#include "IDBCallbacks.h"
    31 #include "IDBIndexProxy.h"
     31#include "IDBIndexBackendProxy.h"
    3232#include "WebIDBCallbacksImpl.h"
    3333#include "WebIDBIndex.h"
     
    8989}
    9090
    91 PassRefPtr<IDBIndex> IDBObjectStoreProxy::index(const String& name)
     91PassRefPtr<IDBIndexBackendInterface> IDBObjectStoreProxy::index(const String& name)
    9292{
    9393    WebKit::WebIDBIndex* index = m_webIDBObjectStore->index(name);
    9494    if (!index)
    9595        return 0;
    96     return IDBIndexProxy::create(index);
     96    return IDBIndexBackendProxy::create(index);
    9797}
    9898
  • trunk/WebKit/chromium/src/IDBObjectStoreProxy.h

    r63064 r64358  
    3838namespace WebCore {
    3939
    40 class DOMStringList;
    41 class IDBIndex;
    42 
    4340class IDBObjectStoreProxy : public IDBObjectStore {
    4441public:
     
    5552
    5653    void createIndex(const String& name, const String& keyPath, bool unique, PassRefPtr<IDBCallbacks>);
    57     PassRefPtr<IDBIndex> index(const String& name);
     54    PassRefPtr<IDBIndexBackendInterface> index(const String& name);
    5855    void removeIndex(const String& name, PassRefPtr<IDBCallbacks>);
    5956
  • trunk/WebKit/chromium/src/WebIDBCallbacksImpl.cpp

    r63064 r64358  
    3030#include "IDBDatabaseError.h"
    3131#include "IDBDatabaseProxy.h"
    32 #include "IDBIndexProxy.h"
     32#include "IDBIndexBackendProxy.h"
    3333#include "IDBKey.h"
    3434#include "IDBObjectStoreProxy.h"
     
    8080void WebIDBCallbacksImpl::onSuccess(WebKit::WebIDBIndex* webKitInstance)
    8181{
    82     m_callbacks->onSuccess(IDBIndexProxy::create(webKitInstance));
     82    m_callbacks->onSuccess(IDBIndexBackendProxy::create(webKitInstance));
    8383    m_callbacks.clear();
    8484}
  • trunk/WebKit/chromium/src/WebIDBIndexImpl.cpp

    r60357 r64358  
    3535namespace WebKit {
    3636
    37 WebIDBIndexImpl::WebIDBIndexImpl(PassRefPtr<IDBIndex> idbIndex)
    38     : m_idbIndex(idbIndex)
     37WebIDBIndexImpl::WebIDBIndexImpl(PassRefPtr<IDBIndexBackendInterface> backend)
     38    : m_backend(backend)
    3939{
    4040}
     
    4646WebString WebIDBIndexImpl::name() const
    4747{
    48     return m_idbIndex->name();
     48    return m_backend->name();
    4949}
    5050
    5151WebString WebIDBIndexImpl::keyPath() const
    5252{
    53     return m_idbIndex->keyPath();
     53    return m_backend->keyPath();
    5454}
    5555
    5656bool WebIDBIndexImpl::unique() const
    5757{
    58     return m_idbIndex->unique();
     58    return m_backend->unique();
    5959}
    6060
  • trunk/WebKit/chromium/src/WebIDBIndexImpl.h

    r60357 r64358  
    3232#include <wtf/RefPtr.h>
    3333
    34 namespace WebCore { class IDBIndex; }
     34namespace WebCore { class IDBIndexBackendInterface; }
    3535
    3636namespace WebKit {
     
    3939class WebIDBIndexImpl : public WebIDBIndex {
    4040public:
    41     WebIDBIndexImpl(WTF::PassRefPtr<WebCore::IDBIndex> idbIndex);
     41    WebIDBIndexImpl(WTF::PassRefPtr<WebCore::IDBIndexBackendInterface>);
    4242    virtual ~WebIDBIndexImpl();
    4343
     
    4747
    4848private:
    49     WTF::RefPtr<WebCore::IDBIndex> m_idbIndex;
     49    WTF::RefPtr<WebCore::IDBIndexBackendInterface> m_backend;
    5050};
    5151
  • trunk/WebKit/chromium/src/WebIDBObjectStoreImpl.cpp

    r63064 r64358  
    8686WebIDBIndex* WebIDBObjectStoreImpl::index(const WebString& name)
    8787{
    88     RefPtr<IDBIndex> index = m_objectStore->index(name);
     88    RefPtr<IDBIndexBackendInterface> index = m_objectStore->index(name);
    8989    if (!index)
    9090        return 0;
Note: See TracChangeset for help on using the changeset viewer.