Changeset 64543 in webkit


Ignore:
Timestamp:
Aug 3, 2010 3:43:59 AM (14 years ago)
Author:
andreip@google.com
Message:

2010-07-30 Andrei Popescu <​andreip@dhcp-172-16-14-12.lon.corp.google.com>

Reviewed by Jeremy Orlow.

Rename IDBDatabaseRequest to IDBDatabase
​https://bugs.webkit.org/show_bug.cgi?id=43250

No new tests, just refactoring.

  • Android.derived.jscbindings.mk:
  • Android.derived.v8bindings.mk:
  • Android.mk:
  • CMakeLists.txt:
  • DerivedSources.cpp:
  • DerivedSources.make:
  • GNUmakefile.am:
  • WebCore.gypi:
  • WebCore.pri:
  • WebCore.pro:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.vcproj/WebCore.vcproj~: Added.
  • WebCore.xcodeproj/project.pbxproj:
  • WebCore.xcodeproj/project.pbxproj~: Added.
  • bindings/js/JSIDBAnyCustom.cpp: (WebCore::toJS):
  • bindings/v8/custom/V8IDBAnyCustom.cpp: (WebCore::toV8):
  • storage/IDBAny.cpp: (WebCore::IDBAny::idbDatabase): (WebCore::IDBAny::set):
  • storage/IDBAny.h: (WebCore::IDBAny::):
  • storage/IDBCallbacks.h:
  • storage/IDBDatabase.cpp: Added. (WebCore::IDBDatabase::IDBDatabase): (WebCore::IDBDatabase::~IDBDatabase): (WebCore::IDBDatabase::createObjectStore): (WebCore::IDBDatabase::objectStore): (WebCore::IDBDatabase::removeObjectStore):
  • storage/IDBDatabase.h: (WebCore::IDBDatabase::create): (WebCore::IDBDatabase::name): (WebCore::IDBDatabase::description): (WebCore::IDBDatabase::version): (WebCore::IDBDatabase::objectStores):
  • storage/IDBDatabase.idl: Added.
  • storage/IDBDatabaseBackendImpl.cpp: Added. (WebCore::IDBDatabaseBackendImpl::IDBDatabaseBackendImpl): (WebCore::IDBDatabaseBackendImpl::~IDBDatabaseBackendImpl): (WebCore::IDBDatabaseBackendImpl::objectStores): (WebCore::IDBDatabaseBackendImpl::createObjectStore): (WebCore::IDBDatabaseBackendImpl::objectStore): (WebCore::IDBDatabaseBackendImpl::removeObjectStore):
  • storage/IDBDatabaseBackendImpl.h: Added. (WebCore::IDBDatabaseBackendImpl::create): (WebCore::IDBDatabaseBackendImpl::name): (WebCore::IDBDatabaseBackendImpl::description): (WebCore::IDBDatabaseBackendImpl::version):
  • storage/IDBDatabaseBackendInterface.h: Added. (WebCore::IDBDatabaseBackendInterface::~IDBDatabaseBackendInterface):
  • storage/IDBDatabaseImpl.cpp: Removed.
  • storage/IDBDatabaseImpl.h: Removed.
  • storage/IDBDatabaseRequest.cpp: Removed.
  • storage/IDBDatabaseRequest.h: Removed.
  • storage/IDBDatabaseRequest.idl: Removed.
  • storage/IDBFactoryBackendImpl.cpp: (WebCore::IDBFactoryBackendImpl::open):
  • storage/IDBFactoryBackendImpl.h:
  • storage/IDBRequest.cpp: (WebCore::IDBRequest::onSuccess):
  • storage/IDBRequest.h:

2010-07-30 Andrei Popescu <​andreip@dhcp-172-16-14-12.lon.corp.google.com>

Reviewed by Jeremy Orlow.

Rename IDBDatabaseRequest to IDBDatabase
​https://bugs.webkit.org/show_bug.cgi?id=43250

  • src/IDBCallbacksProxy.cpp: (WebCore::IDBCallbacksProxy::onSuccess):
  • src/IDBCallbacksProxy.h:
  • src/IDBDatabaseProxy.cpp: (WebCore::IDBDatabaseProxy::create):
  • src/IDBDatabaseProxy.h:
  • src/WebIDBDatabaseImpl.cpp: (WebKit::WebIDBDatabaseImpl::WebIDBDatabaseImpl): (WebKit::WebIDBDatabaseImpl::name): (WebKit::WebIDBDatabaseImpl::description): (WebKit::WebIDBDatabaseImpl::version): (WebKit::WebIDBDatabaseImpl::objectStores): (WebKit::WebIDBDatabaseImpl::createObjectStore): (WebKit::WebIDBDatabaseImpl::objectStore): (WebKit::WebIDBDatabaseImpl::removeObjectStore):
  • src/WebIDBDatabaseImpl.h:
Location:
trunk
Files:
1 deleted
30 edited
1 copied
4 moved

Legend:

Unmodified
Added
Removed

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

    r64358 r64543  
    364364    $(intermediates)/storage/JSIDBDatabaseError.h \
    365365    $(intermediates)/storage/JSIDBDatabaseException.h \
    366     $(intermediates)/storage/JSIDBDatabaseRequest.h \
     366    $(intermediates)/storage/JSIDBDatabase.h \
    367367    $(intermediates)/storage/JSIDBErrorEvent.h \
    368368    $(intermediates)/storage/JSIDBEvent.h \

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

    r64517 r64543  
    345345    $(intermediates)/bindings/V8IDBDatabaseError.h \
    346346    $(intermediates)/bindings/V8IDBDatabaseException.h \
    347     $(intermediates)/bindings/V8IDBDatabaseRequest.h \
     347    $(intermediates)/bindings/V8IDBDatabase.h \
    348348    $(intermediates)/bindings/V8IDBErrorEvent.h \
    349349    $(intermediates)/bindings/V8IDBEvent.h \

  • trunk/WebCore/Android.mk

    r64358 r64543  
    744744        storage/DatabaseTracker.cpp \
    745745        storage/IDBAny.cpp \
    746         storage/IDBDatabaseImpl.cpp \
    747         storage/IDBDatabaseRequest.cpp \
     746        storage/IDBDatabase.cpp \
     747        storage/IDBDatabaseBackendImpl.cpp \
    748748        storage/IDBErrorEvent.cpp \
    749749        storage/IDBEvent.cpp \

  • trunk/WebCore/CMakeLists.txt

    r64537 r64543  
    337337    storage/IDBDatabaseError.idl
    338338    storage/IDBDatabaseException.idl
    339     storage/IDBDatabaseRequest.idl
     339    storage/IDBDatabase.idl
    340340    storage/IDBErrorEvent.idl
    341341    storage/IDBEvent.idl
    … …  
    14371437    storage/DatabaseTracker.cpp
    14381438    storage/IDBAny.cpp
    1439     storage/IDBDatabaseImpl.cpp
    1440     storage/IDBDatabaseRequest.cpp
     1439    storage/IDBDatabase.cpp
     1440    storage/IDBDatabaseBackendImpl.cpp
    14411441    storage/IDBErrorEvent.cpp
    14421442    storage/IDBEvent.cpp

  • trunk/WebCore/ChangeLog

    r64542 r64543  
     12010-07-30  Andrei Popescu  <andreip@dhcp-172-16-14-12.lon.corp.google.com>
     2
     3        Reviewed by Jeremy Orlow.
     4
     5        Rename IDBDatabaseRequest to IDBDatabase
     6        https://bugs.webkit.org/show_bug.cgi?id=43250
     7
     8        No new tests, just refactoring.
     9
     10        * Android.derived.jscbindings.mk:
     11        * Android.derived.v8bindings.mk:
     12        * Android.mk:
     13        * CMakeLists.txt:
     14        * DerivedSources.cpp:
     15        * DerivedSources.make:
     16        * GNUmakefile.am:
     17        * WebCore.gypi:
     18        * WebCore.pri:
     19        * WebCore.pro:
     20        * WebCore.vcproj/WebCore.vcproj:
     21        * WebCore.vcproj/WebCore.vcproj~: Added.
     22        * WebCore.xcodeproj/project.pbxproj:
     23        * WebCore.xcodeproj/project.pbxproj~: Added.
     24        * bindings/js/JSIDBAnyCustom.cpp:
     25        (WebCore::toJS):
     26        * bindings/v8/custom/V8IDBAnyCustom.cpp:
     27        (WebCore::toV8):
     28        * storage/IDBAny.cpp:
     29        (WebCore::IDBAny::idbDatabase):
     30        (WebCore::IDBAny::set):
     31        * storage/IDBAny.h:
     32        (WebCore::IDBAny::):
     33        * storage/IDBCallbacks.h:
     34        * storage/IDBDatabase.cpp: Added.
     35        (WebCore::IDBDatabase::IDBDatabase):
     36        (WebCore::IDBDatabase::~IDBDatabase):
     37        (WebCore::IDBDatabase::createObjectStore):
     38        (WebCore::IDBDatabase::objectStore):
     39        (WebCore::IDBDatabase::removeObjectStore):
     40        * storage/IDBDatabase.h:
     41        (WebCore::IDBDatabase::create):
     42        (WebCore::IDBDatabase::name):
     43        (WebCore::IDBDatabase::description):
     44        (WebCore::IDBDatabase::version):
     45        (WebCore::IDBDatabase::objectStores):
     46        * storage/IDBDatabase.idl: Added.
     47        * storage/IDBDatabaseBackendImpl.cpp: Added.
     48        (WebCore::IDBDatabaseBackendImpl::IDBDatabaseBackendImpl):
     49        (WebCore::IDBDatabaseBackendImpl::~IDBDatabaseBackendImpl):
     50        (WebCore::IDBDatabaseBackendImpl::objectStores):
     51        (WebCore::IDBDatabaseBackendImpl::createObjectStore):
     52        (WebCore::IDBDatabaseBackendImpl::objectStore):
     53        (WebCore::IDBDatabaseBackendImpl::removeObjectStore):
     54        * storage/IDBDatabaseBackendImpl.h: Added.
     55        (WebCore::IDBDatabaseBackendImpl::create):
     56        (WebCore::IDBDatabaseBackendImpl::name):
     57        (WebCore::IDBDatabaseBackendImpl::description):
     58        (WebCore::IDBDatabaseBackendImpl::version):
     59        * storage/IDBDatabaseBackendInterface.h: Added.
     60        (WebCore::IDBDatabaseBackendInterface::~IDBDatabaseBackendInterface):
     61        * storage/IDBDatabaseImpl.cpp: Removed.
     62        * storage/IDBDatabaseImpl.h: Removed.
     63        * storage/IDBDatabaseRequest.cpp: Removed.
     64        * storage/IDBDatabaseRequest.h: Removed.
     65        * storage/IDBDatabaseRequest.idl: Removed.
     66        * storage/IDBFactoryBackendImpl.cpp:
     67        (WebCore::IDBFactoryBackendImpl::open):
     68        * storage/IDBFactoryBackendImpl.h:
     69        * storage/IDBRequest.cpp:
     70        (WebCore::IDBRequest::onSuccess):
     71        * storage/IDBRequest.h:
     72
    1732010-08-03  Satish Sampath  <satish@chromium.org>
    274

  • trunk/WebCore/DerivedSources.cpp

    r64517 r64543  
    177177#include "JSHTMLVideoElement.cpp"
    178178#include "JSIDBAny.cpp"
     179#include "JSIDBDatabase.cpp"
    179180#include "JSIDBDatabaseError.cpp"
    180181#include "JSIDBDatabaseException.cpp"
    181 #include "JSIDBDatabaseRequest.cpp"
    182182#include "JSIDBErrorEvent.cpp"
    183183#include "JSIDBEvent.cpp"

  • trunk/WebCore/DerivedSources.make

    r64537 r64543  
    229229    IDBDatabaseError \
    230230    IDBDatabaseException \
    231     IDBDatabaseRequest \
     231    IDBDatabase \
    232232    IDBErrorEvent \
    233233    IDBEvent \

  • trunk/WebCore/GNUmakefile.am

    r64537 r64543  
    28382838        DerivedSources/WebCore/JSIDBDatabaseException.cpp \
    28392839        DerivedSources/WebCore/JSIDBDatabaseException.h \
    2840         DerivedSources/WebCore/JSIDBDatabaseRequest.cpp \
    2841         DerivedSources/WebCore/JSIDBDatabaseRequest.h \
     2840        DerivedSources/WebCore/JSIDBDatabase.cpp \
     2841        DerivedSources/WebCore/JSIDBDatabase.h \
    28422842        DerivedSources/WebCore/JSIDBErrorEvent.cpp \
    28432843        DerivedSources/WebCore/JSIDBErrorEvent.h \
    … …  
    28612861        WebCore/storage/IDBAny.h \
    28622862        WebCore/storage/IDBCallbacks.h \
     2863        WebCore/storage/IDBDatabase.cpp \
    28632864        WebCore/storage/IDBDatabase.h \
    2864         WebCore/storage/IDBDatabaseImpl.cpp \
    2865         WebCore/storage/IDBDatabaseImpl.h \
     2865        WebCore/storage/IDBDatabaseBackendImpl.cpp \
     2866        WebCore/storage/IDBDatabaseBackendImpl.h \
     2867        WebCore/storage/IDBDatabaseBackendInterface.h \
    28662868        WebCore/storage/IDBDatabaseError.h \
    28672869        WebCore/storage/IDBDatabaseException.h \
    2868         WebCore/storage/IDBDatabaseRequest.cpp \
    2869         WebCore/storage/IDBDatabaseRequest.h \
    28702870        WebCore/storage/IDBErrorEvent.cpp \
    28712871        WebCore/storage/IDBErrorEvent.h \

  • trunk/WebCore/WebCore.gypi

    r64537 r64543  
    240240            'storage/IDBDatabaseError.idl',
    241241            'storage/IDBDatabaseException.idl',
    242             'storage/IDBDatabaseRequest.idl',
     242            'storage/IDBDatabase.idl',
    243243            'storage/IDBErrorEvent.idl',
    244244            'storage/IDBEvent.idl',
    … …  
    34993499            'storage/IDBCallbacks.h',
    35003500            'storage/IDBDatabase.h',
     3501            'storage/IDBDatabase.cpp,
    35013502            'storage/IDBDatabaseError.h',
    35023503            'storage/IDBDatabaseException.h',
    3503             'storage/IDBDatabaseImpl.cpp',
    3504             'storage/IDBDatabaseImpl.h',
    3505             'storage/IDBDatabaseRequest.cpp',
    3506             'storage/IDBDatabaseRequest.h',
     3504            'storage/IDBDatabaseBackendImpl.cpp',
     3505            'storage/IDBDatabaseBackendImpl.h',
     3506            'storage/IDBDatabaseBackendInterface.h',
    35073507            'storage/IDBEvent.cpp',
    35083508            'storage/IDBEvent.h',

  • trunk/WebCore/WebCore.pri

    r64517 r64543  
    486486    storage/IDBDatabaseError.idl \
    487487    storage/IDBDatabaseException.idl \
    488     storage/IDBDatabaseRequest.idl \
     488    storage/IDBDatabase.idl \
    489489    storage/IDBErrorEvent.idl \
    490490    storage/IDBEvent.idl \

  • trunk/WebCore/WebCore.pro

    r64537 r64543  
    24272427        storage/IDBCallbacks.h \
    24282428        storage/IDBDatabase.h \
    2429         storage/IDBDatabaseImpl.h \
     2429        storage/IDBDatabaseBackendImpl.h \
     2430        storage/IDBDatabaseBackendInterface.h \
    24302431        storage/IDBDatabaseError.h \
    24312432        storage/IDBDatabaseException.h \
    2432         storage/IDBDatabaseRequest.h \
    24332433        storage/IDBErrorEvent.h \
    24342434        storage/IDBEvent.h \
    … …  
    24522452        bindings/js/JSIDBKeyCustom.cpp \
    24532453        storage/IDBAny.cpp \
    2454         storage/IDBDatabaseImpl.cpp \
    2455         storage/IDBDatabaseRequest.cpp \
     2454        storage/IDBDatabase.cpp \
     2455        storage/IDBDatabaseBackendImpl.cpp \
    24562456        storage/IDBErrorEvent.cpp \
    24572457        storage/IDBEvent.cpp \

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

    r64537 r64543  
    4467744677                                </File>
    4467844678                                <File
    44679                                         RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBDatabaseRequest.cpp"
     44679                                        RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBDatabase.cpp"
    4468044680                                        >
    4468144681                                        <FileConfiguration
    … …  
    4472944729                                </File>
    4473044730                                <File
    44731                                         RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBDatabaseRequest.h"
     44731                                        RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSIDBDatabase.h"
    4473244732                                        >
    4473344733                                </File>
    … …  
    5014250142                        </File>
    5014350143                        <File
     50144                                RelativePath="..\storage\IDBDatabase.cpp"
     50145                                >
     50146                        </File>
     50147                        <File
     50148                                RelativePath="..\storage\IDBDatabaseBackendImpl.h"
     50149                                >
     50150                        </File>
     50151                        <File
     50152                                RelativePath="..\storage\IDBDatabaseBackendImpl.cpp"
     50153                                >
     50154                        </File>
     50155                        <File
     50156                                RelativePath="..\storage\IDBDatabaseBackendInterface.h"
     50157                                >
     50158                        </File>
     50159                        <File
    5014450160                                RelativePath="..\storage\IDBDatabaseError.h"
    5014550161                                >
    … …  
    5015050166                        </File>
    5015150167                        <File
    50152                                 RelativePath="..\storage\IDBDatabaseImpl.cpp"
    50153                                 >
    50154                         </File>
    50155                         <File
    50156                                 RelativePath="..\storage\IDBDatabaseImpl.h"
    50157                                 >
    50158                         </File>
    50159                         <File
    50160                                 RelativePath="..\storage\IDBDatabaseRequest.cpp"
    50161                                 >
    50162                         </File>
    50163                         <File
    50164                                 RelativePath="..\storage\IDBDatabaseRequest.h"
    50165                                 >
    50166                         </File>
    50167                         <File
    5016850168                                RelativePath="..\storage\IDBErrorEvent.cpp"
    5016950169                                >
    … …  
    5025350253                                >
    5025450254                        </File>
    50255             <File
    50256                 RelativePath="..\storage\IDBFactory.cpp"
    50257                 >
    50258             </File>
    50259             <File
    50260                 RelativePath="..\storage\IDBFactory.h"
    50261                 >
    50262             </File>
     50255                        <File
     50256                                RelativePath="..\storage\IDBFactory.cpp"
     50257                                >
     50258                        </File>
     50259                        <File
     50260                                RelativePath="..\storage\IDBFactory.h"
     50261                                >
     50262                        </File>
    5026350263                        <File
    5026450264                                RelativePath="..\storage\IDBFactoryBackendInterface.cpp"

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

    r64537 r64543  
    43574357                B5D31DFB11CF610B009F22B4 /* ActiveDOMCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = B5D31DF911CF610B009F22B4 /* ActiveDOMCallback.h */; };
    43584358                B5D3601A112F8B560048DEA8 /* DatabaseCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = B5D36019112F8B560048DEA8 /* DatabaseCallback.h */; };
     4359                B61762541203374F00EF9114 /* IDBDatabaseBackendInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = B61762531203374F00EF9114 /* IDBDatabaseBackendInterface.h */; };
     4360                B61762621203490800EF9114 /* IDBDatabaseBackendImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = B61762611203490800EF9114 /* IDBDatabaseBackendImpl.h */; };
     4361                B691C1F91206D4A00025D980 /* IDBDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A6A311D4FB3D004C3E4B /* IDBDatabase.cpp */; };
    43594362                B71FE6DF11091CB300DAEF77 /* PrintContext.h in Headers */ = {isa = PBXBuildFile; fileRef = B776D43A1104525D00BEB0EC /* PrintContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
    43604363                B734B181119B9911006587BD /* FontTranscoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B734B180119B9911006587BD /* FontTranscoder.cpp */; };
    … …  
    49414944                C585A68011D4FB08004C3E4B /* JSIDBDatabaseException.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A66811D4FB07004C3E4B /* JSIDBDatabaseException.cpp */; };
    49424945                C585A68111D4FB08004C3E4B /* JSIDBDatabaseException.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A66911D4FB07004C3E4B /* JSIDBDatabaseException.h */; };
    4943                 C585A68211D4FB08004C3E4B /* JSIDBDatabaseRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A66A11D4FB07004C3E4B /* JSIDBDatabaseRequest.cpp */; };
    4944                 C585A68311D4FB08004C3E4B /* JSIDBDatabaseRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A66B11D4FB07004C3E4B /* JSIDBDatabaseRequest.h */; };
     4946                C585A68211D4FB08004C3E4B /* JSIDBDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A66A11D4FB07004C3E4B /* JSIDBDatabase.cpp */; };
     4947                C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A66B11D4FB07004C3E4B /* JSIDBDatabase.h */; };
    49454948                C585A68411D4FB08004C3E4B /* JSIDBErrorEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A66C11D4FB07004C3E4B /* JSIDBErrorEvent.cpp */; };
    49464949                C585A68511D4FB08004C3E4B /* JSIDBErrorEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A66D11D4FB07004C3E4B /* JSIDBErrorEvent.h */; };
    … …  
    49624965                C585A6CD11D4FB3D004C3E4B /* IDBAny.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A69911D4FB3D004C3E4B /* IDBAny.h */; };
    49634966                C585A6CF11D4FB3D004C3E4B /* IDBCallbacks.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A69B11D4FB3D004C3E4B /* IDBCallbacks.h */; };
    4964                 C585A6D011D4FB3D004C3E4B /* IDBDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A69C11D4FB3D004C3E4B /* IDBDatabase.h */; };
    49654967                C585A6D111D4FB3D004C3E4B /* IDBDatabaseError.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A69D11D4FB3D004C3E4B /* IDBDatabaseError.h */; };
    49664968                C585A6D311D4FB3D004C3E4B /* IDBDatabaseException.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A69F11D4FB3D004C3E4B /* IDBDatabaseException.h */; };
    4967                 C585A6D511D4FB3D004C3E4B /* IDBDatabaseImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A6A111D4FB3D004C3E4B /* IDBDatabaseImpl.cpp */; };
    4968                 C585A6D611D4FB3D004C3E4B /* IDBDatabaseImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A6A211D4FB3D004C3E4B /* IDBDatabaseImpl.h */; };
    4969                 C585A6D711D4FB3D004C3E4B /* IDBDatabaseRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A6A311D4FB3D004C3E4B /* IDBDatabaseRequest.cpp */; };
    4970                 C585A6D811D4FB3D004C3E4B /* IDBDatabaseRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A6A411D4FB3D004C3E4B /* IDBDatabaseRequest.h */; };
     4969                C585A6D511D4FB3D004C3E4B /* IDBDatabaseBackendImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A6A111D4FB3D004C3E4B /* IDBDatabaseBackendImpl.cpp */; };
     4970                C585A6D811D4FB3D004C3E4B /* IDBDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A6A411D4FB3D004C3E4B /* IDBDatabase.h */; };
    49714971                C585A6DA11D4FB3D004C3E4B /* IDBErrorEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A6A611D4FB3D004C3E4B /* IDBErrorEvent.cpp */; };
    49724972                C585A6DB11D4FB3D004C3E4B /* IDBErrorEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A6A711D4FB3D004C3E4B /* IDBErrorEvent.h */; };
    … …  
    1002310023                B5D31DF911CF610B009F22B4 /* ActiveDOMCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ActiveDOMCallback.h; path = generic/ActiveDOMCallback.h; sourceTree = "<group>"; };
    1002410024                B5D36019112F8B560048DEA8 /* DatabaseCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseCallback.h; sourceTree = "<group>"; };
     10025                B61762531203374F00EF9114 /* IDBDatabaseBackendInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBDatabaseBackendInterface.h; sourceTree = "<group>"; };
     10026                B61762611203490800EF9114 /* IDBDatabaseBackendImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBDatabaseBackendImpl.h; sourceTree = "<group>"; };
    1002510027                B734B180119B9911006587BD /* FontTranscoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FontTranscoder.cpp; path = transcoder/FontTranscoder.cpp; sourceTree = "<group>"; };
    1002610028                B734B182119B991D006587BD /* FontTranscoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FontTranscoder.h; path = transcoder/FontTranscoder.h; sourceTree = "<group>"; };
    … …  
    1064510647                C585A66811D4FB07004C3E4B /* JSIDBDatabaseException.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSIDBDatabaseException.cpp; sourceTree = "<group>"; };
    1064610648                C585A66911D4FB07004C3E4B /* JSIDBDatabaseException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSIDBDatabaseException.h; sourceTree = "<group>"; };
    10647                 C585A66A11D4FB07004C3E4B /* JSIDBDatabaseRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSIDBDatabaseRequest.cpp; sourceTree = "<group>"; };
    10648                 C585A66B11D4FB07004C3E4B /* JSIDBDatabaseRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSIDBDatabaseRequest.h; sourceTree = "<group>"; };
     10649                C585A66A11D4FB07004C3E4B /* JSIDBDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSIDBDatabase.cpp; sourceTree = "<group>"; };
     10650                C585A66B11D4FB07004C3E4B /* JSIDBDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSIDBDatabase.h; sourceTree = "<group>"; };
    1064910651                C585A66C11D4FB07004C3E4B /* JSIDBErrorEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSIDBErrorEvent.cpp; sourceTree = "<group>"; };
    1065010652                C585A66D11D4FB07004C3E4B /* JSIDBErrorEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSIDBErrorEvent.h; sourceTree = "<group>"; };
    … …  
    1066710669                C585A69A11D4FB3D004C3E4B /* IDBAny.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = IDBAny.idl; sourceTree = "<group>"; };
    1066810670                C585A69B11D4FB3D004C3E4B /* IDBCallbacks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBCallbacks.h; sourceTree = "<group>"; };
    10669                 C585A69C11D4FB3D004C3E4B /* IDBDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBDatabase.h; sourceTree = "<group>"; };
    1067010671                C585A69D11D4FB3D004C3E4B /* IDBDatabaseError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBDatabaseError.h; sourceTree = "<group>"; };
    1067110672                C585A69E11D4FB3D004C3E4B /* IDBDatabaseError.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = IDBDatabaseError.idl; sourceTree = "<group>"; };
    1067210673                C585A69F11D4FB3D004C3E4B /* IDBDatabaseException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBDatabaseException.h; sourceTree = "<group>"; };
    1067310674                C585A6A011D4FB3D004C3E4B /* IDBDatabaseException.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = IDBDatabaseException.idl; sourceTree = "<group>"; };
    10674                 C585A6A111D4FB3D004C3E4B /* IDBDatabaseImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBDatabaseImpl.cpp; sourceTree = "<group>"; };
    10675                 C585A6A211D4FB3D004C3E4B /* IDBDatabaseImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBDatabaseImpl.h; sourceTree = "<group>"; };
    10676                 C585A6A311D4FB3D004C3E4B /* IDBDatabaseRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBDatabaseRequest.cpp; sourceTree = "<group>"; };
    10677                 C585A6A411D4FB3D004C3E4B /* IDBDatabaseRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBDatabaseRequest.h; sourceTree = "<group>"; };
    10678                 C585A6A511D4FB3D004C3E4B /* IDBDatabaseRequest.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = IDBDatabaseRequest.idl; sourceTree = "<group>"; };
     10675                C585A6A111D4FB3D004C3E4B /* IDBDatabaseBackendImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBDatabaseBackendImpl.cpp; sourceTree = "<group>"; };
     10676                C585A6A311D4FB3D004C3E4B /* IDBDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBDatabase.cpp; sourceTree = "<group>"; };
     10677                C585A6A411D4FB3D004C3E4B /* IDBDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBDatabase.h; sourceTree = "<group>"; };
     10678                C585A6A511D4FB3D004C3E4B /* IDBDatabase.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = IDBDatabase.idl; sourceTree = "<group>"; };
    1067910679                C585A6A611D4FB3D004C3E4B /* IDBErrorEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBErrorEvent.cpp; sourceTree = "<group>"; };
    1068010680                C585A6A711D4FB3D004C3E4B /* IDBErrorEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBErrorEvent.h; sourceTree = "<group>"; };
    … …  
    1139011390                                C585A69A11D4FB3D004C3E4B /* IDBAny.idl */,
    1139111391                                C585A69B11D4FB3D004C3E4B /* IDBCallbacks.h */,
    11392                                 C585A69C11D4FB3D004C3E4B /* IDBDatabase.h */,
     11392                                C585A6A311D4FB3D004C3E4B /* IDBDatabase.cpp */,
     11393                                C585A6A411D4FB3D004C3E4B /* IDBDatabase.h */,
     11394                                C585A6A511D4FB3D004C3E4B /* IDBDatabase.idl */,
     11395                                C585A6A111D4FB3D004C3E4B /* IDBDatabaseBackendImpl.cpp */,
     11396                                B61762611203490800EF9114 /* IDBDatabaseBackendImpl.h */,
     11397                                B61762531203374F00EF9114 /* IDBDatabaseBackendInterface.h */,
    1139311398                                C585A69D11D4FB3D004C3E4B /* IDBDatabaseError.h */,
    1139411399                                C585A69E11D4FB3D004C3E4B /* IDBDatabaseError.idl */,
    1139511400                                C585A69F11D4FB3D004C3E4B /* IDBDatabaseException.h */,
    1139611401                                C585A6A011D4FB3D004C3E4B /* IDBDatabaseException.idl */,
    11397                                 C585A6A111D4FB3D004C3E4B /* IDBDatabaseImpl.cpp */,
    11398                                 C585A6A211D4FB3D004C3E4B /* IDBDatabaseImpl.h */,
    11399                                 C585A6A311D4FB3D004C3E4B /* IDBDatabaseRequest.cpp */,
    11400                                 C585A6A411D4FB3D004C3E4B /* IDBDatabaseRequest.h */,
    11401                                 C585A6A511D4FB3D004C3E4B /* IDBDatabaseRequest.idl */,
    1140211402                                C585A6A611D4FB3D004C3E4B /* IDBErrorEvent.cpp */,
    1140311403                                C585A6A711D4FB3D004C3E4B /* IDBErrorEvent.h */,
    … …  
    1485614856                                C585A66811D4FB07004C3E4B /* JSIDBDatabaseException.cpp */,
    1485714857                                C585A66911D4FB07004C3E4B /* JSIDBDatabaseException.h */,
    14858                                 C585A66A11D4FB07004C3E4B /* JSIDBDatabaseRequest.cpp */,
    14859                                 C585A66B11D4FB07004C3E4B /* JSIDBDatabaseRequest.h */,
     14858                                C585A66A11D4FB07004C3E4B /* JSIDBDatabase.cpp */,
     14859                                C585A66B11D4FB07004C3E4B /* JSIDBDatabase.h */,
    1486014860                                C585A66C11D4FB07004C3E4B /* JSIDBErrorEvent.cpp */,
    1486114861                                C585A66D11D4FB07004C3E4B /* JSIDBErrorEvent.h */,
    … …  
    1858918589                                C585A66311D4FAC5004C3E4B /* IDBBindingUtilities.h in Headers */,
    1859018590                                C585A6CF11D4FB3D004C3E4B /* IDBCallbacks.h in Headers */,
    18591                                 C585A6D011D4FB3D004C3E4B /* IDBDatabase.h in Headers */,
     18591                                C585A6D811D4FB3D004C3E4B /* IDBDatabase.h in Headers */,
    1859218592                                C585A6D111D4FB3D004C3E4B /* IDBDatabaseError.h in Headers */,
    1859318593                                C585A6D311D4FB3D004C3E4B /* IDBDatabaseException.h in Headers */,
    18594                                 C585A6D611D4FB3D004C3E4B /* IDBDatabaseImpl.h in Headers */,
    18595                                 C585A6D811D4FB3D004C3E4B /* IDBDatabaseRequest.h in Headers */,
    1859618594                                C585A6DB11D4FB3D004C3E4B /* IDBErrorEvent.h in Headers */,
    1859718595                                C585A6DE11D4FB3D004C3E4B /* IDBEvent.h in Headers */,
    … …  
    1884618844                                C585A67F11D4FB08004C3E4B /* JSIDBDatabaseError.h in Headers */,
    1884718845                                C585A68111D4FB08004C3E4B /* JSIDBDatabaseException.h in Headers */,
    18848                                 C585A68311D4FB08004C3E4B /* JSIDBDatabaseRequest.h in Headers */,
     18846                                C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */,
    1884918847                                C585A68511D4FB08004C3E4B /* JSIDBErrorEvent.h in Headers */,
    1885018848                                C585A68711D4FB08004C3E4B /* JSIDBEvent.h in Headers */,
    … …  
    1998419982                                D39D006D11F8E308006041F2 /* PopupMenuMac.h in Headers */,
    1998519983                                D39D009D11F907E6006041F2 /* SearchPopupMenuMac.h in Headers */,
     19984                                B61762541203374F00EF9114 /* IDBDatabaseBackendInterface.h in Headers */,
     19985                                B61762621203490800EF9114 /* IDBDatabaseBackendImpl.h in Headers */,
    1998619986                        );
    1998719987                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    2102221022                                C585A6CC11D4FB3D004C3E4B /* IDBAny.cpp in Sources */,
    2102321023                                C585A66211D4FAC5004C3E4B /* IDBBindingUtilities.cpp in Sources */,
    21024                                 C585A6D511D4FB3D004C3E4B /* IDBDatabaseImpl.cpp in Sources */,
    21025                                 C585A6D711D4FB3D004C3E4B /* IDBDatabaseRequest.cpp in Sources */,
     21024                                B691C1F91206D4A00025D980 /* IDBDatabase.cpp in Sources */,
     21025                                C585A6D511D4FB3D004C3E4B /* IDBDatabaseBackendImpl.cpp in Sources */,
    2102621026                                C585A6DA11D4FB3D004C3E4B /* IDBErrorEvent.cpp in Sources */,
    2102721027                                C585A6DD11D4FB3D004C3E4B /* IDBEvent.cpp in Sources */,
    … …  
    2131621316                                C585A67E11D4FB08004C3E4B /* JSIDBDatabaseError.cpp in Sources */,
    2131721317                                C585A68011D4FB08004C3E4B /* JSIDBDatabaseException.cpp in Sources */,
    21318                                 C585A68211D4FB08004C3E4B /* JSIDBDatabaseRequest.cpp in Sources */,
     21318                                C585A68211D4FB08004C3E4B /* JSIDBDatabase.cpp in Sources */,
    2131921319                                C585A68411D4FB08004C3E4B /* JSIDBErrorEvent.cpp in Sources */,
    2132021320                                C585A68611D4FB08004C3E4B /* JSIDBEvent.cpp in Sources */,

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

    r64358 r64543  
    3333
    3434#include "IDBAny.h"
    35 #include "IDBDatabaseRequest.h"
     35#include "IDBDatabase.h"
    3636#include "IDBFactory.h"
    3737#include "IDBIndex.h"
    3838#include "IDBKey.h"
    3939#include "IDBObjectStoreRequest.h"
    40 #include "JSIDBDatabaseRequest.h"
     40#include "JSIDBDatabase.h"
    4141#include "JSIDBFactory.h"
    4242#include "JSIDBIndex.h"
    … …  
    5959    case IDBAny::NullType:
    6060        return jsNull();
    61     case IDBAny::IDBDatabaseRequestType:
    62         return toJS(exec, globalObject, idbAny->idbDatabaseRequest());
     61    case IDBAny::IDBDatabaseType:
     62        return toJS(exec, globalObject, idbAny->idbDatabase());
    6363    case IDBAny::IDBIndexType:
    6464        return toJS(exec, globalObject, idbAny->idbIndex());

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

    r64358 r64543  
    3333
    3434#include "SerializedScriptValue.h"
    35 #include "V8IDBDatabaseRequest.h"
     35#include "V8IDBDatabase.h"
    3636#include "V8IDBFactory.h"
    3737#include "V8IDBIndex.h"
    … …  
    5151    case IDBAny::NullType:
    5252        return v8::Null();
    53     case IDBAny::IDBDatabaseRequestType:
    54         return toV8(impl->idbDatabaseRequest());
     53    case IDBAny::IDBDatabaseType:
     54        return toV8(impl->idbDatabase());
    5555    case IDBAny::IDBIndexType:
    5656        return toV8(impl->idbIndex());

  • trunk/WebCore/storage/IDBAny.cpp

    r64358 r64543  
    2929#if ENABLE(INDEXED_DATABASE)
    3030
    31 #include "IDBDatabaseRequest.h"
     31#include "IDBDatabase.h"
    3232#include "IDBFactory.h"
    3333#include "IDBIndex.h"
    … …  
    5151}
    5252
    53 PassRefPtr<IDBDatabaseRequest> IDBAny::idbDatabaseRequest()
     53PassRefPtr<IDBDatabase> IDBAny::idbDatabase()
    5454{
    55     ASSERT(m_type == IDBDatabaseRequestType);
    56     return m_idbDatabaseRequest;
     55    ASSERT(m_type == IDBDatabaseType);
     56    return m_idbDatabase;
    5757}
    5858
    … …  
    9393}
    9494
    95 void IDBAny::set(PassRefPtr<IDBDatabaseRequest> value)
     95void IDBAny::set(PassRefPtr<IDBDatabase> value)
    9696{
    9797    ASSERT(m_type == UndefinedType);
    98     m_type = IDBDatabaseRequestType;
    99     m_idbDatabaseRequest = value;
     98    m_type = IDBDatabaseType;
     99    m_idbDatabase = value;
    100100}
    101101
    … …  
    103103{
    104104    ASSERT(m_type == UndefinedType);
    105     m_type = IDBDatabaseRequestType;
     105    m_type = IDBDatabaseType;
    106106    m_idbIndex = value;
    107107}

  • trunk/WebCore/storage/IDBAny.h

    r64358 r64543  
    3535namespace WebCore {
    3636
    37 class IDBDatabaseRequest;
     37class IDBDatabase;
    3838class IDBIndex;
    3939class IDBKey;
    … …  
    5757        UndefinedType = 0,
    5858        NullType,
    59         IDBDatabaseRequestType,
     59        IDBDatabaseType,
    6060        IDBFactoryType,
    6161        IDBIndexType,
    … …  
    6767    Type type() const { return m_type; }
    6868    // Use type() to figure out which one of these you're allowed to call.
    69     PassRefPtr<IDBDatabaseRequest> idbDatabaseRequest();
     69    PassRefPtr<IDBDatabase> idbDatabase();
    7070    PassRefPtr<IDBFactory> idbFactory();
    7171    PassRefPtr<IDBIndex> idbIndex();
    … …  
    7676    // Set can only be called once.
    7777    void set(); // For "null".
    78     void set(PassRefPtr<IDBDatabaseRequest>);
     78    void set(PassRefPtr<IDBDatabase>);
    7979    void set(PassRefPtr<IDBFactory>);
    8080    void set(PassRefPtr<IDBIndex>);
    … …  
    8989
    9090    // Only one of the following should ever be in use at any given time.
    91     RefPtr<IDBDatabaseRequest> m_idbDatabaseRequest;
     91    RefPtr<IDBDatabase> m_idbDatabase;
    9292    RefPtr<IDBFactory> m_idbFactory;
    9393    RefPtr<IDBIndex> m_idbIndex;

  • trunk/WebCore/storage/IDBCallbacks.h

    r64358 r64543  
    3030#define IDBCallbacks_h
    3131
    32 #include "IDBDatabase.h"
     32#include "IDBDatabaseBackendInterface.h"
    3333#include "IDBDatabaseError.h"
    3434#include "IDBIndexBackendInterface.h"
    … …  
    4848    virtual void onError(PassRefPtr<IDBDatabaseError>) = 0;
    4949    virtual void onSuccess() = 0; // For "null".
    50     virtual void onSuccess(PassRefPtr<IDBDatabase>) = 0;
     50    virtual void onSuccess(PassRefPtr<IDBDatabaseBackendInterface>) = 0;
    5151    virtual void onSuccess(PassRefPtr<IDBIndexBackendInterface>) = 0;
    5252    virtual void onSuccess(PassRefPtr<IDBKey>) = 0;

  • trunk/WebCore/storage/IDBDatabase.cpp

    r64542 r64543  
    2525
    2626#include "config.h"
    27 #include "IDBDatabaseRequest.h"
     27#include "IDBDatabase.h"
    2828
    2929#include "IDBAny.h"
    … …  
    3737namespace WebCore {
    3838
    39 IDBDatabaseRequest::IDBDatabaseRequest(PassRefPtr<IDBDatabase> database)
    40     : m_database(database)
     39IDBDatabase::IDBDatabase(PassRefPtr<IDBDatabaseBackendInterface> backend)
     40    : m_backend(backend)
    4141{
    4242    // We pass a reference to this object before it can be adopted.
    … …  
    4444}
    4545
    46 IDBDatabaseRequest::~IDBDatabaseRequest()
     46IDBDatabase::~IDBDatabase()
    4747{
    4848}
    4949
    50 PassRefPtr<IDBRequest> IDBDatabaseRequest::createObjectStore(ScriptExecutionContext* context, const String& name, const String& keyPath, bool autoIncrement)
     50PassRefPtr<IDBRequest> IDBDatabase::createObjectStore(ScriptExecutionContext* context, const String& name, const String& keyPath, bool autoIncrement)
    5151{
    5252    RefPtr<IDBRequest> request = IDBRequest::create(context, IDBAny::create(this));
    53     m_database->createObjectStore(name, keyPath, autoIncrement, request);
     53    m_backend->createObjectStore(name, keyPath, autoIncrement, request);
    5454    return request;
    5555}
    5656
    57 PassRefPtr<IDBObjectStoreRequest> IDBDatabaseRequest::objectStore(const String& name, unsigned short mode)
     57PassRefPtr<IDBObjectStoreRequest> IDBDatabase::objectStore(const String& name, unsigned short mode)
    5858{
    59     RefPtr<IDBObjectStore> objectStore = m_database->objectStore(name, mode);
     59    RefPtr<IDBObjectStore> objectStore = m_backend->objectStore(name, mode);
    6060    ASSERT(objectStore); // FIXME: If this is null, we should raise a NOT_FOUND_ERR.
    6161    return IDBObjectStoreRequest::create(objectStore.release());
    6262}
    6363
    64 PassRefPtr<IDBRequest> IDBDatabaseRequest::removeObjectStore(ScriptExecutionContext* context, const String& name)
     64PassRefPtr<IDBRequest> IDBDatabase::removeObjectStore(ScriptExecutionContext* context, const String& name)
    6565{
    6666    RefPtr<IDBRequest> request = IDBRequest::create(context, IDBAny::create(this));
    67     m_database->removeObjectStore(name, request);
     67    m_backend->removeObjectStore(name, request);
    6868    return request;
    6969}

  • trunk/WebCore/storage/IDBDatabase.h

    r61015 r64543  
    2727#define IDBDatabase_h
    2828
    29 #include "PlatformString.h"
     29#include "DOMStringList.h"
     30#include "IDBDatabaseBackendInterface.h"
    3031#include <wtf/PassRefPtr.h>
    31 #include <wtf/Threading.h>
     32#include <wtf/RefCounted.h>
     33#include <wtf/RefPtr.h>
    3234
    3335#if ENABLE(INDEXED_DATABASE)
    … …  
    3537namespace WebCore {
    3638
    37 class DOMStringList;
    38 class Frame;
    39 class IDBCallbacks;
    40 class IDBObjectStore;
     39class IDBAny;
     40class IDBObjectStoreRequest;
     41class IDBRequest;
     42class ScriptExecutionContext;
    4143
    42 // This class is shared by IDBDatabaseRequest (async) and IDBDatabaseSync (sync).
    43 // This is implemented by IDBDatabaseImpl and optionally others (in order to proxy
    44 // calls across process barriers). All calls to these classes should be non-blocking and
    45 // trigger work on a background thread if necessary.
    46 class IDBDatabase : public ThreadSafeShared<IDBDatabase> {
     44class IDBDatabase : public RefCounted<IDBDatabase> {
    4745public:
    48     virtual ~IDBDatabase() { }
     46    static PassRefPtr<IDBDatabase> create(PassRefPtr<IDBDatabaseBackendInterface> database)
     47    {
     48        return adoptRef(new IDBDatabase(database));
     49    }
     50    ~IDBDatabase();
    4951
    50     virtual String name() const = 0;
    51     virtual String description() const = 0;
    52     virtual String version() const = 0;
    53     virtual PassRefPtr<DOMStringList> objectStores() const = 0;
     52    // Implement the IDL
     53    String name() const { return m_backend->name(); }
     54    String description() const { return m_backend->description(); }
     55    String version() const { return m_backend->version(); }
     56    PassRefPtr<DOMStringList> objectStores() const { return m_backend->objectStores(); }
    5457
    55     // FIXME: Add transaction and setVersion.
     58    PassRefPtr<IDBRequest> createObjectStore(ScriptExecutionContext*, const String& name, const String& keyPath = String(), bool autoIncrement = false);
     59    PassRefPtr<IDBObjectStoreRequest> objectStore(const String& name, unsigned short mode = 0); // FIXME: Use constant rather than 0.
     60    PassRefPtr<IDBRequest> removeObjectStore(ScriptExecutionContext*, const String& name);
    5661
    57     virtual void createObjectStore(const String& name, const String& keyPath, bool autoIncrement, PassRefPtr<IDBCallbacks>) = 0;
    58     virtual PassRefPtr<IDBObjectStore> objectStore(const String& name, unsigned short mode) = 0;
    59     virtual void removeObjectStore(const String& name, PassRefPtr<IDBCallbacks>) = 0;
     62private:
     63    IDBDatabase(PassRefPtr<IDBDatabaseBackendInterface>);
     64
     65    RefPtr<IDBDatabaseBackendInterface> m_backend;
    6066};
    6167

  • trunk/WebCore/storage/IDBDatabase.idl

    r64542 r64543  
    2828    interface [
    2929        Conditional=INDEXED_DATABASE
    30     ] IDBDatabaseRequest {
     30    ] IDBDatabase {
    3131        readonly attribute DOMString name;
    3232        readonly attribute DOMString description;

  • trunk/WebCore/storage/IDBDatabaseBackendImpl.cpp

    r64542 r64543  
    2525
    2626#include "config.h"
    27 #include "IDBDatabaseImpl.h"
     27#include "IDBDatabaseBackendImpl.h"
    2828
    2929#include "DOMStringList.h"
    … …  
    3535namespace WebCore {
    3636
    37 IDBDatabaseImpl::IDBDatabaseImpl(const String& name, const String& description, const String& version)
     37IDBDatabaseBackendImpl::IDBDatabaseBackendImpl(const String& name, const String& description, const String& version)
    3838    : m_name(name)
    3939    , m_description(description)
    … …  
    4242}
    4343
    44 IDBDatabaseImpl::~IDBDatabaseImpl()
     44IDBDatabaseBackendImpl::~IDBDatabaseBackendImpl()
    4545{
    4646}
    4747
    48 PassRefPtr<DOMStringList> IDBDatabaseImpl::objectStores() const
     48PassRefPtr<DOMStringList> IDBDatabaseBackendImpl::objectStores() const
    4949{
    5050    RefPtr<DOMStringList> objectStoreNames = DOMStringList::create();
    … …  
    5454}
    5555
    56 void IDBDatabaseImpl::createObjectStore(const String& name, const String& keyPath, bool autoIncrement, PassRefPtr<IDBCallbacks> callbacks)
     56void IDBDatabaseBackendImpl::createObjectStore(const String& name, const String& keyPath, bool autoIncrement, PassRefPtr<IDBCallbacks> callbacks)
    5757{
    5858    if (m_objectStores.contains(name)) {
    … …  
    6666}
    6767
    68 PassRefPtr<IDBObjectStore> IDBDatabaseImpl::objectStore(const String& name, unsigned short mode)
     68PassRefPtr<IDBObjectStore> IDBDatabaseBackendImpl::objectStore(const String& name, unsigned short mode)
    6969{
    7070    // FIXME: If no transaction is running, this should implicitly start one.
    … …  
    7373}
    7474
    75 void IDBDatabaseImpl::removeObjectStore(const String& name, PassRefPtr<IDBCallbacks> callbacks)
     75void IDBDatabaseBackendImpl::removeObjectStore(const String& name, PassRefPtr<IDBCallbacks> callbacks)
    7676{
    7777    if (!m_objectStores.contains(name)) {

  • trunk/WebCore/storage/IDBDatabaseBackendImpl.h

    r64542 r64543  
    2424 */
    2525
    26 #ifndef IDBDatabaseImpl_h
    27 #define IDBDatabaseImpl_h
     26#ifndef IDBDatabaseBackendImpl_h
     27#define IDBDatabaseBackendImpl_h
    2828
    2929#include "IDBCallbacks.h"
    … …  
    3636namespace WebCore {
    3737
    38 class IDBDatabaseImpl : public IDBDatabase {
     38class IDBDatabaseBackendImpl : public IDBDatabaseBackendInterface {
    3939public:
    40     static PassRefPtr<IDBDatabase> create(const String& name, const String& description, const String& version)
     40    static PassRefPtr<IDBDatabaseBackendInterface> create(const String& name, const String& description, const String& version)
    4141    {
    42         return adoptRef(new IDBDatabaseImpl(name, description, version));
     42        return adoptRef(new IDBDatabaseBackendImpl(name, description, version));
    4343    }
    44     virtual ~IDBDatabaseImpl();
     44    virtual ~IDBDatabaseBackendImpl();
    4545
    4646    // Implements IDBDatabase
    … …  
    5555
    5656private:
    57     IDBDatabaseImpl(const String& name, const String& description, const String& version);
     57    IDBDatabaseBackendImpl(const String& name, const String& description, const String& version);
    5858
    5959    String m_name;
    … …  
    6969#endif
    7070
    71 #endif // IDBDatabaseImpl_h
     71#endif // IDBDatabaseBackendImpl_h

  • trunk/WebCore/storage/IDBDatabaseBackendInterface.h

    r64542 r64543  
    2424 */
    2525
    26 #ifndef IDBDatabase_h
    27 #define IDBDatabase_h
     26#ifndef IDBDatabaseBackendInterface_h
     27#define IDBDatabaseBackendInterface_h
    2828
    2929#include "PlatformString.h"
    … …  
    4040class IDBObjectStore;
    4141
    42 // This class is shared by IDBDatabaseRequest (async) and IDBDatabaseSync (sync).
    43 // This is implemented by IDBDatabaseImpl and optionally others (in order to proxy
     42// This class is shared by IDBDatabase (async) and IDBDatabaseSync (sync).
     43// This is implemented by IDBDatabaseBackendImpl and optionally others (in order to proxy
    4444// calls across process barriers). All calls to these classes should be non-blocking and
    4545// trigger work on a background thread if necessary.
    46 class IDBDatabase : public ThreadSafeShared<IDBDatabase> {
     46class IDBDatabaseBackendInterface : public ThreadSafeShared<IDBDatabaseBackendInterface> {
    4747public:
    48     virtual ~IDBDatabase() { }
     48    virtual ~IDBDatabaseBackendInterface() { }
    4949
    5050    virtual String name() const = 0;
    … …  
    6464#endif
    6565
    66 #endif // IDBDatabase_h
     66#endif // IDBDatabaseBackendInterface_h

  • trunk/WebCore/storage/IDBFactoryBackendImpl.cpp

    r64344 r64543  
    3131
    3232#include "DOMStringList.h"
    33 #include "IDBDatabaseImpl.h"
     33#include "IDBDatabaseBackendImpl.h"
    3434#include "SecurityOrigin.h"
    3535#include <wtf/Threading.h>
    … …  
    5555void IDBFactoryBackendImpl::open(const String& name, const String& description, PassRefPtr<IDBCallbacks> callbacks, PassRefPtr<SecurityOrigin>, Frame*)
    5656{
    57     RefPtr<IDBDatabase> database;
    58     IDBDatabaseMap::iterator it = m_databaseMap.find(name);
    59     if (it == m_databaseMap.end()) {
     57    RefPtr<IDBDatabaseBackendInterface> databaseBackend;
     58    IDBDatabaseBackendMap::iterator it = m_databaseBackendMap.find(name);
     59    if (it == m_databaseBackendMap.end()) {
    6060        // FIXME: What should the version be?  The spec doesn't define it yet.
    61         database = IDBDatabaseImpl::create(name, description, "");
    62         m_databaseMap.set(name, database);
     61        databaseBackend = IDBDatabaseBackendImpl::create(name, description, "");
     62        m_databaseBackendMap.set(name, databaseBackend);
    6363    } else
    64         database = it->second;
     64        databaseBackend = it->second;
    6565
    66     callbacks->onSuccess(database.release());
     66    callbacks->onSuccess(databaseBackend.release());
    6767}
    6868

  • trunk/WebCore/storage/IDBFactoryBackendImpl.h

    r64344 r64543  
    4949    IDBFactoryBackendImpl();
    5050
    51     typedef HashMap<String, RefPtr<IDBDatabase> > IDBDatabaseMap;
    52     IDBDatabaseMap m_databaseMap;
     51    typedef HashMap<String, RefPtr<IDBDatabaseBackendInterface> > IDBDatabaseBackendMap;
     52    IDBDatabaseBackendMap m_databaseBackendMap;
    5353
    5454    // We only create one instance of this class at a time.

  • trunk/WebCore/storage/IDBRequest.cpp

    r64358 r64543  
    3636#include "EventListener.h"
    3737#include "EventNames.h"
    38 #include "IDBDatabaseRequest.h"
     38#include "IDBDatabase.h"
    3939#include "IDBIndex.h"
    4040#include "IDBErrorEvent.h"
    … …  
    7474}
    7575
    76 void IDBRequest::onSuccess(PassRefPtr<IDBDatabase> idbDatabase)
     76void IDBRequest::onSuccess(PassRefPtr<IDBDatabaseBackendInterface> idbDatabaseBackend)
    7777{
    7878    onEventCommon();
    79     m_result->set(IDBDatabaseRequest::create(idbDatabase));
     79    m_result->set(IDBDatabase::create(idbDatabaseBackend));
    8080}
    8181

  • trunk/WebCore/storage/IDBRequest.h

    r64358 r64543  
    4242namespace WebCore {
    4343
    44 class IDBDatabaseRequest;
    45 
    4644class IDBRequest : public IDBCallbacks, public EventTarget, public ActiveDOMObject {
    4745public:
    … …  
    6563    virtual void onError(PassRefPtr<IDBDatabaseError>);
    6664    virtual void onSuccess(); // For "null".
    67     virtual void onSuccess(PassRefPtr<IDBDatabase>);
     65    virtual void onSuccess(PassRefPtr<IDBDatabaseBackendInterface>);
    6866    virtual void onSuccess(PassRefPtr<IDBIndexBackendInterface>);
    6967    virtual void onSuccess(PassRefPtr<IDBKey>);

  • trunk/WebKit/chromium/ChangeLog

    r64534 r64543  
     12010-07-30  Andrei Popescu  <andreip@dhcp-172-16-14-12.lon.corp.google.com>
     2
     3        Reviewed by Jeremy Orlow.
     4
     5        Rename IDBDatabaseRequest to IDBDatabase
     6        https://bugs.webkit.org/show_bug.cgi?id=43250
     7
     8        * src/IDBCallbacksProxy.cpp:
     9        (WebCore::IDBCallbacksProxy::onSuccess):
     10        * src/IDBCallbacksProxy.h:
     11        * src/IDBDatabaseProxy.cpp:
     12        (WebCore::IDBDatabaseProxy::create):
     13        * src/IDBDatabaseProxy.h:
     14        * src/WebIDBDatabaseImpl.cpp:
     15        (WebKit::WebIDBDatabaseImpl::WebIDBDatabaseImpl):
     16        (WebKit::WebIDBDatabaseImpl::name):
     17        (WebKit::WebIDBDatabaseImpl::description):
     18        (WebKit::WebIDBDatabaseImpl::version):
     19        (WebKit::WebIDBDatabaseImpl::objectStores):
     20        (WebKit::WebIDBDatabaseImpl::createObjectStore):
     21        (WebKit::WebIDBDatabaseImpl::objectStore):
     22        (WebKit::WebIDBDatabaseImpl::removeObjectStore):
     23        * src/WebIDBDatabaseImpl.h:
     24
    1252010-08-02  Pavel Feldman  <pfeldman@chromium.org>
    226

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

    r64358 r64543  
    7070}
    7171
    72 void IDBCallbacksProxy::onSuccess(PassRefPtr<IDBDatabase> idbDatabase)
     72void IDBCallbacksProxy::onSuccess(PassRefPtr<IDBDatabaseBackendInterface> idbDatabaseBackend)
    7373{
    74     m_callbacks->onSuccess(new WebKit::WebIDBDatabaseImpl(idbDatabase));
     74    m_callbacks->onSuccess(new WebKit::WebIDBDatabaseImpl(idbDatabaseBackend));
    7575    m_callbacks.clear();
    7676}

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

    r64358 r64543  
    5050    virtual void onError(PassRefPtr<IDBDatabaseError>);
    5151    virtual void onSuccess(); // For "null".
    52     virtual void onSuccess(PassRefPtr<IDBDatabase>);
     52    virtual void onSuccess(PassRefPtr<IDBDatabaseBackendInterface>);
    5353    virtual void onSuccess(PassRefPtr<IDBIndexBackendInterface>);
    5454    virtual void onSuccess(PassRefPtr<IDBKey>);

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

    r61015 r64543  
    4040namespace WebCore {
    4141
    42 PassRefPtr<IDBDatabase> IDBDatabaseProxy::create(PassOwnPtr<WebKit::WebIDBDatabase> database)
     42PassRefPtr<IDBDatabaseBackendInterface> IDBDatabaseProxy::create(PassOwnPtr<WebKit::WebIDBDatabase> database)
    4343{
    4444    return adoptRef(new IDBDatabaseProxy(database));

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

    r61015 r64543  
    2727#define IDBDatabaseProxy_h
    2828
    29 #include "IDBDatabase.h"
     29#include "IDBDatabaseBackendInterface.h"
    3030#include <wtf/OwnPtr.h>
    3131#include <wtf/PassOwnPtr.h>
    … …  
    3838namespace WebCore {
    3939
    40 class IDBDatabaseProxy : public IDBDatabase {
     40class IDBDatabaseProxy : public IDBDatabaseBackendInterface {
    4141public:
    42     static PassRefPtr<IDBDatabase> create(PassOwnPtr<WebKit::WebIDBDatabase>);
     42    static PassRefPtr<IDBDatabaseBackendInterface> create(PassOwnPtr<WebKit::WebIDBDatabase>);
    4343    virtual ~IDBDatabaseProxy();
    4444

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

    r61015 r64543  
    2929#include "DOMStringList.h"
    3030#include "IDBCallbacksProxy.h"
    31 #include "IDBDatabase.h"
     31#include "IDBDatabaseBackendInterface.h"
    3232#include "WebIDBCallbacks.h"
    3333#include "WebIDBObjectStoreImpl.h"
    … …  
    3939namespace WebKit {
    4040
    41 WebIDBDatabaseImpl::WebIDBDatabaseImpl(PassRefPtr<IDBDatabase> database)
    42     : m_database(database)
     41WebIDBDatabaseImpl::WebIDBDatabaseImpl(PassRefPtr<IDBDatabaseBackendInterface> databaseBackend)
     42    : m_databaseBackend(databaseBackend)
    4343{
    4444}
    … …  
    5050WebString WebIDBDatabaseImpl::name() const
    5151{
    52     return m_database->name();
     52    return m_databaseBackend->name();
    5353}
    5454
    5555WebString WebIDBDatabaseImpl::description() const
    5656{
    57     return m_database->description();
     57    return m_databaseBackend->description();
    5858}
    5959
    6060WebString WebIDBDatabaseImpl::version() const
    6161{
    62     return m_database->version();
     62    return m_databaseBackend->version();
    6363}
    6464
    6565WebDOMStringList WebIDBDatabaseImpl::objectStores() const
    6666{
    67     return m_database->objectStores();
     67    return m_databaseBackend->objectStores();
    6868}
    6969
    7070void WebIDBDatabaseImpl::createObjectStore(const WebString& name, const WebString& keyPath, bool autoIncrement, WebIDBCallbacks* callbacks)
    7171{
    72     m_database->createObjectStore(name, keyPath, autoIncrement, IDBCallbacksProxy::create(callbacks));
     72    m_databaseBackend->createObjectStore(name, keyPath, autoIncrement, IDBCallbacksProxy::create(callbacks));
    7373}
    7474
    7575WebIDBObjectStore* WebIDBDatabaseImpl::objectStore(const WebString& name, unsigned short mode)
    7676{
    77     RefPtr<IDBObjectStore> objectStore = m_database->objectStore(name, mode);
     77    RefPtr<IDBObjectStore> objectStore = m_databaseBackend->objectStore(name, mode);
    7878    if (!objectStore)
    7979        return 0;
    … …  
    8383void WebIDBDatabaseImpl::removeObjectStore(const WebString& name, WebIDBCallbacks* callbacks)
    8484{
    85     m_database->removeObjectStore(name, IDBCallbacksProxy::create(callbacks));
     85    m_databaseBackend->removeObjectStore(name, IDBCallbacksProxy::create(callbacks));
    8686}
    8787

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

    r61015 r64543  
    3232#include <wtf/RefPtr.h>
    3333
    34 namespace WebCore { class IDBDatabase; }
     34namespace WebCore { class IDBDatabaseBackendInterface; }
    3535
    3636namespace WebKit {
    … …  
    4141class WebIDBDatabaseImpl : public WebIDBDatabase {
    4242public:
    43     WebIDBDatabaseImpl(WTF::PassRefPtr<WebCore::IDBDatabase> database);
     43    WebIDBDatabaseImpl(WTF::PassRefPtr<WebCore::IDBDatabaseBackendInterface>);
    4444    virtual ~WebIDBDatabaseImpl();
    4545
    … …  
    5454
    5555private:
    56     WTF::RefPtr<WebCore::IDBDatabase> m_database;
     56    WTF::RefPtr<WebCore::IDBDatabaseBackendInterface> m_databaseBackend;
    5757};
    5858
Note: See TracChangeset for help on using the changeset viewer.