Changeset 64358 in webkit
- Timestamp:
- Jul 30, 2010 8:29:58 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 1 deleted
- 37 edited
- 1 copied
- 6 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/Android.derived.jscbindings.mk
r64344 r64358 368 368 $(intermediates)/storage/JSIDBEvent.h \ 369 369 $(intermediates)/storage/JSIDBFactory.h \ 370 $(intermediates)/storage/JSIDBIndex Request.h \370 $(intermediates)/storage/JSIDBIndex.h \ 371 371 $(intermediates)/storage/JSIDBKey.h \ 372 372 $(intermediates)/storage/JSIDBKeyRange.h \ -
trunk/WebCore/Android.derived.v8bindings.mk
r64344 r64358 349 349 $(intermediates)/bindings/V8IDBEvent.h \ 350 350 $(intermediates)/bindings/V8IDBFactory.h \ 351 $(intermediates)/bindings/V8IDBIndex Request.h \351 $(intermediates)/bindings/V8IDBIndex.h \ 352 352 $(intermediates)/bindings/V8IDBKey.h \ 353 353 $(intermediates)/bindings/V8IDBKeyRange.h \ -
trunk/WebCore/Android.mk
r64356 r64358 748 748 storage/IDBErrorEvent.cpp \ 749 749 storage/IDBEvent.cpp \ 750 storage/IDBIndex Impl.cpp \751 storage/IDBIndex Request.cpp \750 storage/IDBIndex.cpp \ 751 storage/IDBIndexBackendImpl.cpp \ 752 752 storage/IDBKey.cpp \ 753 753 storage/IDBKeyRange.cpp \ -
trunk/WebCore/CMakeLists.txt
r64357 r64358 340 340 storage/IDBEvent.idl 341 341 storage/IDBFactory.idl 342 storage/IDBIndex Request.idl342 storage/IDBIndex.idl 343 343 storage/IDBKey.idl 344 344 storage/IDBKeyRange.idl … … 1439 1439 storage/IDBErrorEvent.cpp 1440 1440 storage/IDBEvent.cpp 1441 storage/IDBIndex.cpp 1442 storage/IDBIndexBackendImpl.cpp 1441 1443 storage/IDBKey.cpp 1442 1444 storage/IDBKeyRange.cpp -
trunk/WebCore/ChangeLog
r64357 r64358 1 2010-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 1 79 2010-07-30 Rafael Antognolli <antognolli@profusion.mobi> 2 80 -
trunk/WebCore/DerivedSources.cpp
r64344 r64358 183 183 #include "JSIDBEvent.cpp" 184 184 #include "JSIDBFactory.cpp" 185 #include "JSIDBIndex Request.cpp"185 #include "JSIDBIndex.cpp" 186 186 #include "JSIDBKey.cpp" 187 187 #include "JSIDBKeyRange.cpp" -
trunk/WebCore/DerivedSources.make
r64344 r64358 226 226 IDBEvent \ 227 227 IDBFactory \ 228 IDBIndex Request\228 IDBIndex \ 229 229 IDBKey \ 230 230 IDBKeyRange \ -
trunk/WebCore/GNUmakefile.am
r64356 r64358 2839 2839 DerivedSources/WebCore/JSIDBFactory.cpp \ 2840 2840 DerivedSources/WebCore/JSIDBFactory.h \ 2841 DerivedSources/WebCore/JSIDBIndex Request.cpp \2842 DerivedSources/WebCore/JSIDBIndex Request.h \2841 DerivedSources/WebCore/JSIDBIndex.cpp \ 2842 DerivedSources/WebCore/JSIDBIndex.h \ 2843 2843 DerivedSources/WebCore/JSIDBKeyRange.cpp \ 2844 2844 DerivedSources/WebCore/JSIDBKeyRange.h \ … … 2865 2865 WebCore/storage/IDBEvent.cpp \ 2866 2866 WebCore/storage/IDBEvent.h \ 2867 WebCore/storage/IDBIndex.cpp \ 2867 2868 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 \ 2872 2872 WebCore/storage/IDBKeyRange.cpp \ 2873 2873 WebCore/storage/IDBKeyRange.h \ -
trunk/WebCore/WebCore.gypi
r64356 r64358 238 238 'storage/IDBEvent.idl', 239 239 'storage/IDBFactory.idl', 240 'storage/IDBIndex Request.idl',240 'storage/IDBIndex.idl', 241 241 'storage/IDBKey.idl', 242 242 'storage/IDBKeyRange.idl', … … 3493 3493 'storage/IDBFactoryBackendImpl.cpp', 3494 3494 'storage/IDBFactoryBackendImpl.h', 3495 'storage/IDBIndex.cpp', 3495 3496 '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', 3500 3500 'storage/IDBKey.cpp', 3501 3501 'storage/IDBKey.h', -
trunk/WebCore/WebCore.pri
r64344 r64358 489 489 storage/IDBErrorEvent.idl \ 490 490 storage/IDBEvent.idl \ 491 storage/IDBIndex Request.idl \491 storage/IDBIndex.idl \ 492 492 storage/IDBKey.idl \ 493 493 storage/IDBKeyRange.idl \ -
trunk/WebCore/WebCore.pro
r64356 r64358 2434 2434 storage/IDBFactoryBackendImpl.h \ 2435 2435 storage/IDBIndex.h \ 2436 storage/IDBIndex Impl.h \2437 storage/IDBIndex Request.h \2436 storage/IDBIndexBackendInterface.h \ 2437 storage/IDBIndexBackendImpl.h \ 2438 2438 storage/IDBKey.h \ 2439 2439 storage/IDBKeyRange.h \ … … 2456 2456 storage/IDBFactoryBackendInterface.cpp \ 2457 2457 storage/IDBFactoryBackendImpl.cpp \ 2458 storage/IDBIndex Impl.cpp \2459 storage/IDBIndex Request.cpp \2458 storage/IDBIndex.cpp \ 2459 storage/IDBIndexBackendImpl.cpp \ 2460 2460 storage/IDBKey.cpp \ 2461 2461 storage/IDBKeyRange.cpp \ -
trunk/WebCore/WebCore.vcproj/WebCore.vcproj
r64356 r64358 44765 44765 </File> 44766 44766 <File 44767 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBIndex Request.cpp"44767 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBIndex.cpp" 44768 44768 > 44769 44769 <FileConfiguration … … 44817 44817 </File> 44818 44818 <File 44819 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBIndex Request.h"44819 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBIndex.h" 44820 44820 > 44821 44821 </File> … … 50154 50154 </File> 50155 50155 <File 50156 RelativePath="..\storage\IDBIndex.cpp" 50157 > 50158 </File> 50159 <File 50156 50160 RelativePath="..\storage\IDBIndex.h" 50157 50161 > 50158 50162 </File> 50159 50163 <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" 50173 50173 > 50174 50174 </File> -
trunk/WebCore/WebCore.xcodeproj/project.pbxproj
r64356 r64358 4918 4918 C55E38BF10040D5D00A56BDB /* StorageNamespaceImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = C55E38BB10040D5D00A56BDB /* StorageNamespaceImpl.h */; }; 4919 4919 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 */; }; 4920 4927 C585A65E11D4FAB2004C3E4B /* JSIDBAnyCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A65C11D4FAB2004C3E4B /* JSIDBAnyCustom.cpp */; }; 4921 4928 C585A65F11D4FAB2004C3E4B /* JSIDBKeyCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A65D11D4FAB2004C3E4B /* JSIDBKeyCustom.cpp */; }; … … 4934 4941 C585A68611D4FB08004C3E4B /* JSIDBEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A66E11D4FB07004C3E4B /* JSIDBEvent.cpp */; }; 4935 4942 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 */; };4938 4943 C585A68A11D4FB08004C3E4B /* JSIDBKey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A67211D4FB07004C3E4B /* JSIDBKey.cpp */; }; 4939 4944 C585A68B11D4FB08004C3E4B /* JSIDBKey.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A67311D4FB07004C3E4B /* JSIDBKey.h */; }; … … 4962 4967 C585A6DD11D4FB3D004C3E4B /* IDBEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A6A911D4FB3D004C3E4B /* IDBEvent.cpp */; }; 4963 4968 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 */; };4969 4969 C585A6E611D4FB3D004C3E4B /* IDBKey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A6B211D4FB3D004C3E4B /* IDBKey.cpp */; }; 4970 4970 C585A6E711D4FB3D004C3E4B /* IDBKey.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A6B311D4FB3D004C3E4B /* IDBKey.h */; }; … … 10583 10583 C55E38BB10040D5D00A56BDB /* StorageNamespaceImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageNamespaceImpl.h; sourceTree = "<group>"; }; 10584 10584 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>"; }; 10585 10593 C585A65C11D4FAB2004C3E4B /* JSIDBAnyCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSIDBAnyCustom.cpp; sourceTree = "<group>"; }; 10586 10594 C585A65D11D4FAB2004C3E4B /* JSIDBKeyCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSIDBKeyCustom.cpp; sourceTree = "<group>"; }; … … 10599 10607 C585A66E11D4FB07004C3E4B /* JSIDBEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSIDBEvent.cpp; sourceTree = "<group>"; }; 10600 10608 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>"; };10603 10609 C585A67211D4FB07004C3E4B /* JSIDBKey.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSIDBKey.cpp; sourceTree = "<group>"; }; 10604 10610 C585A67311D4FB07004C3E4B /* JSIDBKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSIDBKey.h; sourceTree = "<group>"; }; … … 10633 10639 C585A6AA11D4FB3D004C3E4B /* IDBEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBEvent.h; sourceTree = "<group>"; }; 10634 10640 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>"; };10641 10641 C585A6B211D4FB3D004C3E4B /* IDBKey.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBKey.cpp; sourceTree = "<group>"; }; 10642 10642 C585A6B311D4FB3D004C3E4B /* IDBKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBKey.h; sourceTree = "<group>"; }; … … 11344 11344 C585A6AA11D4FB3D004C3E4B /* IDBEvent.h */, 11345 11345 C585A6AB11D4FB3D004C3E4B /* IDBEvent.idl */, 11346 C5 85A6AC11D4FB3D004C3E4B /* IDBIndex.h*/,11347 C5 85A6AD11D4FB3D004C3E4B /* IDBIndexImpl.cpp*/,11348 C5 85A6AE11D4FB3D004C3E4B /* IDBIndexImpl.h*/,11349 C5 85A6AF11D4FB3D004C3E4B /* IDBIndexRequest.cpp */,11350 C5 85A6B011D4FB3D004C3E4B /* IDBIndexRequest.h */,11351 C5 85A6B111D4FB3D004C3E4B /* 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 */, 11352 11352 C585A6B211D4FB3D004C3E4B /* IDBKey.cpp */, 11353 11353 C585A6B311D4FB3D004C3E4B /* IDBKey.h */, … … 14782 14782 C585A66E11D4FB07004C3E4B /* JSIDBEvent.cpp */, 14783 14783 C585A66F11D4FB07004C3E4B /* JSIDBEvent.h */, 14784 C5 85A67011D4FB07004C3E4B /* JSIDBIndexRequest.cpp */,14785 C5 85A67111D4FB07004C3E4B /* JSIDBIndexRequest.h */,14784 C572EE1C1201C9BC007D8F82 /* JSIDBIndex.cpp */, 14785 C572EE1D1201C9BC007D8F82 /* JSIDBIndex.h */, 14786 14786 C585A67211D4FB07004C3E4B /* JSIDBKey.cpp */, 14787 14787 C585A67311D4FB07004C3E4B /* JSIDBKey.h */, … … 18501 18501 C585A6DB11D4FB3D004C3E4B /* IDBErrorEvent.h in Headers */, 18502 18502 C585A6DE11D4FB3D004C3E4B /* IDBEvent.h in Headers */, 18503 C585A6E011D4FB3D004C3E4B /* IDBIndex.h in Headers */,18504 C585A6E211D4FB3D004C3E4B /* IDBIndexImpl.h in Headers */,18505 C585A6E411D4FB3D004C3E4B /* IDBIndexRequest.h in Headers */,18506 18503 C585A6E711D4FB3D004C3E4B /* IDBKey.h in Headers */, 18507 18504 C585A6EA11D4FB3D004C3E4B /* IDBKeyRange.h in Headers */, … … 18754 18751 C585A68511D4FB08004C3E4B /* JSIDBErrorEvent.h in Headers */, 18755 18752 C585A68711D4FB08004C3E4B /* JSIDBEvent.h in Headers */, 18756 C585A68911D4FB08004C3E4B /* JSIDBIndexRequest.h in Headers */,18757 18753 C585A68B11D4FB08004C3E4B /* JSIDBKey.h in Headers */, 18758 18754 C585A68D11D4FB08004C3E4B /* JSIDBKeyRange.h in Headers */, … … 19886 19882 085B05C311FAE16C004D65F6 /* SVGResourcesCycleSolver.h in Headers */, 19887 19883 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 */, 19888 19888 ); 19889 19889 runOnlyForDeploymentPostprocessing = 0; … … 20926 20926 C585A6DA11D4FB3D004C3E4B /* IDBErrorEvent.cpp in Sources */, 20927 20927 C585A6DD11D4FB3D004C3E4B /* IDBEvent.cpp in Sources */, 20928 C585A6E111D4FB3D004C3E4B /* IDBIndexImpl.cpp in Sources */,20929 C585A6E311D4FB3D004C3E4B /* IDBIndexRequest.cpp in Sources */,20930 20928 C585A6E611D4FB3D004C3E4B /* IDBKey.cpp in Sources */, 20931 20929 C585A6E911D4FB3D004C3E4B /* IDBKeyRange.cpp in Sources */, … … 21219 21217 C585A68411D4FB08004C3E4B /* JSIDBErrorEvent.cpp in Sources */, 21220 21218 C585A68611D4FB08004C3E4B /* JSIDBEvent.cpp in Sources */, 21221 C585A68811D4FB08004C3E4B /* JSIDBIndexRequest.cpp in Sources */,21222 21219 C585A68A11D4FB08004C3E4B /* JSIDBKey.cpp in Sources */, 21223 21220 C585A65F11D4FAB2004C3E4B /* JSIDBKeyCustom.cpp in Sources */, … … 22287 22284 085B05C211FAE16C004D65F6 /* SVGResourcesCycleSolver.cpp in Sources */, 22288 22285 7535BC9412020CFF0037EC45 /* SpeechInputClientMock.cpp in Sources */, 22286 C572EE0A1201C736007D8F82 /* IDBIndex.cpp in Sources */, 22287 C572EE0D1201C736007D8F82 /* IDBIndexBackendImpl.cpp in Sources */, 22288 C572EE1E1201C9BC007D8F82 /* JSIDBIndex.cpp in Sources */, 22289 22289 ); 22290 22290 runOnlyForDeploymentPostprocessing = 0; -
trunk/WebCore/bindings/js/JSIDBAnyCustom.cpp
r64344 r64358 35 35 #include "IDBDatabaseRequest.h" 36 36 #include "IDBFactory.h" 37 #include "IDBIndex Request.h"37 #include "IDBIndex.h" 38 38 #include "IDBKey.h" 39 39 #include "IDBObjectStoreRequest.h" 40 40 #include "JSIDBDatabaseRequest.h" 41 41 #include "JSIDBFactory.h" 42 #include "JSIDBIndex Request.h"42 #include "JSIDBIndex.h" 43 43 #include "JSIDBKey.h" 44 44 #include "JSIDBObjectStoreRequest.h" … … 61 61 case IDBAny::IDBDatabaseRequestType: 62 62 return toJS(exec, globalObject, idbAny->idbDatabaseRequest()); 63 case IDBAny::IDBIndex RequestType:64 return toJS(exec, globalObject, idbAny->idbIndex Request());63 case IDBAny::IDBIndexType: 64 return toJS(exec, globalObject, idbAny->idbIndex()); 65 65 case IDBAny::IDBKeyType: 66 66 return toJS(exec, globalObject, idbAny->idbKey()); -
trunk/WebCore/bindings/v8/custom/V8IDBAnyCustom.cpp
r64344 r64358 35 35 #include "V8IDBDatabaseRequest.h" 36 36 #include "V8IDBFactory.h" 37 #include "V8IDBIndex Request.h"37 #include "V8IDBIndex.h" 38 38 #include "V8IDBKey.h" 39 39 #include "V8IDBObjectStoreRequest.h" … … 53 53 case IDBAny::IDBDatabaseRequestType: 54 54 return toV8(impl->idbDatabaseRequest()); 55 case IDBAny::IDBIndex RequestType:56 return toV8(impl->idbIndex Request());55 case IDBAny::IDBIndexType: 56 return toV8(impl->idbIndex()); 57 57 case IDBAny::IDBKeyType: 58 58 return toV8(impl->idbKey()); -
trunk/WebCore/storage/IDBAny.cpp
r64344 r64358 31 31 #include "IDBDatabaseRequest.h" 32 32 #include "IDBFactory.h" 33 #include "IDBIndex Request.h"33 #include "IDBIndex.h" 34 34 #include "IDBObjectStoreRequest.h" 35 35 #include "SerializedScriptValue.h" … … 57 57 } 58 58 59 PassRefPtr<IDBIndex Request> IDBAny::idbIndexRequest()59 PassRefPtr<IDBIndex> IDBAny::idbIndex() 60 60 { 61 ASSERT(m_type == IDBIndex RequestType);62 return m_idbIndex Request;61 ASSERT(m_type == IDBIndexType); 62 return m_idbIndex; 63 63 } 64 64 … … 100 100 } 101 101 102 void IDBAny::set(PassRefPtr<IDBIndex Request> value)102 void IDBAny::set(PassRefPtr<IDBIndex> value) 103 103 { 104 104 ASSERT(m_type == UndefinedType); 105 105 m_type = IDBDatabaseRequestType; 106 m_idbIndex Request= value;106 m_idbIndex = value; 107 107 } 108 108 -
trunk/WebCore/storage/IDBAny.h
r64344 r64358 36 36 37 37 class IDBDatabaseRequest; 38 class IDBIndex Request;38 class IDBIndex; 39 39 class IDBKey; 40 40 class IDBObjectStoreRequest; … … 58 58 NullType, 59 59 IDBDatabaseRequestType, 60 IDBIndexRequestType,61 60 IDBFactoryType, 61 IDBIndexType, 62 62 IDBKeyType, 63 63 IDBObjectStoreRequestType, … … 68 68 // Use type() to figure out which one of these you're allowed to call. 69 69 PassRefPtr<IDBDatabaseRequest> idbDatabaseRequest(); 70 PassRefPtr<IDBIndexRequest> idbIndexRequest();71 70 PassRefPtr<IDBFactory> idbFactory(); 71 PassRefPtr<IDBIndex> idbIndex(); 72 72 PassRefPtr<IDBKey> idbKey(); 73 73 PassRefPtr<IDBObjectStoreRequest> idbObjectStoreRequest(); … … 77 77 void set(); // For "null". 78 78 void set(PassRefPtr<IDBDatabaseRequest>); 79 void set(PassRefPtr<IDBIndexRequest>);80 79 void set(PassRefPtr<IDBFactory>); 80 void set(PassRefPtr<IDBIndex>); 81 81 void set(PassRefPtr<IDBKey>); 82 82 void set(PassRefPtr<IDBObjectStoreRequest>); … … 90 90 // Only one of the following should ever be in use at any given time. 91 91 RefPtr<IDBDatabaseRequest> m_idbDatabaseRequest; 92 RefPtr<IDBIndexRequest> m_idbIndexRequest;93 92 RefPtr<IDBFactory> m_idbFactory; 93 RefPtr<IDBIndex> m_idbIndex; 94 94 RefPtr<IDBKey> m_idbKey; 95 95 RefPtr<IDBObjectStoreRequest> m_idbObjectStoreRequest; -
trunk/WebCore/storage/IDBCallbacks.h
r62452 r64358 32 32 #include "IDBDatabase.h" 33 33 #include "IDBDatabaseError.h" 34 #include "IDBIndex .h"34 #include "IDBIndexBackendInterface.h" 35 35 #include "IDBKey.h" 36 36 #include "IDBObjectStore.h" … … 49 49 virtual void onSuccess() = 0; // For "null". 50 50 virtual void onSuccess(PassRefPtr<IDBDatabase>) = 0; 51 virtual void onSuccess(PassRefPtr<IDBIndex >) = 0;51 virtual void onSuccess(PassRefPtr<IDBIndexBackendInterface>) = 0; 52 52 virtual void onSuccess(PassRefPtr<IDBKey>) = 0; 53 53 virtual void onSuccess(PassRefPtr<IDBObjectStore>) = 0; -
trunk/WebCore/storage/IDBIndex.cpp
r64357 r64358 25 25 26 26 #include "config.h" 27 #include "IDBIndex Request.h"27 #include "IDBIndex.h" 28 28 29 29 #if ENABLE(INDEXED_DATABASE) … … 31 31 namespace WebCore { 32 32 33 IDBIndex Request::IDBIndexRequest(PassRefPtr<IDBIndex> idbIndex)34 : m_ idbIndex(idbIndex)33 IDBIndex::IDBIndex(PassRefPtr<IDBIndexBackendInterface> backend) 34 : m_backend(backend) 35 35 { 36 36 } 37 37 38 IDBIndex Request::~IDBIndexRequest()38 IDBIndex::~IDBIndex() 39 39 { 40 40 } -
trunk/WebCore/storage/IDBIndex.h
r60357 r64358 27 27 #define IDBIndex_h 28 28 29 #include "IDBIndexBackendInterface.h" 29 30 #include "PlatformString.h" 30 #include <wtf/PassRefPtr.h> 31 #include <wtf/Threading.h> 31 #include <wtf/Forward.h> 32 32 33 33 #if ENABLE(INDEXED_DATABASE) … … 35 35 namespace WebCore { 36 36 37 class IDBIndex : public ThreadSafeShared<IDBIndex> {37 class IDBIndex : public RefCounted<IDBIndex> { 38 38 public: 39 virtual ~IDBIndex() { } 39 static PassRefPtr<IDBIndex> create(PassRefPtr<IDBIndexBackendInterface> backend) 40 { 41 return adoptRef(new IDBIndex(backend)); 42 } 43 ~IDBIndex(); 40 44 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 50 private: 51 IDBIndex(PassRefPtr<IDBIndexBackendInterface>); 52 53 RefPtr<IDBIndexBackendInterface> m_backend; 44 54 }; 45 55 -
trunk/WebCore/storage/IDBIndex.idl
r64357 r64358 28 28 interface [ 29 29 Conditional=INDEXED_DATABASE 30 ] IDBIndex Request{30 ] IDBIndex { 31 31 // FIXME: Complete this file. 32 32 -
trunk/WebCore/storage/IDBIndexBackendImpl.cpp
r64357 r64358 25 25 26 26 #include "config.h" 27 #include "IDBIndex Impl.h"27 #include "IDBIndexBackendImpl.h" 28 28 29 29 #if ENABLE(INDEXED_DATABASE) … … 31 31 namespace WebCore { 32 32 33 IDBIndex Impl::IDBIndexImpl(const String& name, const String& keyPath, bool unique)33 IDBIndexBackendImpl::IDBIndexBackendImpl(const String& name, const String& keyPath, bool unique) 34 34 : m_name(name) 35 35 , m_keyPath(keyPath) … … 38 38 } 39 39 40 IDBIndex Impl::~IDBIndexImpl()40 IDBIndexBackendImpl::~IDBIndexBackendImpl() 41 41 { 42 42 } -
trunk/WebCore/storage/IDBIndexBackendImpl.h
-
Property
svn:eol-style
set to
LF
r64357 r64358 24 24 */ 25 25 26 #ifndef IDBIndex Impl_h27 #define IDBIndex Impl_h26 #ifndef IDBIndexBackendImpl_h 27 #define IDBIndexBackendImpl_h 28 28 29 #include "IDBIndex .h"29 #include "IDBIndexBackendInterface.h" 30 30 31 31 #if ENABLE(INDEXED_DATABASE) … … 33 33 namespace WebCore { 34 34 35 class IDBIndex Impl : public IDBIndex{35 class IDBIndexBackendImpl : public IDBIndexBackendInterface { 36 36 public: 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) 38 38 { 39 return adoptRef(new IDBIndex Impl(name, keyPath, unique));39 return adoptRef(new IDBIndexBackendImpl(name, keyPath, unique)); 40 40 } 41 virtual ~IDBIndex Impl();41 virtual ~IDBIndexBackendImpl(); 42 42 43 // Implements IDBIndex 43 // Implements IDBIndexBackendInterface. 44 44 virtual String name() { return m_name; } 45 45 virtual String keyPath() { return m_keyPath; } … … 47 47 48 48 private: 49 IDBIndex Impl(const String& name, const String& keyPath, bool unique);49 IDBIndexBackendImpl(const String& name, const String& keyPath, bool unique); 50 50 51 51 String m_name; … … 58 58 #endif 59 59 60 #endif // IDBIndex Impl_h60 #endif // IDBIndexBackendImpl_h -
Property
svn:eol-style
set to
-
trunk/WebCore/storage/IDBIndexBackendInterface.h
r64357 r64358 24 24 */ 25 25 26 #ifndef IDBIndex _h27 #define IDBIndex _h26 #ifndef IDBIndexBackendInterface_h 27 #define IDBIndexBackendInterface_h 28 28 29 29 #include "PlatformString.h" 30 #include <wtf/PassRefPtr.h> 31 #include <wtf/Threading.h> 30 #include <wtf/Forward.h> 32 31 33 32 #if ENABLE(INDEXED_DATABASE) … … 35 34 namespace WebCore { 36 35 37 class IDBIndex : public ThreadSafeShared<IDBIndex> {36 class IDBIndexBackendInterface : public ThreadSafeShared<IDBIndexBackendInterface> { 38 37 public: 39 virtual ~IDBIndex () { }38 virtual ~IDBIndexBackendInterface() { } 40 39 41 40 virtual String name() = 0; … … 48 47 #endif 49 48 50 #endif // IDBIndex _h49 #endif // IDBIndexBackendInterface_h -
trunk/WebCore/storage/IDBObjectStore.h
r63064 r64358 36 36 class DOMStringList; 37 37 class IDBCallbacks; 38 class IDBIndex ;38 class IDBIndexBackendInterface; 39 39 class IDBKey; 40 40 class SerializedScriptValue; … … 53 53 54 54 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; 56 56 virtual void removeIndex(const String& name, PassRefPtr<IDBCallbacks>) = 0; 57 57 }; -
trunk/WebCore/storage/IDBObjectStoreImpl.cpp
r63064 r64358 31 31 #include "IDBCallbacks.h" 32 32 #include "IDBDatabaseException.h" 33 #include "IDBIndex Impl.h"33 #include "IDBIndexBackendImpl.h" 34 34 #include "IDBKeyTree.h" 35 35 … … 109 109 } 110 110 111 RefPtr<IDBIndex > index = IDBIndexImpl::create(name, keyPath, unique);111 RefPtr<IDBIndexBackendInterface> index = IDBIndexBackendImpl::create(name, keyPath, unique); 112 112 ASSERT(index->name() == name); 113 113 m_indexes.set(name, index); … … 115 115 } 116 116 117 PassRefPtr<IDBIndex > IDBObjectStoreImpl::index(const String& name)117 PassRefPtr<IDBIndexBackendInterface> IDBObjectStoreImpl::index(const String& name) 118 118 { 119 119 return m_indexes.get(name); -
trunk/WebCore/storage/IDBObjectStoreImpl.h
r63064 r64358 54 54 55 55 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); 57 57 void removeIndex(const String& name, PassRefPtr<IDBCallbacks>); 58 58 … … 64 64 bool m_autoIncrement; 65 65 66 typedef HashMap<String, RefPtr<IDBIndex > > IndexMap;66 typedef HashMap<String, RefPtr<IDBIndexBackendInterface> > IndexMap; 67 67 IndexMap m_indexes; 68 68 -
trunk/WebCore/storage/IDBObjectStoreRequest.cpp
r63211 r64358 29 29 #include "DOMStringList.h" 30 30 #include "IDBAny.h" 31 #include "IDBIndex Request.h"31 #include "IDBIndex.h" 32 32 #include "IDBKey.h" 33 33 #include "SerializedScriptValue.h" … … 95 95 } 96 96 97 PassRefPtr<IDBIndex Request> IDBObjectStoreRequest::index(const String& name)97 PassRefPtr<IDBIndex> IDBObjectStoreRequest::index(const String& name) 98 98 { 99 RefPtr<IDBIndex > index = m_objectStore->index(name);99 RefPtr<IDBIndexBackendInterface> index = m_objectStore->index(name); 100 100 ASSERT(index); // FIXME: If this is null, we should raise a NOT_FOUND_ERR. 101 return IDBIndex Request::create(index.release());101 return IDBIndex::create(index.release()); 102 102 } 103 103 -
trunk/WebCore/storage/IDBObjectStoreRequest.h
r63211 r64358 62 62 63 63 PassRefPtr<IDBRequest> createIndex(ScriptExecutionContext*, const String& name, const String& keyPath, bool unique = false); 64 PassRefPtr<IDBIndex Request> index(const String& name);64 PassRefPtr<IDBIndex> index(const String& name); 65 65 PassRefPtr<IDBRequest> removeIndex(ScriptExecutionContext*, const String& name); 66 66 -
trunk/WebCore/storage/IDBObjectStoreRequest.idl
r63064 r64358 39 39 [CallWith=ScriptExecutionContext] IDBRequest createIndex(in DOMString name, in [ConvertNullToNullString] DOMString keyPath, in [Optional] boolean unique); 40 40 // FIXME: This needs to raise an IDBDatabaseException on errors. 41 IDBIndex Requestindex(in DOMString name);41 IDBIndex index(in DOMString name); 42 42 [CallWith=ScriptExecutionContext] IDBRequest removeIndex(in DOMString name); 43 43 -
trunk/WebCore/storage/IDBRequest.cpp
r63064 r64358 37 37 #include "EventNames.h" 38 38 #include "IDBDatabaseRequest.h" 39 #include "IDBIndex Request.h"39 #include "IDBIndex.h" 40 40 #include "IDBErrorEvent.h" 41 41 #include "IDBObjectStoreRequest.h" … … 80 80 } 81 81 82 void IDBRequest::onSuccess(PassRefPtr<IDBIndex > idbIndex)82 void IDBRequest::onSuccess(PassRefPtr<IDBIndexBackendInterface> backend) 83 83 { 84 84 onEventCommon(); 85 m_result->set(IDBIndex Request::create(idbIndex));85 m_result->set(IDBIndex::create(backend)); 86 86 } 87 87 -
trunk/WebCore/storage/IDBRequest.h
r62452 r64358 66 66 virtual void onSuccess(); // For "null". 67 67 virtual void onSuccess(PassRefPtr<IDBDatabase>); 68 virtual void onSuccess(PassRefPtr<IDBIndex >);68 virtual void onSuccess(PassRefPtr<IDBIndexBackendInterface>); 69 69 virtual void onSuccess(PassRefPtr<IDBKey>); 70 70 virtual void onSuccess(PassRefPtr<IDBObjectStore>); -
trunk/WebKit/chromium/ChangeLog
r64352 r64358 1 2010-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 1 38 2010-07-30 Satish Sampath <satish@chromium.org> 2 39 -
trunk/WebKit/chromium/WebKit.gyp
r64344 r64358 324 324 'src/IDBFactoryBackendProxy.cpp', 325 325 'src/IDBFactoryBackendProxy.h', 326 'src/IDBIndex Proxy.cpp',327 'src/IDBIndex Proxy.h',326 'src/IDBIndexBackendProxy.cpp', 327 'src/IDBIndexBackendProxy.h', 328 328 'src/IDBObjectStoreProxy.cpp', 329 329 'src/IDBObjectStoreProxy.h', -
trunk/WebKit/chromium/src/IDBCallbacksProxy.cpp
r63064 r64358 76 76 } 77 77 78 void IDBCallbacksProxy::onSuccess(PassRefPtr<IDBIndex > idbIndex)78 void IDBCallbacksProxy::onSuccess(PassRefPtr<IDBIndexBackendInterface> backend) 79 79 { 80 m_callbacks->onSuccess(new WebKit::WebIDBIndexImpl( idbIndex));80 m_callbacks->onSuccess(new WebKit::WebIDBIndexImpl(backend)); 81 81 m_callbacks.clear(); 82 82 } -
trunk/WebKit/chromium/src/IDBCallbacksProxy.h
r63064 r64358 51 51 virtual void onSuccess(); // For "null". 52 52 virtual void onSuccess(PassRefPtr<IDBDatabase>); 53 virtual void onSuccess(PassRefPtr<IDBIndex >);53 virtual void onSuccess(PassRefPtr<IDBIndexBackendInterface>); 54 54 virtual void onSuccess(PassRefPtr<IDBKey>); 55 55 virtual void onSuccess(PassRefPtr<IDBObjectStore>); -
trunk/WebKit/chromium/src/IDBIndexBackendProxy.cpp
r64357 r64358 25 25 26 26 #include "config.h" 27 #include "IDBIndex Proxy.h"27 #include "IDBIndexBackendProxy.h" 28 28 29 29 #include "WebIDBDatabaseError.h" … … 34 34 namespace WebCore { 35 35 36 PassRefPtr<IDBIndex > IDBIndexProxy::create(PassOwnPtr<WebKit::WebIDBIndex> Index)36 PassRefPtr<IDBIndexBackendInterface> IDBIndexBackendProxy::create(PassOwnPtr<WebKit::WebIDBIndex> index) 37 37 { 38 return adoptRef(new IDBIndex Proxy(Index));38 return adoptRef(new IDBIndexBackendProxy(index)); 39 39 } 40 40 41 IDBIndex Proxy::IDBIndexProxy(PassOwnPtr<WebKit::WebIDBIndex> Index)42 : m_webIDBIndex( Index)41 IDBIndexBackendProxy::IDBIndexBackendProxy(PassOwnPtr<WebKit::WebIDBIndex> index) 42 : m_webIDBIndex(index) 43 43 { 44 44 } 45 45 46 IDBIndex Proxy::~IDBIndexProxy()46 IDBIndexBackendProxy::~IDBIndexBackendProxy() 47 47 { 48 48 } 49 49 50 String IDBIndex Proxy::name()50 String IDBIndexBackendProxy::name() 51 51 { 52 52 return m_webIDBIndex->name(); 53 53 } 54 54 55 String IDBIndex Proxy::keyPath()55 String IDBIndexBackendProxy::keyPath() 56 56 { 57 57 return m_webIDBIndex->keyPath(); 58 58 } 59 59 60 bool IDBIndex Proxy::unique()60 bool IDBIndexBackendProxy::unique() 61 61 { 62 62 return m_webIDBIndex->unique(); -
trunk/WebKit/chromium/src/IDBIndexBackendProxy.h
-
Property
svn:eol-style
set to
LF
r64357 r64358 24 24 */ 25 25 26 #ifndef IDBIndex Proxy_h27 #define IDBIndex Proxy_h26 #ifndef IDBIndexBackendProxy_h 27 #define IDBIndexBackendProxy_h 28 28 29 #include "IDBIndex .h"29 #include "IDBIndexBackendInterface.h" 30 30 #include <wtf/OwnPtr.h> 31 31 #include <wtf/PassOwnPtr.h> 32 #include <wtf/PassRefPtr.h>33 32 34 33 #if ENABLE(INDEXED_DATABASE) … … 38 37 namespace WebCore { 39 38 40 class IDBIndex Proxy : public IDBIndex{39 class IDBIndexBackendProxy : public IDBIndexBackendInterface { 41 40 public: 42 static PassRefPtr<IDBIndex > create(PassOwnPtr<WebKit::WebIDBIndex>);43 virtual ~IDBIndex Proxy();41 static PassRefPtr<IDBIndexBackendInterface> create(PassOwnPtr<WebKit::WebIDBIndex>); 42 virtual ~IDBIndexBackendProxy(); 44 43 45 44 virtual String name(); … … 50 49 51 50 private: 52 IDBIndex Proxy(PassOwnPtr<WebKit::WebIDBIndex>);51 IDBIndexBackendProxy(PassOwnPtr<WebKit::WebIDBIndex>); 53 52 54 53 OwnPtr<WebKit::WebIDBIndex> m_webIDBIndex; … … 59 58 #endif 60 59 61 #endif // IDBIndex Proxy_h60 #endif // IDBIndexBackendProxy_h -
Property
svn:eol-style
set to
-
trunk/WebKit/chromium/src/IDBObjectStoreProxy.cpp
r63064 r64358 29 29 #include "DOMStringList.h" 30 30 #include "IDBCallbacks.h" 31 #include "IDBIndex Proxy.h"31 #include "IDBIndexBackendProxy.h" 32 32 #include "WebIDBCallbacksImpl.h" 33 33 #include "WebIDBIndex.h" … … 89 89 } 90 90 91 PassRefPtr<IDBIndex > IDBObjectStoreProxy::index(const String& name)91 PassRefPtr<IDBIndexBackendInterface> IDBObjectStoreProxy::index(const String& name) 92 92 { 93 93 WebKit::WebIDBIndex* index = m_webIDBObjectStore->index(name); 94 94 if (!index) 95 95 return 0; 96 return IDBIndex Proxy::create(index);96 return IDBIndexBackendProxy::create(index); 97 97 } 98 98 -
trunk/WebKit/chromium/src/IDBObjectStoreProxy.h
r63064 r64358 38 38 namespace WebCore { 39 39 40 class DOMStringList;41 class IDBIndex;42 43 40 class IDBObjectStoreProxy : public IDBObjectStore { 44 41 public: … … 55 52 56 53 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); 58 55 void removeIndex(const String& name, PassRefPtr<IDBCallbacks>); 59 56 -
trunk/WebKit/chromium/src/WebIDBCallbacksImpl.cpp
r63064 r64358 30 30 #include "IDBDatabaseError.h" 31 31 #include "IDBDatabaseProxy.h" 32 #include "IDBIndex Proxy.h"32 #include "IDBIndexBackendProxy.h" 33 33 #include "IDBKey.h" 34 34 #include "IDBObjectStoreProxy.h" … … 80 80 void WebIDBCallbacksImpl::onSuccess(WebKit::WebIDBIndex* webKitInstance) 81 81 { 82 m_callbacks->onSuccess(IDBIndex Proxy::create(webKitInstance));82 m_callbacks->onSuccess(IDBIndexBackendProxy::create(webKitInstance)); 83 83 m_callbacks.clear(); 84 84 } -
trunk/WebKit/chromium/src/WebIDBIndexImpl.cpp
r60357 r64358 35 35 namespace WebKit { 36 36 37 WebIDBIndexImpl::WebIDBIndexImpl(PassRefPtr<IDBIndex > idbIndex)38 : m_ idbIndex(idbIndex)37 WebIDBIndexImpl::WebIDBIndexImpl(PassRefPtr<IDBIndexBackendInterface> backend) 38 : m_backend(backend) 39 39 { 40 40 } … … 46 46 WebString WebIDBIndexImpl::name() const 47 47 { 48 return m_ idbIndex->name();48 return m_backend->name(); 49 49 } 50 50 51 51 WebString WebIDBIndexImpl::keyPath() const 52 52 { 53 return m_ idbIndex->keyPath();53 return m_backend->keyPath(); 54 54 } 55 55 56 56 bool WebIDBIndexImpl::unique() const 57 57 { 58 return m_ idbIndex->unique();58 return m_backend->unique(); 59 59 } 60 60 -
trunk/WebKit/chromium/src/WebIDBIndexImpl.h
r60357 r64358 32 32 #include <wtf/RefPtr.h> 33 33 34 namespace WebCore { class IDBIndex ; }34 namespace WebCore { class IDBIndexBackendInterface; } 35 35 36 36 namespace WebKit { … … 39 39 class WebIDBIndexImpl : public WebIDBIndex { 40 40 public: 41 WebIDBIndexImpl(WTF::PassRefPtr<WebCore::IDBIndex > idbIndex);41 WebIDBIndexImpl(WTF::PassRefPtr<WebCore::IDBIndexBackendInterface>); 42 42 virtual ~WebIDBIndexImpl(); 43 43 … … 47 47 48 48 private: 49 WTF::RefPtr<WebCore::IDBIndex > m_idbIndex;49 WTF::RefPtr<WebCore::IDBIndexBackendInterface> m_backend; 50 50 }; 51 51 -
trunk/WebKit/chromium/src/WebIDBObjectStoreImpl.cpp
r63064 r64358 86 86 WebIDBIndex* WebIDBObjectStoreImpl::index(const WebString& name) 87 87 { 88 RefPtr<IDBIndex > index = m_objectStore->index(name);88 RefPtr<IDBIndexBackendInterface> index = m_objectStore->index(name); 89 89 if (!index) 90 90 return 0;
Note: See TracChangeset
for help on using the changeset viewer.