Changeset 69123 in webkit


Ignore:
Timestamp:
Oct 5, 2010 10:17:36 AM (14 years ago)
Author:
jorlow@chromium.org
Message:

2010-10-04 Jeremy Orlow <​jorlow@chromium.org>

Reviewed by Nate Chapin.

Rename get* and open*Cursor per the spec on IDBIndex
​https://bugs.webkit.org/show_bug.cgi?id=46906

The spec changed so that:
IDBIndex.get -> getKey
IDBIndex.getObject -> get
IDBIndex.openCursor -> openKeyCursor
IDBIndex.openObjectCursor -> openCursor

  • storage/indexeddb/index-basics-expected.txt:
  • storage/indexeddb/index-basics.html:
  • storage/indexeddb/index-cursor.html:

2010-10-04 Jeremy Orlow <​jorlow@chromium.org>

Reviewed by Nate Chapin.

Rename get* and open*Cursor per the spec on IDBIndex
​https://bugs.webkit.org/show_bug.cgi?id=46906

The spec changed so that:
IDBIndex.get -> getKey
IDBIndex.getObject -> get
IDBIndex.openCursor -> openKeyCursor
IDBIndex.openObjectCursor -> openCursor

Existing tests cover since this is just renaming stuff.

  • storage/IDBIndex.cpp: (WebCore::IDBIndex::openCursor): (WebCore::IDBIndex::openKeyCursor): (WebCore::IDBIndex::get): (WebCore::IDBIndex::getKey):
  • storage/IDBIndex.h:
  • storage/IDBIndex.idl:
  • storage/IDBIndexBackendImpl.cpp: (WebCore::IDBIndexBackendImpl::openCursor): (WebCore::IDBIndexBackendImpl::openKeyCursor): (WebCore::IDBIndexBackendImpl::get): (WebCore::IDBIndexBackendImpl::getKey):
  • storage/IDBIndexBackendImpl.h:
  • storage/IDBIndexBackendInterface.h:

2010-10-04 Jeremy Orlow <​jorlow@chromium.org>

Reviewed by Nate Chapin.

Rename get* and open*Cursor per the spec on IDBIndex
​https://bugs.webkit.org/show_bug.cgi?id=46906

The spec changed so that:
IDBIndex.get -> getKey
IDBIndex.getObject -> get
IDBIndex.openCursor -> openKeyCursor
IDBIndex.openObjectCursor -> openCursor

  • public/WebIDBIndex.h: (WebKit::WebIDBIndex::openCursor): (WebKit::WebIDBIndex::openKeyCursor): (WebKit::WebIDBIndex::get): (WebKit::WebIDBIndex::getKey):
  • src/IDBIndexBackendProxy.cpp: (WebCore::IDBIndexBackendProxy::openCursor): (WebCore::IDBIndexBackendProxy::openKeyCursor): (WebCore::IDBIndexBackendProxy::get): (WebCore::IDBIndexBackendProxy::getKey):
  • src/IDBIndexBackendProxy.h:
  • src/WebIDBIndexImpl.cpp: (WebKit::WebIDBIndexImpl::openObjectCursor): (WebKit::WebIDBIndexImpl::openKeyCursor): (WebKit::WebIDBIndexImpl::getObject): (WebKit::WebIDBIndexImpl::getKey):
  • src/WebIDBIndexImpl.h:
