Changeset 64055 in webkit


Ignore:
Timestamp:
Jul 26, 2010 11:15:05 AM (14 years ago)
Author:
bulach@chromium.org
Message:

2010-07-26 Marcus Bulach <bulach@chromium.org>

Reviewed by Jeremy Orlow.

Moves IDBKeyRange to use IDBKey rather than SerializedScriptValue / IDBAny.
https://bugs.webkit.org/show_bug.cgi?id=42583

Tests: existing storage/indexeddb/idb-keyrange.html must pass.

  • storage/IDBKeyRange.cpp: (WebCore::IDBKeyRange::IDBKeyRange):
  • storage/IDBKeyRange.h: (WebCore::IDBKeyRange::create): (WebCore::IDBKeyRange::left): (WebCore::IDBKeyRange::right):
  • storage/IDBKeyRange.idl:
  • storage/IndexedDatabaseRequest.cpp: (WebCore::IndexedDatabaseRequest::makeSingleKeyRange): (WebCore::IndexedDatabaseRequest::makeLeftBoundKeyRange): (WebCore::IndexedDatabaseRequest::makeRightBoundKeyRange): (WebCore::IndexedDatabaseRequest::makeBoundKeyRange):
  • storage/IndexedDatabaseRequest.h:
  • storage/IndexedDatabaseRequest.idl:
Location:
trunk/WebCore
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r64054 r64055  
     12010-07-26  Marcus Bulach  <bulach@chromium.org>
     2
     3        Reviewed by Jeremy Orlow.
     4
     5        Moves IDBKeyRange to use IDBKey rather than SerializedScriptValue / IDBAny.
     6        https://bugs.webkit.org/show_bug.cgi?id=42583
     7
     8        Tests: existing storage/indexeddb/idb-keyrange.html must pass.
     9
     10        * storage/IDBKeyRange.cpp:
     11        (WebCore::IDBKeyRange::IDBKeyRange):
     12        * storage/IDBKeyRange.h:
     13        (WebCore::IDBKeyRange::create):
     14        (WebCore::IDBKeyRange::left):
     15        (WebCore::IDBKeyRange::right):
     16        * storage/IDBKeyRange.idl:
     17        * storage/IndexedDatabaseRequest.cpp:
     18        (WebCore::IndexedDatabaseRequest::makeSingleKeyRange):
     19        (WebCore::IndexedDatabaseRequest::makeLeftBoundKeyRange):
     20        (WebCore::IndexedDatabaseRequest::makeRightBoundKeyRange):
     21        (WebCore::IndexedDatabaseRequest::makeBoundKeyRange):
     22        * storage/IndexedDatabaseRequest.h:
     23        * storage/IndexedDatabaseRequest.idl:
     24
    1252010-07-26  Simon Fraser  <simon.fraser@apple.com>
    226
  • trunk/WebCore/storage/IDBKeyRange.cpp

    r63211 r64055  
    2727#include "IDBKeyRange.h"
    2828
    29 #include "IDBAny.h"
    30 #include "SerializedScriptValue.h"
     29#include "IDBKey.h"
    3130
    3231#if ENABLE(INDEXED_DATABASE)
     
    3433namespace WebCore {
    3534
    36 IDBKeyRange::IDBKeyRange(PassRefPtr<SerializedScriptValue> left, PassRefPtr<SerializedScriptValue> right, unsigned short flags)
     35IDBKeyRange::IDBKeyRange(PassRefPtr<IDBKey> left, PassRefPtr<IDBKey> right, unsigned short flags)
    3736    : m_left(left)
    3837    , m_right(right)
  • trunk/WebCore/storage/IDBKeyRange.h

    r63211 r64055  
    2929#if ENABLE(INDEXED_DATABASE)
    3030
    31 #include "IDBAny.h"
    32 #include "SerializedScriptValue.h"
     31#include "IDBKey.h"
    3332#include <wtf/PassRefPtr.h>
    3433#include <wtf/RefCounted.h>
     
    4746    };
    4847
    49     static PassRefPtr<IDBKeyRange> create(PassRefPtr<SerializedScriptValue> left, PassRefPtr<SerializedScriptValue> right, unsigned short flags)
     48    static PassRefPtr<IDBKeyRange> create(PassRefPtr<IDBKey> left, PassRefPtr<IDBKey> right, unsigned short flags)
    5049    {
    5150        return adoptRef(new IDBKeyRange(left, right, flags));
     
    5453
    5554
    56     PassRefPtr<IDBAny> left() const { return IDBAny::create(m_left.get()); }
    57     PassRefPtr<IDBAny> right() const { return IDBAny::create(m_right.get()); }
     55    PassRefPtr<IDBKey> left() const { return m_left; }
     56    PassRefPtr<IDBKey> right() const { return m_right; }
    5857    unsigned short flags() const { return m_flags; }
    5958
    6059private:
    61     IDBKeyRange(PassRefPtr<SerializedScriptValue> left, PassRefPtr<SerializedScriptValue> right, unsigned short flags);
     60    IDBKeyRange(PassRefPtr<IDBKey> left, PassRefPtr<IDBKey> right, unsigned short flags);
    6261
    63     RefPtr<SerializedScriptValue> m_left;
    64     RefPtr<SerializedScriptValue> m_right;
     62    RefPtr<IDBKey> m_left;
     63    RefPtr<IDBKey> m_right;
    6564    unsigned short m_flags;
    6665};
  • trunk/WebCore/storage/IDBKeyRange.idl

    r61120 r64055  
    3636        const unsigned short RIGHT_BOUND = 8;
    3737
    38         readonly attribute IDBAny left;
    39         readonly attribute IDBAny right;
     38        readonly attribute IDBKey left;
     39        readonly attribute IDBKey right;
    4040        readonly attribute unsigned short flags;
    4141    };
  • trunk/WebCore/storage/IndexedDatabaseRequest.cpp

    r63211 r64055  
    6969}
    7070
    71 PassRefPtr<IDBKeyRange> IndexedDatabaseRequest::makeSingleKeyRange(PassRefPtr<SerializedScriptValue> prpValue)
     71PassRefPtr<IDBKeyRange> IndexedDatabaseRequest::makeSingleKeyRange(PassRefPtr<IDBKey> prpValue)
    7272{
    73     RefPtr<SerializedScriptValue> value = prpValue;
     73    RefPtr<IDBKey> value = prpValue;
    7474    return IDBKeyRange::create(value, value, IDBKeyRange::SINGLE);
    7575}
    7676
    77 PassRefPtr<IDBKeyRange> IndexedDatabaseRequest::makeLeftBoundKeyRange(PassRefPtr<SerializedScriptValue> bound, bool open)
     77PassRefPtr<IDBKeyRange> IndexedDatabaseRequest::makeLeftBoundKeyRange(PassRefPtr<IDBKey> bound, bool open)
    7878{
    79     return IDBKeyRange::create(bound, SerializedScriptValue::create(), open ? IDBKeyRange::LEFT_OPEN : IDBKeyRange::LEFT_BOUND);
     79    return IDBKeyRange::create(bound, IDBKey::create(), open ? IDBKeyRange::LEFT_OPEN : IDBKeyRange::LEFT_BOUND);
    8080}
    8181
    82 PassRefPtr<IDBKeyRange> IndexedDatabaseRequest::makeRightBoundKeyRange(PassRefPtr<SerializedScriptValue> bound, bool open)
     82PassRefPtr<IDBKeyRange> IndexedDatabaseRequest::makeRightBoundKeyRange(PassRefPtr<IDBKey> bound, bool open)
    8383{
    84     return IDBKeyRange::create(SerializedScriptValue::create(), bound, open ? IDBKeyRange::RIGHT_OPEN : IDBKeyRange::RIGHT_BOUND);
     84    return IDBKeyRange::create(IDBKey::create(), bound, open ? IDBKeyRange::RIGHT_OPEN : IDBKeyRange::RIGHT_BOUND);
    8585}
    8686
    87 PassRefPtr<IDBKeyRange> IndexedDatabaseRequest::makeBoundKeyRange(PassRefPtr<SerializedScriptValue> left, PassRefPtr<SerializedScriptValue> right, bool openLeft, bool openRight)
     87PassRefPtr<IDBKeyRange> IndexedDatabaseRequest::makeBoundKeyRange(PassRefPtr<IDBKey> left, PassRefPtr<IDBKey> right, bool openLeft, bool openRight)
    8888{
    8989    unsigned short flags = openLeft ? IDBKeyRange::LEFT_OPEN : IDBKeyRange::LEFT_BOUND;
  • trunk/WebCore/storage/IndexedDatabaseRequest.h

    r63211 r64055  
    4040namespace WebCore {
    4141
    42 class IDBAny;
     42class IDBKey;
    4343class IDBKeyRange;
    4444class IDBRequest;
    4545class IndexedDatabase;
    4646class ScriptExecutionContext;
    47 class SerializedScriptValue;
    4847
    4948class IndexedDatabaseRequest : public RefCounted<IndexedDatabaseRequest> {
     
    5655
    5756    PassRefPtr<IDBRequest> open(ScriptExecutionContext*, const String& name, const String& description);
    58     PassRefPtr<IDBKeyRange> makeSingleKeyRange(PassRefPtr<SerializedScriptValue> value);
    59     PassRefPtr<IDBKeyRange> makeLeftBoundKeyRange(PassRefPtr<SerializedScriptValue> bound, bool open = false);
    60     PassRefPtr<IDBKeyRange> makeRightBoundKeyRange(PassRefPtr<SerializedScriptValue> bound, bool open = false);
    61     PassRefPtr<IDBKeyRange> makeBoundKeyRange(PassRefPtr<SerializedScriptValue> left, PassRefPtr<SerializedScriptValue> right, bool openLeft = false, bool openRight = false);
     57    PassRefPtr<IDBKeyRange> makeSingleKeyRange(PassRefPtr<IDBKey> value);
     58    PassRefPtr<IDBKeyRange> makeLeftBoundKeyRange(PassRefPtr<IDBKey> bound, bool open = false);
     59    PassRefPtr<IDBKeyRange> makeRightBoundKeyRange(PassRefPtr<IDBKey> bound, bool open = false);
     60    PassRefPtr<IDBKeyRange> makeBoundKeyRange(PassRefPtr<IDBKey> left, PassRefPtr<IDBKey> right, bool openLeft = false, bool openRight = false);
    6261
    6362private:
  • trunk/WebCore/storage/IndexedDatabaseRequest.idl

    r61120 r64055  
    3030    ] IndexedDatabaseRequest {
    3131        [CallWith=ScriptExecutionContext] IDBRequest open(in DOMString name, in DOMString description);
    32         IDBKeyRange makeSingleKeyRange(in SerializedScriptValue value);
    33         IDBKeyRange makeLeftBoundKeyRange(in SerializedScriptValue bound, in [Optional] boolean open);
    34         IDBKeyRange makeRightBoundKeyRange(in SerializedScriptValue bound, in [Optional] boolean open);
    35         IDBKeyRange makeBoundKeyRange(in SerializedScriptValue left, in SerializedScriptValue right, in [Optional] boolean openLeft, in [Optional] boolean openRight);
     32        IDBKeyRange makeSingleKeyRange(in IDBKey value);
     33        IDBKeyRange makeLeftBoundKeyRange(in IDBKey bound, in [Optional] boolean open);
     34        IDBKeyRange makeRightBoundKeyRange(in IDBKey bound, in [Optional] boolean open);
     35        IDBKeyRange makeBoundKeyRange(in IDBKey left, in IDBKey right, in [Optional] boolean openLeft, in [Optional] boolean openRight);
    3636    };
    3737
Note: See TracChangeset for help on using the changeset viewer.