Changeset 80076 in webkit


Ignore:
Timestamp:
Mar 1, 2011 6:02:28 PM (13 years ago)
Author:
jorlow@chromium.org
Message:

2011-03-01 Jeremy Orlow <​jorlow@chromium.org>

Reviewed by James Robinson.

IDBKeyRange.bound() should not use the optional options object
​https://bugs.webkit.org/show_bug.cgi?id=55419

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

2011-03-01 Jeremy Orlow <​jorlow@chromium.org>

Reviewed by James Robinson.

IDBKeyRange.bound() should not use the optional options object
​https://bugs.webkit.org/show_bug.cgi?id=55419

​http://dvcs.w3.org/hg/IndexedDB/raw-file/tip/Overview.html#range-concept

Added some code to existing tests to cover these cases.

  • storage/IDBKeyRange.cpp: (WebCore::IDBKeyRange::bound):
  • storage/IDBKeyRange.h:
  • storage/IDBKeyRange.idl:
Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r80071 r80076  
     12011-03-01  Jeremy Orlow  <jorlow@chromium.org>
     2
     3        Reviewed by James Robinson.
     4
     5        IDBKeyRange.bound() should not use the optional options object
     6        https://bugs.webkit.org/show_bug.cgi?id=55419
     7
     8        * storage/indexeddb/index-cursor.html:
     9        * storage/indexeddb/keyrange-expected.txt:
     10        * storage/indexeddb/keyrange.html:
     11        * storage/indexeddb/objectstore-cursor.html:
     12
    1132011-03-01  Tony Gentilcore  <tonyg@chromium.org>
    214

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

    r79458 r80076  
    171171    var keyRange;
    172172    if (lower !== null && upper !== null)
    173         keyRange = webkitIDBKeyRange.bound(testData[lower], testData[upper], {lowerOpen: lowerIsOpen, upperOpen: upperIsOpen});
     173        keyRange = webkitIDBKeyRange.bound(testData[lower], testData[upper], lowerIsOpen, upperIsOpen);
    174174    else if (lower !== null)
    175175        keyRange = webkitIDBKeyRange.lowerBound(testData[lower], lowerIsOpen);

  • trunk/LayoutTests/storage/indexeddb/keyrange-expected.txt

    r73697 r80076  
    128128PASS keyRange.lower is null
    129129PASS keyRange.lowerOpen is false
    130 webkitIDBKeyRange.bound(30,40, {lowerOpen: undefined, upperOpen:undefined})
     130webkitIDBKeyRange.bound(30,40, undefined, undefined)
    131131PASS keyRange.lower is 30
    132132PASS keyRange.upper is 40
    133133PASS keyRange.lowerOpen is false
    134134PASS keyRange.upperOpen is false
    135 webkitIDBKeyRange.bound(31,41, {lowerOpen: false, upperOpen:false})
     135webkitIDBKeyRange.bound(31,41, false, false)
    136136PASS keyRange.lower is 31
    137137PASS keyRange.upper is 41
    138138PASS keyRange.lowerOpen is false
    139139PASS keyRange.upperOpen is false
    140 webkitIDBKeyRange.bound(32,42, {lowerOpen: false, upperOpen:true})
     140webkitIDBKeyRange.bound(32,42, false, true)
    141141PASS keyRange.lower is 32
    142142PASS keyRange.upper is 42
    143143PASS keyRange.lowerOpen is false
    144144PASS keyRange.upperOpen is true
    145 webkitIDBKeyRange.bound(33,43, {lowerOpen: true, upperOpen:false})
     145webkitIDBKeyRange.bound(33,43, true, false)
    146146PASS keyRange.lower is 33
    147147PASS keyRange.upper is 43
    148148PASS keyRange.lowerOpen is true
    149149PASS keyRange.upperOpen is false
    150 webkitIDBKeyRange.bound(34,44, {lowerOpen: true, upperOpen:true})
     150webkitIDBKeyRange.bound(34,44, true, true)
    151151PASS keyRange.lower is 34
    152152PASS keyRange.upper is 44
    153153PASS keyRange.lowerOpen is true
    154154PASS keyRange.upperOpen is true
    155 webkitIDBKeyRange.bound(30.1,40.2, {lowerOpen: undefined, upperOpen:undefined})
     155webkitIDBKeyRange.bound(30.1,40.2, undefined, undefined)
    156156PASS keyRange.lower is 30.1
    157157PASS keyRange.upper is 40.2
    158158PASS keyRange.lowerOpen is false
    159159PASS keyRange.upperOpen is false
    160 webkitIDBKeyRange.bound(31.3,41.4, {lowerOpen: false, upperOpen:false})
     160webkitIDBKeyRange.bound(31.3,41.4, false, false)
    161161PASS keyRange.lower is 31.3
    162162PASS keyRange.upper is 41.4
    163163PASS keyRange.lowerOpen is false
    164164PASS keyRange.upperOpen is false
    165 webkitIDBKeyRange.bound(32.5,42.6, {lowerOpen: false, upperOpen:true})
     165webkitIDBKeyRange.bound(32.5,42.6, false, true)
    166166PASS keyRange.lower is 32.5
    167167PASS keyRange.upper is 42.6
    168168PASS keyRange.lowerOpen is false
    169169PASS keyRange.upperOpen is true
    170 webkitIDBKeyRange.bound(33.7,43.8, {lowerOpen: true, upperOpen:false})
     170webkitIDBKeyRange.bound(33.7,43.8, true, false)
    171171PASS keyRange.lower is 33.7
    172172PASS keyRange.upper is 43.8
    173173PASS keyRange.lowerOpen is true
    174174PASS keyRange.upperOpen is false
    175 webkitIDBKeyRange.bound(34.9,44, {lowerOpen: true, upperOpen:true})
     175webkitIDBKeyRange.bound(34.9,44, true, true)
    176176PASS keyRange.lower is 34.9
    177177PASS keyRange.upper is 44
    178178PASS keyRange.lowerOpen is true
    179179PASS keyRange.upperOpen is true
    180 webkitIDBKeyRange.bound('aaa','aba', {lowerOpen: false, upperOpen:false})
     180webkitIDBKeyRange.bound('aaa','aba', false, false)
    181181PASS keyRange.lower is 'aaa'
    182182PASS keyRange.upper is 'aba'
    183183PASS keyRange.lowerOpen is false
    184184PASS keyRange.upperOpen is false
    185 webkitIDBKeyRange.bound('aab','abb', {lowerOpen: undefined, upperOpen:undefined})
     185webkitIDBKeyRange.bound('aab','abb', undefined, undefined)
    186186PASS keyRange.lower is 'aab'
    187187PASS keyRange.upper is 'abb'
    188188PASS keyRange.lowerOpen is false
    189189PASS keyRange.upperOpen is false
    190 webkitIDBKeyRange.bound('aac','abc', {lowerOpen: false, upperOpen:false})
     190webkitIDBKeyRange.bound('aac','abc', false, false)
    191191PASS keyRange.lower is 'aac'
    192192PASS keyRange.upper is 'abc'
    193193PASS keyRange.lowerOpen is false
    194194PASS keyRange.upperOpen is false
    195 webkitIDBKeyRange.bound('aad','abd', {lowerOpen: false, upperOpen:true})
     195webkitIDBKeyRange.bound('aad','abd', false, true)
    196196PASS keyRange.lower is 'aad'
    197197PASS keyRange.upper is 'abd'
    198198PASS keyRange.lowerOpen is false
    199199PASS keyRange.upperOpen is true
    200 webkitIDBKeyRange.bound('aae','abe', {lowerOpen: true, upperOpen:false})
     200webkitIDBKeyRange.bound('aae','abe', true, false)
    201201PASS keyRange.lower is 'aae'
    202202PASS keyRange.upper is 'abe'
    203203PASS keyRange.lowerOpen is true
    204204PASS keyRange.upperOpen is false
    205 webkitIDBKeyRange.bound('aaf','abf', {lowerOpen: true, upperOpen:true})
     205webkitIDBKeyRange.bound('aaf','abf', true, true)
    206206PASS keyRange.lower is 'aaf'
    207207PASS keyRange.upper is 'abf'

  • trunk/LayoutTests/storage/indexeddb/keyrange.html

    r73697 r80076  
    4848function checkBoundKeyRange(lower, upper, lowerOpen, upperOpen)
    4949{
    50     keyRange = evalAndLog("webkitIDBKeyRange.bound(" + lower + "," + upper + ", {lowerOpen: " + lowerOpen + ", upperOpen:" + upperOpen + "})");
     50    keyRange = evalAndLog("webkitIDBKeyRange.bound(" + lower + "," + upper + ", " + lowerOpen + ", " + upperOpen + ")");
    5151    shouldBe("keyRange.lower", "" + lower);
    5252    shouldBe("keyRange.upper", "" + upper);

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

    r79458 r80076  
    149149    var keyRange;
    150150    if (lower !== null && upper !== null)
    151         keyRange = webkitIDBKeyRange.bound(testData[lower], testData[upper], {lowerOpen: lowerIsOpen, upperOpen: upperIsOpen});
     151        keyRange = webkitIDBKeyRange.bound(testData[lower], testData[upper], lowerIsOpen, upperIsOpen);
    152152    else if (lower !== null)
    153153        keyRange = webkitIDBKeyRange.lowerBound(testData[lower], lowerIsOpen);

  • trunk/Source/WebCore/ChangeLog

    r80075 r80076  
     12011-03-01  Jeremy Orlow  <jorlow@chromium.org>
     2
     3        Reviewed by James Robinson.
     4
     5        IDBKeyRange.bound() should not use the optional options object
     6        https://bugs.webkit.org/show_bug.cgi?id=55419
     7
     8        http://dvcs.w3.org/hg/IndexedDB/raw-file/tip/Overview.html#range-concept
     9
     10        Added some code to existing tests to cover these cases.
     11
     12        * storage/IDBKeyRange.cpp:
     13        (WebCore::IDBKeyRange::bound):
     14        * storage/IDBKeyRange.h:
     15        * storage/IDBKeyRange.idl:
     16
    1172011-03-01  Dan Bernstein  <mitz@apple.com>
    218

  • trunk/Source/WebCore/storage/IDBKeyRange.cpp

    r72767 r80076  
    5757}
    5858
    59 PassRefPtr<IDBKeyRange> IDBKeyRange::bound(PassRefPtr<IDBKey> lower, PassRefPtr<IDBKey> upper, const OptionsObject& options)
     59PassRefPtr<IDBKeyRange> IDBKeyRange::bound(PassRefPtr<IDBKey> lower, PassRefPtr<IDBKey> upper, bool lowerOpen, bool upperOpen)
    6060{
    61     bool lowerOpen = false;
    62     bool upperOpen = false;
    63     options.getKeyBool("lowerOpen", lowerOpen);
    64     options.getKeyBool("upperOpen", upperOpen);
    6561    return IDBKeyRange::create(lower, upper, lowerOpen, upperOpen);
    6662}

  • trunk/Source/WebCore/storage/IDBKeyRange.h

    r72767 r80076  
    5656    static PassRefPtr<IDBKeyRange> lowerBound(PassRefPtr<IDBKey> bound, bool open = false);
    5757    static PassRefPtr<IDBKeyRange> upperBound(PassRefPtr<IDBKey> bound, bool open = false);
    58     static PassRefPtr<IDBKeyRange> bound(PassRefPtr<IDBKey> lower, PassRefPtr<IDBKey> upper, const OptionsObject& = OptionsObject());
     58    static PassRefPtr<IDBKeyRange> bound(PassRefPtr<IDBKey> lower, PassRefPtr<IDBKey> upper, bool lowerOpen = false, bool upperOpen = false);
    5959
    6060private:

  • trunk/Source/WebCore/storage/IDBKeyRange.idl

    r72767 r80076  
    3838        [ClassMethod] IDBKeyRange lowerBound(in IDBKey bound, in [Optional] boolean open);
    3939        [ClassMethod] IDBKeyRange upperBound(in IDBKey bound, in [Optional] boolean open);
    40         [ClassMethod] IDBKeyRange bound(in IDBKey lower, in IDBKey upper, in [Optional] OptionsObject options);
     40        [ClassMethod] IDBKeyRange bound(in IDBKey lower, in IDBKey upper, in [Optional] boolean lowerOpen, in [Optional] boolean upperOpen);
    4141    };
    4242
Note: See TracChangeset for help on using the changeset viewer.