Location:
trunk
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r69121 r69123  
     12010-10-04  Jeremy Orlow  <jorlow@chromium.org>
     2
     3        Reviewed by Nate Chapin.
     4
     5        Rename get* and open*Cursor per the spec on IDBIndex
     6        https://bugs.webkit.org/show_bug.cgi?id=46906
     7
     8        The spec changed so that:
     9        IDBIndex.get -> getKey
     10        IDBIndex.getObject -> get
     11        IDBIndex.openCursor -> openKeyCursor
     12        IDBIndex.openObjectCursor -> openCursor
     13
     14        * storage/indexeddb/index-basics-expected.txt:
     15        * storage/indexeddb/index-basics.html:
     16        * storage/indexeddb/index-cursor.html:
     17
    1182010-10-04  Andrei Popescu  <andreip@google.com>
    219

  • trunk/LayoutTests/storage/indexeddb/index-basics-expected.txt

    r69121 r69123  
    5353PASS 'unique' in indexObject is true
    5454PASS indexObject.unique is false
    55 PASS 'openObjectCursor' in indexObject is true
     55PASS 'openKeyCursor' in indexObject is true
    5656PASS 'openCursor' in indexObject is true
    57 PASS 'getObject' in indexObject is true
     57PASS 'getKey' in indexObject is true
    5858PASS 'get' in indexObject is true
    5959store.add({x: 'value', y: 'zzz'}, 'key')
    … …  
    9191PASS event.target.readyState is event.target.DONE
    9292
     93indexObject.getKey('value')
     94PASS 'onsuccess' in result is true
     95PASS 'onerror' in result is true
     96PASS 'readyState' in result is true
     97An event should fire shortly...
     98
     99Success event fired:
     100PASS 'result' in event is true
     101PASS 'code' in event is false
     102PASS 'message' in event is false
     103PASS 'source' in event is true
     104PASS event.source != null is true
     105PASS 'onsuccess' in event.target is true
     106PASS 'onerror' in event.target is true
     107PASS 'readyState' in event.target is true
     108PASS event.target.readyState is event.target.DONE
     109
     110PASS event.result is "key"
    93111indexObject.get('value')
    94 PASS 'onsuccess' in result is true
    95 PASS 'onerror' in result is true
    96 PASS 'readyState' in result is true
    97 An event should fire shortly...
    98 
    99 Success event fired:
    100 PASS 'result' in event is true
    101 PASS 'code' in event is false
    102 PASS 'message' in event is false
    103 PASS 'source' in event is true
    104 PASS event.source != null is true
    105 PASS 'onsuccess' in event.target is true
    106 PASS 'onerror' in event.target is true
    107 PASS 'readyState' in event.target is true
    108 PASS event.target.readyState is event.target.DONE
    109 
    110 PASS event.result is "key"
    111 indexObject.getObject('value')
    112112PASS 'onsuccess' in result is true
    113113PASS 'onerror' in result is true
    … …  
    128128PASS event.result.x is "value"
    129129PASS event.result.y is "zzz"
    130 indexObject.get('does not exist')
     130indexObject.getKey('does not exist')
    131131PASS 'onsuccess' in result is true
    132132PASS 'onerror' in result is true
    … …  
    146146
    147147PASS event.code is IDBDatabaseException.NOT_FOUND_ERR
    148 indexObject.getObject('does not exist')
     148indexObject.get('does not exist')
    149149PASS 'onsuccess' in result is true
    150150PASS 'onerror' in result is true
    … …  
    164164
    165165PASS event.code is IDBDatabaseException.NOT_FOUND_ERR
    166 indexObject.openCursor()
     166indexObject.openKeyCursor()
    167167PASS 'onsuccess' in result is true
    168168PASS 'onerror' in result is true
    … …  
    222222
    223223PASS event.result === null is true
    224 indexObject.openObjectCursor()
     224indexObject.openCursor()
    225225PASS 'onsuccess' in result is true
    226226PASS 'onerror' in result is true

  • trunk/LayoutTests/storage/indexeddb/index-basics.html

    r69121 r69123  
    6262    shouldBeTrue("'unique' in indexObject");
    6363    shouldBeFalse("indexObject.unique");
    64     shouldBeTrue("'openObjectCursor' in indexObject");
     64    shouldBeTrue("'openKeyCursor' in indexObject");
    6565    shouldBeTrue("'openCursor' in indexObject");
    66     shouldBeTrue("'getObject' in indexObject");
     66    shouldBeTrue("'getKey' in indexObject");
    6767    shouldBeTrue("'get' in indexObject");
    6868
    … …  
    8787    verifySuccessEvent(event);
    8888
     89    result = evalAndLog("indexObject.getKey('value')");
     90    verifyResult(result);
     91    result.onsuccess = getObjectData;
     92    result.onerror = unexpectedErrorCallback;
     93}
     94
     95function getObjectData()
     96{
     97    verifySuccessEvent(event);
     98    shouldBeEqualToString("event.result", "key");
     99
    89100    result = evalAndLog("indexObject.get('value')");
    90     verifyResult(result);
    91     result.onsuccess = getObjectData;
    92     result.onerror = unexpectedErrorCallback;
    93 }
    94 
    95 function getObjectData()
    96 {
    97     verifySuccessEvent(event);
    98     shouldBeEqualToString("event.result", "key");
    99 
    100     result = evalAndLog("indexObject.getObject('value')");
    101101    verifyResult(result);
    102102    result.onsuccess = getDataFail;
    … …  
    110110    shouldBeEqualToString("event.result.y", "zzz");
    111111
    112     result = evalAndLog("indexObject.get('does not exist')");
     112    result = evalAndLog("indexObject.getKey('does not exist')");
    113113    verifyResult(result);
    114114    result.onsuccess = unexpectedSuccessCallback;
    … …  
    121121    shouldBe("event.code", "IDBDatabaseException.NOT_FOUND_ERR");
    122122
    123     result = evalAndLog("indexObject.getObject('does not exist')");
     123    result = evalAndLog("indexObject.get('does not exist')");
    124124    verifyResult(result);
    125125    result.onsuccess = unexpectedSuccessCallback;
    126     result.onerror = openCursor;
    127 }
    128 
    129 function openCursor()
     126    result.onerror = openKeyCursor;
     127}
     128
     129function openKeyCursor()
    130130{
    131131    verifyErrorEvent(event);
    132132    shouldBe("event.code", "IDBDatabaseException.NOT_FOUND_ERR");
    133133
    134     window.result = evalAndLog("indexObject.openCursor()");
     134    window.result = evalAndLog("indexObject.openKeyCursor()");
    135135    verifyResult(result);
    136136    result.onsuccess = cursor1Continue;
    … …  
    169169    shouldBeTrue("event.result === null");
    170170
    171     window.result = evalAndLog("indexObject.openObjectCursor()");
     171    window.result = evalAndLog("indexObject.openCursor()");
    172172    verifyResult(result);
    173173    result.onsuccess = cursor2Continue;

  • trunk/LayoutTests/storage/indexeddb/index-cursor.html

    r69121 r69123  
    187187        keyRange = IDBKeyRange.rightBound(testData[upper], upperIsOpen);
    188188 
    189     var request = indexObject.openCursor(keyRange, ascending ? IDBCursor.NEXT : IDBCursor.PREV);
     189    var request = indexObject.openKeyCursor(keyRange, ascending ? IDBCursor.NEXT : IDBCursor.PREV);
    190190    request.onsuccess = cursorIteration;
    191191    request.onerror = unexpectedErrorCallback;

  • trunk/WebCore/ChangeLog

    r69122 r69123  
     12010-10-04  Jeremy Orlow  <jorlow@chromium.org>
     2
     3        Reviewed by Nate Chapin.
     4
     5        Rename get* and open*Cursor per the spec on IDBIndex
     6        https://bugs.webkit.org/show_bug.cgi?id=46906
     7
     8        The spec changed so that:
     9        IDBIndex.get -> getKey
     10        IDBIndex.getObject -> get
     11        IDBIndex.openCursor -> openKeyCursor
     12        IDBIndex.openObjectCursor -> openCursor
     13
     14        Existing tests cover since this is just renaming stuff.
     15
     16        * storage/IDBIndex.cpp:
     17        (WebCore::IDBIndex::openCursor):
     18        (WebCore::IDBIndex::openKeyCursor):
     19        (WebCore::IDBIndex::get):
     20        (WebCore::IDBIndex::getKey):
     21        * storage/IDBIndex.h:
     22        * storage/IDBIndex.idl:
     23        * storage/IDBIndexBackendImpl.cpp:
     24        (WebCore::IDBIndexBackendImpl::openCursor):
     25        (WebCore::IDBIndexBackendImpl::openKeyCursor):
     26        (WebCore::IDBIndexBackendImpl::get):
     27        (WebCore::IDBIndexBackendImpl::getKey):
     28        * storage/IDBIndexBackendImpl.h:
     29        * storage/IDBIndexBackendInterface.h:
     30
    1312010-10-05  Keith Kyzivat  <keith.kyzivat@nokia.com>
    232

  • trunk/WebCore/storage/IDBIndex.cpp

    r68795 r69123  
    5050}
    5151
    52 PassRefPtr<IDBRequest> IDBIndex::openObjectCursor(ScriptExecutionContext* context, PassRefPtr<IDBKeyRange> keyRange, unsigned short direction)
    53 {
    54     RefPtr<IDBRequest> request = IDBRequest::create(context, IDBAny::create(this), m_transaction.get());
    55     m_backend->openObjectCursor(keyRange, direction, request, m_transaction.get());
    56     return request;
    57 }
    58 
    5952PassRefPtr<IDBRequest> IDBIndex::openCursor(ScriptExecutionContext* context, PassRefPtr<IDBKeyRange> keyRange, unsigned short direction)
    6053{
    … …  
    6457}
    6558
    66 PassRefPtr<IDBRequest> IDBIndex::getObject(ScriptExecutionContext* context, PassRefPtr<IDBKey> key)
     59PassRefPtr<IDBRequest> IDBIndex::openKeyCursor(ScriptExecutionContext* context, PassRefPtr<IDBKeyRange> keyRange, unsigned short direction)
    6760{
    6861    RefPtr<IDBRequest> request = IDBRequest::create(context, IDBAny::create(this), m_transaction.get());
    69     m_backend->getObject(key, request, m_transaction.get());
     62    m_backend->openKeyCursor(keyRange, direction, request, m_transaction.get());
    7063    return request;
    7164}
    … …  
    7871}
    7972
     73PassRefPtr<IDBRequest> IDBIndex::getKey(ScriptExecutionContext* context, PassRefPtr<IDBKey> key)
     74{
     75    RefPtr<IDBRequest> request = IDBRequest::create(context, IDBAny::create(this), m_transaction.get());
     76    m_backend->getKey(key, request, m_transaction.get());
     77    return request;
     78}
     79
    8080} // namespace WebCore
    8181

  • trunk/WebCore/storage/IDBIndex.h

    r68795 r69123  
    5050    bool unique() const { return m_backend->unique(); }
    5151
    52     PassRefPtr<IDBRequest> openObjectCursor(ScriptExecutionContext*, PassRefPtr<IDBKeyRange> = 0, unsigned short direction = IDBCursor::NEXT);
    5352    PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext*, PassRefPtr<IDBKeyRange> = 0, unsigned short direction = IDBCursor::NEXT);
    54     PassRefPtr<IDBRequest> getObject(ScriptExecutionContext*, PassRefPtr<IDBKey>);
     53    PassRefPtr<IDBRequest> openKeyCursor(ScriptExecutionContext*, PassRefPtr<IDBKeyRange> = 0, unsigned short direction = IDBCursor::NEXT);
    5554    PassRefPtr<IDBRequest> get(ScriptExecutionContext*, PassRefPtr<IDBKey>);
     55    PassRefPtr<IDBRequest> getKey(ScriptExecutionContext*, PassRefPtr<IDBKey>);
    5656
    5757private:

  • trunk/WebCore/storage/IDBIndex.idl

    r67600 r69123  
    3535
    3636        // FIXME: All of these should raise on certain errors.
    37         [CallWith=ScriptExecutionContext] IDBRequest openObjectCursor(in [Optional] IDBKeyRange range, in [Optional] unsigned short direction);
    3837        [CallWith=ScriptExecutionContext] IDBRequest openCursor(in [Optional] IDBKeyRange range, in [Optional] unsigned short direction);
    39         [CallWith=ScriptExecutionContext] IDBRequest getObject(in IDBKey key);
     38        [CallWith=ScriptExecutionContext] IDBRequest openKeyCursor(in [Optional] IDBKeyRange range, in [Optional] unsigned short direction);
    4039        [CallWith=ScriptExecutionContext] IDBRequest get(in IDBKey key);
     40        [CallWith=ScriptExecutionContext] IDBRequest getKey(in IDBKey key);
    4141    };
    4242

  • trunk/WebCore/storage/IDBIndexBackendImpl.cpp

    r69121 r69123  
    111111}
    112112
    113 void IDBIndexBackendImpl::openObjectCursor(PassRefPtr<IDBKeyRange> prpKeyRange, unsigned short direction, PassRefPtr<IDBCallbacks> prpCallbacks, IDBTransactionBackendInterface* transactionPtr)
     113void IDBIndexBackendImpl::openCursor(PassRefPtr<IDBKeyRange> prpKeyRange, unsigned short direction, PassRefPtr<IDBCallbacks> prpCallbacks, IDBTransactionBackendInterface* transactionPtr)
    114114{
    115115    RefPtr<IDBIndexBackendImpl> index = this;
    … …  
    121121}
    122122
    123 void IDBIndexBackendImpl::openCursor(PassRefPtr<IDBKeyRange> prpKeyRange, unsigned short direction, PassRefPtr<IDBCallbacks> prpCallbacks, IDBTransactionBackendInterface* transactionPtr)
     123void IDBIndexBackendImpl::openKeyCursor(PassRefPtr<IDBKeyRange> prpKeyRange, unsigned short direction, PassRefPtr<IDBCallbacks> prpCallbacks, IDBTransactionBackendInterface* transactionPtr)
    124124{
    125125    RefPtr<IDBIndexBackendImpl> index = this;
    … …  
    156156}
    157157
    158 void IDBIndexBackendImpl::getObject(PassRefPtr<IDBKey> prpKey, PassRefPtr<IDBCallbacks> prpCallbacks, IDBTransactionBackendInterface* transaction)
     158void IDBIndexBackendImpl::get(PassRefPtr<IDBKey> prpKey, PassRefPtr<IDBCallbacks> prpCallbacks, IDBTransactionBackendInterface* transaction)
    159159{
    160160    RefPtr<IDBIndexBackendImpl> index = this;
    … …  
    165165}
    166166
    167 void IDBIndexBackendImpl::get(PassRefPtr<IDBKey> prpKey, PassRefPtr<IDBCallbacks> prpCallbacks, IDBTransactionBackendInterface* transaction)
     167void IDBIndexBackendImpl::getKey(PassRefPtr<IDBKey> prpKey, PassRefPtr<IDBCallbacks> prpCallbacks, IDBTransactionBackendInterface* transaction)
    168168{
    169169    RefPtr<IDBIndexBackendImpl> index = this;

  • trunk/WebCore/storage/IDBIndexBackendImpl.h

    r69121 r69123  
    6565    virtual bool unique() { return m_unique; }
    6666
    67     virtual void openObjectCursor(PassRefPtr<IDBKeyRange>, unsigned short direction, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*);
    6867    virtual void openCursor(PassRefPtr<IDBKeyRange>, unsigned short direction, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*);
    69     virtual void getObject(PassRefPtr<IDBKey>, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*);
     68    virtual void openKeyCursor(PassRefPtr<IDBKeyRange>, unsigned short direction, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*);
    7069    virtual void get(PassRefPtr<IDBKey>, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*);
     70    virtual void getKey(PassRefPtr<IDBKey>, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*);
    7171
    7272    IDBObjectStoreBackendImpl* objectStore() const { return m_objectStore.get(); }

  • trunk/WebCore/storage/IDBIndexBackendInterface.h

    r68795 r69123  
    4848    virtual bool unique() = 0;
    4949
    50     virtual void openObjectCursor(PassRefPtr<IDBKeyRange>, unsigned short direction, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*) = 0;
    5150    virtual void openCursor(PassRefPtr<IDBKeyRange>, unsigned short direction, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*) = 0;
    52     virtual void getObject(PassRefPtr<IDBKey>, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*) = 0;
     51    virtual void openKeyCursor(PassRefPtr<IDBKeyRange>, unsigned short direction, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*) = 0;
    5352    virtual void get(PassRefPtr<IDBKey>, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*) = 0;
     53    virtual void getKey(PassRefPtr<IDBKey>, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*) = 0;
    5454};
    5555

  • trunk/WebKit/chromium/ChangeLog

    r69121 r69123  
     12010-10-04  Jeremy Orlow  <jorlow@chromium.org>
     2
     3        Reviewed by Nate Chapin.
     4
     5        Rename get* and open*Cursor per the spec on IDBIndex
     6        https://bugs.webkit.org/show_bug.cgi?id=46906
     7
     8        The spec changed so that:
     9        IDBIndex.get -> getKey
     10        IDBIndex.getObject -> get
     11        IDBIndex.openCursor -> openKeyCursor
     12        IDBIndex.openObjectCursor -> openCursor
     13
     14        * public/WebIDBIndex.h:
     15        (WebKit::WebIDBIndex::openCursor):
     16        (WebKit::WebIDBIndex::openKeyCursor):
     17        (WebKit::WebIDBIndex::get):
     18        (WebKit::WebIDBIndex::getKey):
     19        * src/IDBIndexBackendProxy.cpp:
     20        (WebCore::IDBIndexBackendProxy::openCursor):
     21        (WebCore::IDBIndexBackendProxy::openKeyCursor):
     22        (WebCore::IDBIndexBackendProxy::get):
     23        (WebCore::IDBIndexBackendProxy::getKey):
     24        * src/IDBIndexBackendProxy.h:
     25        * src/WebIDBIndexImpl.cpp:
     26        (WebKit::WebIDBIndexImpl::openObjectCursor):
     27        (WebKit::WebIDBIndexImpl::openKeyCursor):
     28        (WebKit::WebIDBIndexImpl::getObject):
     29        (WebKit::WebIDBIndexImpl::getKey):
     30        * src/WebIDBIndexImpl.h:
     31
    1322010-10-04  Andrei Popescu  <andreip@google.com>
    233

  • trunk/WebKit/chromium/public/WebIDBIndex.h

    r68795 r69123  
    6262    }
    6363
     64    // FIXME: openObjectCursor -> openCursor and getObject -> get.
    6465    virtual void openObjectCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*, const WebIDBTransaction&) { WEBKIT_ASSERT_NOT_REACHED(); }
    65     virtual void openCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*, const WebIDBTransaction&) { WEBKIT_ASSERT_NOT_REACHED(); }
     66    virtual void openCursor(const WebIDBKeyRange& range, unsigned short direction, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
     67    {
     68        openKeyCursor(range, direction, callbacks, transaction);
     69    }
     70    virtual void openKeyCursor(const WebIDBKeyRange& range, unsigned short direction, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
     71    {
     72        openCursor(range, direction, callbacks, transaction);
     73    }
    6674    virtual void getObject(const WebIDBKey&, WebIDBCallbacks*, const WebIDBTransaction&) { WEBKIT_ASSERT_NOT_REACHED(); }
    67     virtual void get(const WebIDBKey&, WebIDBCallbacks*, const WebIDBTransaction&) { WEBKIT_ASSERT_NOT_REACHED(); }
     75    virtual void get(const WebIDBKey& range, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
     76    {
     77        getKey(range, callbacks, transaction);
     78    }
     79    virtual void getKey(const WebIDBKey& range, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
     80    {
     81        get(range, callbacks, transaction);
     82    }
    6883};
    6984

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

    r68795 r69123  
    7474}
    7575
    76 void IDBIndexBackendProxy::openObjectCursor(PassRefPtr<IDBKeyRange> keyRange, unsigned short direction, PassRefPtr<IDBCallbacks> callbacks, IDBTransactionBackendInterface* transaction)
     76void IDBIndexBackendProxy::openCursor(PassRefPtr<IDBKeyRange> keyRange, unsigned short direction, PassRefPtr<IDBCallbacks> callbacks, IDBTransactionBackendInterface* transaction)
    7777{
    7878    // The transaction pointer is guaranteed to be a pointer to a proxy object as, in the renderer,
    … …  
    8282}
    8383
    84 void IDBIndexBackendProxy::openCursor(PassRefPtr<IDBKeyRange> keyRange, unsigned short direction, PassRefPtr<IDBCallbacks> callbacks, IDBTransactionBackendInterface* transaction)
     84void IDBIndexBackendProxy::openKeyCursor(PassRefPtr<IDBKeyRange> keyRange, unsigned short direction, PassRefPtr<IDBCallbacks> callbacks, IDBTransactionBackendInterface* transaction)
    8585{
    8686    // The transaction pointer is guaranteed to be a pointer to a proxy object as, in the renderer,
    8787    // all implementations of IDB interfaces are proxy objects.
    8888    IDBTransactionBackendProxy* transactionProxy = static_cast<IDBTransactionBackendProxy*>(transaction);
    89     m_webIDBIndex->openCursor(keyRange, direction, new WebIDBCallbacksImpl(callbacks), *transactionProxy->getWebIDBTransaction());
     89    m_webIDBIndex->openKeyCursor(keyRange, direction, new WebIDBCallbacksImpl(callbacks), *transactionProxy->getWebIDBTransaction());
    9090}
    9191
    92 void IDBIndexBackendProxy::getObject(PassRefPtr<IDBKey> key, PassRefPtr<IDBCallbacks> callbacks, IDBTransactionBackendInterface* transaction)
     92void IDBIndexBackendProxy::get(PassRefPtr<IDBKey> key, PassRefPtr<IDBCallbacks> callbacks, IDBTransactionBackendInterface* transaction)
    9393{
    9494    // The transaction pointer is guaranteed to be a pointer to a proxy object as, in the renderer,
    … …  
    9898}
    9999
    100 void IDBIndexBackendProxy::get(PassRefPtr<IDBKey> key, PassRefPtr<IDBCallbacks> callbacks, IDBTransactionBackendInterface* transaction)
     100void IDBIndexBackendProxy::getKey(PassRefPtr<IDBKey> key, PassRefPtr<IDBCallbacks> callbacks, IDBTransactionBackendInterface* transaction)
    101101{
    102102    // The transaction pointer is guaranteed to be a pointer to a proxy object as, in the renderer,
    103103    // all implementations of IDB interfaces are proxy objects.
    104104    IDBTransactionBackendProxy* transactionProxy = static_cast<IDBTransactionBackendProxy*>(transaction);
    105     m_webIDBIndex->get(key, new WebIDBCallbacksImpl(callbacks), *transactionProxy->getWebIDBTransaction());
     105    m_webIDBIndex->getKey(key, new WebIDBCallbacksImpl(callbacks), *transactionProxy->getWebIDBTransaction());
    106106}
    107107

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

    r68795 r69123  
    4747    virtual bool unique();
    4848
    49     virtual void openObjectCursor(PassRefPtr<IDBKeyRange>, unsigned short direction, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*);
    5049    virtual void openCursor(PassRefPtr<IDBKeyRange>, unsigned short direction, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*);
    51     virtual void getObject(PassRefPtr<IDBKey>, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*);
     50    virtual void openKeyCursor(PassRefPtr<IDBKeyRange>, unsigned short direction, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*);
    5251    virtual void get(PassRefPtr<IDBKey>, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*);
     52    virtual void getKey(PassRefPtr<IDBKey>, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*);
    5353
    5454private:

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

    r68795 r69123  
    6969}
    7070
    71 void WebIDBIndexImpl::openCursor(const WebIDBKeyRange& keyRange, unsigned short direction, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
     71void WebIDBIndexImpl::openObjectCursor(const WebIDBKeyRange& keyRange, unsigned short direction, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
    7272{
    7373    m_backend->openCursor(keyRange, direction, IDBCallbacksProxy::create(callbacks), transaction.getIDBTransactionBackendInterface());
    7474}
    7575
    76 void WebIDBIndexImpl::openObjectCursor(const WebIDBKeyRange& keyRange, unsigned short direction, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
     76void WebIDBIndexImpl::openKeyCursor(const WebIDBKeyRange& keyRange, unsigned short direction, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
    7777{
    78     m_backend->openObjectCursor(keyRange, direction, IDBCallbacksProxy::create(callbacks), transaction.getIDBTransactionBackendInterface());
     78    m_backend->openKeyCursor(keyRange, direction, IDBCallbacksProxy::create(callbacks), transaction.getIDBTransactionBackendInterface());
    7979}
    8080
    8181void WebIDBIndexImpl::getObject(const WebIDBKey& keyRange, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
    8282{
    83     m_backend->getObject(keyRange, IDBCallbacksProxy::create(callbacks), transaction.getIDBTransactionBackendInterface());
     83    m_backend->get(keyRange, IDBCallbacksProxy::create(callbacks), transaction.getIDBTransactionBackendInterface());
    8484}
    8585
    86 void WebIDBIndexImpl::get(const WebIDBKey& keyRange, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
     86void WebIDBIndexImpl::getKey(const WebIDBKey& keyRange, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction)
    8787{
    88     m_backend->get(keyRange, IDBCallbacksProxy::create(callbacks), transaction.getIDBTransactionBackendInterface());
     88    m_backend->getKey(keyRange, IDBCallbacksProxy::create(callbacks), transaction.getIDBTransactionBackendInterface());
    8989}
    9090

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

    r68795 r69123  
    4848
    4949    virtual void openObjectCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*, const WebIDBTransaction&);
    50     virtual void openCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*, const WebIDBTransaction&);
     50    virtual void openKeyCursor(const WebIDBKeyRange&, unsigned short direction, WebIDBCallbacks*, const WebIDBTransaction&);
    5151    virtual void getObject(const WebIDBKey&, WebIDBCallbacks*, const WebIDBTransaction&);
    52     virtual void get(const WebIDBKey&, WebIDBCallbacks*, const WebIDBTransaction&);
     52    virtual void getKey(const WebIDBKey&, WebIDBCallbacks*, const WebIDBTransaction&);
    5353
    5454private:
Note: See TracChangeset for help on using the changeset viewer.