Changeset 208359 in webkit


Ignore:
Timestamp:
Nov 3, 2016 6:08:55 PM (7 years ago)
Author:
beidson@apple.com
Message:

IndexedDB 2.0: Rename IDBKeyRange.contains to IDBKeyRange.includes.
​https://bugs.webkit.org/show_bug.cgi?id=164383

Reviewed by Beth Dakin.

LayoutTests/imported/w3c:

  • web-platform-tests/IndexedDB/idbkeyrange-includes-expected.txt:

Source/WebCore:

No new tests (Updated existing tests).

  • Modules/indexeddb/IDBKeyRange.cpp:

(WebCore::IDBKeyRange::includes):
(WebCore::IDBKeyRange::contains): Deleted.

  • Modules/indexeddb/IDBKeyRange.h:
  • Modules/indexeddb/IDBKeyRange.idl:

LayoutTests:

  • storage/indexeddb/resources/keyrange.js:
Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r208358 r208359  
     12016-11-03  Brady Eidson  <beidson@apple.com>
     2
     3        IndexedDB 2.0: Rename IDBKeyRange.contains to IDBKeyRange.includes.
     4        https://bugs.webkit.org/show_bug.cgi?id=164383
     5
     6        Reviewed by Beth Dakin.
     7
     8        * storage/indexeddb/resources/keyrange.js:
     9
    1102016-11-03  Ryan Haddad  <ryanhaddad@apple.com>
    211

  • trunk/LayoutTests/imported/w3c/ChangeLog

    r208349 r208359  
     12016-11-03  Brady Eidson  <beidson@apple.com>
     2
     3        IndexedDB 2.0: Rename IDBKeyRange.contains to IDBKeyRange.includes.
     4        https://bugs.webkit.org/show_bug.cgi?id=164383
     5
     6        Reviewed by Beth Dakin.
     7
     8        * web-platform-tests/IndexedDB/idbkeyrange-includes-expected.txt:
     9
    1102016-11-03  Brady Eidson  <beidson@apple.com>
    211

  • trunk/LayoutTests/imported/w3c/web-platform-tests/IndexedDB/idbkeyrange-includes-expected.txt

    r206999 r208359  
    11
    2 FAIL IDBKeyRange.includes() with a closed range assert_true: IDBKeyRange has a .includes expected true got false
    3 FAIL IDBKeyRange.includes() with an open range openRange.includes is not a function. (In 'openRange.includes(5)', 'openRange.includes' is undefined)
    4 FAIL IDBKeyRange.includes() with an only range range.includes is not a function. (In 'range.includes(42)', 'range.includes' is undefined)
    5 FAIL IDBKeyRange.includes() with an closed lower-bounded range range.includes is not a function. (In 'range.includes(4)', 'range.includes' is undefined)
    6 FAIL IDBKeyRange.includes() with an open lower-bounded range range.includes is not a function. (In 'range.includes(4)', 'range.includes' is undefined)
    7 FAIL IDBKeyRange.includes() with an closed upper-bounded range range.includes is not a function. (In 'range.includes(4)', 'range.includes' is undefined)
    8 FAIL IDBKeyRange.includes() with an open upper-bounded range range.includes is not a function. (In 'range.includes(4)', 'range.includes' is undefined)
     2PASS IDBKeyRange.includes() with a closed range
     3PASS IDBKeyRange.includes() with an open range
     4PASS IDBKeyRange.includes() with an only range
     5PASS IDBKeyRange.includes() with an closed lower-bounded range
     6PASS IDBKeyRange.includes() with an open lower-bounded range
     7PASS IDBKeyRange.includes() with an closed upper-bounded range
     8PASS IDBKeyRange.includes() with an open upper-bounded range
    99

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

    r207788 r208359  
    1010PASS 'lowerOpen' in IDBKeyRange is false
    1111PASS 'upperOpen' in IDBKeyRange is false
    12 PASS 'contains' in IDBKeyRange is false
     12PASS 'includes' in IDBKeyRange is false
    1313PASS 'only' in IDBKeyRange is true
    1414PASS 'lowerBound' in IDBKeyRange is true
    … …  
    2121PASS 'lowerOpen' in instance is true
    2222PASS 'upperOpen' in instance is true
    23 PASS 'contains' in instance is true
     23PASS 'includes' in instance is true
    2424PASS 'only' in instance is false
    2525PASS 'lowerBound' in instance is false
    … …  
    3232PASS keyRange.lowerOpen is false
    3333PASS keyRange.upperOpen is false
    34 PASS keyRange.contains(1.1) is false
    35 PASS keyRange.contains(0.9) is false
    36 PASS keyRange.contains(1) is true
     34PASS keyRange.includes(1.1) is false
     35PASS keyRange.includes(0.9) is false
     36PASS keyRange.includes(1) is true
    3737IDBKeyRange.only(3.14)
    3838PASS keyRange.lower is 3.14
    … …  
    4040PASS keyRange.lowerOpen is false
    4141PASS keyRange.upperOpen is false
    42 PASS keyRange.contains(3.24) is false
    43 PASS keyRange.contains(3.04) is false
    44 PASS keyRange.contains(3.14) is true
     42PASS keyRange.includes(3.24) is false
     43PASS keyRange.includes(3.04) is false
     44PASS keyRange.includes(3.14) is true
    4545IDBKeyRange.only('a')
    4646PASS keyRange.lower is 'a'
    … …  
    4848PASS keyRange.lowerOpen is false
    4949PASS keyRange.upperOpen is false
    50 PASS keyRange.contains('aa') is false
    51 PASS keyRange.contains('') is false
    52 PASS keyRange.contains('a') is true
     50PASS keyRange.includes('aa') is false
     51PASS keyRange.includes('') is false
     52PASS keyRange.includes('a') is true
    5353IDBKeyRange.lowerBound(10,true)
    5454PASS keyRange.lower is 10
    … …  
    5656PASS keyRange.upper is undefined.
    5757PASS keyRange.upperOpen is true
    58 PASS keyRange.contains(10) is false
    59 PASS keyRange.contains(10.1) is true
    60 PASS keyRange.contains(9.9) is false
     58PASS keyRange.includes(10) is false
     59PASS keyRange.includes(10.1) is true
     60PASS keyRange.includes(9.9) is false
    6161IDBKeyRange.lowerBound(11,false)
    6262PASS keyRange.lower is 11
    … …  
    6464PASS keyRange.upper is undefined.
    6565PASS keyRange.upperOpen is true
    66 PASS keyRange.contains(11) is true
    67 PASS keyRange.contains(11.1) is true
    68 PASS keyRange.contains(10.9) is false
     66PASS keyRange.includes(11) is true
     67PASS keyRange.includes(11.1) is true
     68PASS keyRange.includes(10.9) is false
    6969IDBKeyRange.lowerBound(12,undefined)
    7070PASS keyRange.lower is 12
    … …  
    7272PASS keyRange.upper is undefined.
    7373PASS keyRange.upperOpen is true
    74 PASS keyRange.contains(12) is true
    75 PASS keyRange.contains(12.1) is true
    76 PASS keyRange.contains(11.9) is false
     74PASS keyRange.includes(12) is true
     75PASS keyRange.includes(12.1) is true
     76PASS keyRange.includes(11.9) is false
    7777IDBKeyRange.lowerBound(10.1,true)
    7878PASS keyRange.lower is 10.1
    … …  
    8080PASS keyRange.upper is undefined.
    8181PASS keyRange.upperOpen is true
    82 PASS keyRange.contains(10.1) is false
    83 PASS keyRange.contains(10.2) is true
    84 PASS keyRange.contains(10) is false
     82PASS keyRange.includes(10.1) is false
     83PASS keyRange.includes(10.2) is true
     84PASS keyRange.includes(10) is false
    8585IDBKeyRange.lowerBound(11.2,false)
    8686PASS keyRange.lower is 11.2
    … …  
    8888PASS keyRange.upper is undefined.
    8989PASS keyRange.upperOpen is true
    90 PASS keyRange.contains(11.2) is true
    91 PASS keyRange.contains(11.299999999999999) is true
    92 PASS keyRange.contains(11.1) is false
     90PASS keyRange.includes(11.2) is true
     91PASS keyRange.includes(11.299999999999999) is true
     92PASS keyRange.includes(11.1) is false
    9393IDBKeyRange.lowerBound(12.3,undefined)
    9494PASS keyRange.lower is 12.3
    … …  
    9696PASS keyRange.upper is undefined.
    9797PASS keyRange.upperOpen is true
    98 PASS keyRange.contains(12.3) is true
    99 PASS keyRange.contains(12.4) is true
    100 PASS keyRange.contains(12.200000000000001) is false
     98PASS keyRange.includes(12.3) is true
     99PASS keyRange.includes(12.4) is true
     100PASS keyRange.includes(12.200000000000001) is false
    101101IDBKeyRange.lowerBound('aa',true)
    102102PASS keyRange.lower is 'aa'
    … …  
    104104PASS keyRange.upper is undefined.
    105105PASS keyRange.upperOpen is true
    106 PASS keyRange.contains('aa') is false
    107 PASS keyRange.contains('aaa') is true
    108 PASS keyRange.contains('a') is false
     106PASS keyRange.includes('aa') is false
     107PASS keyRange.includes('aaa') is true
     108PASS keyRange.includes('a') is false
    109109IDBKeyRange.lowerBound('ab',false)
    110110PASS keyRange.lower is 'ab'
    … …  
    112112PASS keyRange.upper is undefined.
    113113PASS keyRange.upperOpen is true
    114 PASS keyRange.contains('ab') is true
    115 PASS keyRange.contains('abb') is true
    116 PASS keyRange.contains('a') is false
     114PASS keyRange.includes('ab') is true
     115PASS keyRange.includes('abb') is true
     116PASS keyRange.includes('a') is false
    117117IDBKeyRange.lowerBound('ac',undefined)
    118118PASS keyRange.lower is 'ac'
    … …  
    120120PASS keyRange.upper is undefined.
    121121PASS keyRange.upperOpen is true
    122 PASS keyRange.contains('ac') is true
    123 PASS keyRange.contains('acc') is true
    124 PASS keyRange.contains('a') is false
     122PASS keyRange.includes('ac') is true
     123PASS keyRange.includes('acc') is true
     124PASS keyRange.includes('a') is false
    125125IDBKeyRange.upperBound(20,true)
    126126PASS keyRange.upper is 20
    … …  
    128128PASS keyRange.lower is undefined.
    129129PASS keyRange.lowerOpen is true
    130 PASS keyRange.contains(20) is false
    131 PASS keyRange.contains(20.1) is false
    132 PASS keyRange.contains(19.9) is true
     130PASS keyRange.includes(20) is false
     131PASS keyRange.includes(20.1) is false
     132PASS keyRange.includes(19.9) is true
    133133IDBKeyRange.upperBound(21,false)
    134134PASS keyRange.upper is 21
    … …  
    136136PASS keyRange.lower is undefined.
    137137PASS keyRange.lowerOpen is true
    138 PASS keyRange.contains(21) is true
    139 PASS keyRange.contains(21.1) is false
    140 PASS keyRange.contains(20.9) is true
     138PASS keyRange.includes(21) is true
     139PASS keyRange.includes(21.1) is false
     140PASS keyRange.includes(20.9) is true
    141141IDBKeyRange.upperBound(22,undefined)
    142142PASS keyRange.upper is 22
    … …  
    144144PASS keyRange.lower is undefined.
    145145PASS keyRange.lowerOpen is true
    146 PASS keyRange.contains(22) is true
    147 PASS keyRange.contains(22.1) is false
    148 PASS keyRange.contains(21.9) is true
     146PASS keyRange.includes(22) is true
     147PASS keyRange.includes(22.1) is false
     148PASS keyRange.includes(21.9) is true
    149149IDBKeyRange.upperBound(20.2,true)
    150150PASS keyRange.upper is 20.2
    … …  
    152152PASS keyRange.lower is undefined.
    153153PASS keyRange.lowerOpen is true
    154 PASS keyRange.contains(20.2) is false
    155 PASS keyRange.contains(20.3) is false
    156 PASS keyRange.contains(20.099999999999998) is true
     154PASS keyRange.includes(20.2) is false
     155PASS keyRange.includes(20.3) is false
     156PASS keyRange.includes(20.099999999999998) is true
    157157IDBKeyRange.upperBound(21.3,false)
    158158PASS keyRange.upper is 21.3
    … …  
    160160PASS keyRange.lower is undefined.
    161161PASS keyRange.lowerOpen is true
    162 PASS keyRange.contains(21.3) is true
    163 PASS keyRange.contains(21.400000000000002) is false
    164 PASS keyRange.contains(21.2) is true
     162PASS keyRange.includes(21.3) is true
     163PASS keyRange.includes(21.400000000000002) is false
     164PASS keyRange.includes(21.2) is true
    165165IDBKeyRange.upperBound(22.4,undefined)
    166166PASS keyRange.upper is 22.4
    … …  
    168168PASS keyRange.lower is undefined.
    169169PASS keyRange.lowerOpen is true
    170 PASS keyRange.contains(22.4) is true
    171 PASS keyRange.contains(22.5) is false
    172 PASS keyRange.contains(22.299999999999997) is true
     170PASS keyRange.includes(22.4) is true
     171PASS keyRange.includes(22.5) is false
     172PASS keyRange.includes(22.299999999999997) is true
    173173IDBKeyRange.upperBound('ba',true)
    174174PASS keyRange.upper is 'ba'
    … …  
    176176PASS keyRange.lower is undefined.
    177177PASS keyRange.lowerOpen is true
    178 PASS keyRange.contains('ba') is false
    179 PASS keyRange.contains('baa') is false
    180 PASS keyRange.contains('b') is true
     178PASS keyRange.includes('ba') is false
     179PASS keyRange.includes('baa') is false
     180PASS keyRange.includes('b') is true
    181181IDBKeyRange.upperBound('bb',false)
    182182PASS keyRange.upper is 'bb'
    … …  
    184184PASS keyRange.lower is undefined.
    185185PASS keyRange.lowerOpen is true
    186 PASS keyRange.contains('bb') is true
    187 PASS keyRange.contains('bbb') is false
    188 PASS keyRange.contains('b') is true
     186PASS keyRange.includes('bb') is true
     187PASS keyRange.includes('bbb') is false
     188PASS keyRange.includes('b') is true
    189189IDBKeyRange.upperBound('bc',undefined)
    190190PASS keyRange.upper is 'bc'
    … …  
    192192PASS keyRange.lower is undefined.
    193193PASS keyRange.lowerOpen is true
    194 PASS keyRange.contains('bc') is true
    195 PASS keyRange.contains('bcc') is false
    196 PASS keyRange.contains('b') is true
     194PASS keyRange.includes('bc') is true
     195PASS keyRange.includes('bcc') is false
     196PASS keyRange.includes('b') is true
    197197IDBKeyRange.bound(30,40, undefined, undefined)
    198198PASS keyRange.lower is 30
    … …  
    200200PASS keyRange.lowerOpen is false
    201201PASS keyRange.upperOpen is false
    202 PASS keyRange.contains(30) is true
    203 PASS keyRange.contains(40) is true
     202PASS keyRange.includes(30) is true
     203PASS keyRange.includes(40) is true
    204204IDBKeyRange.bound(31,41, false, false)
    205205PASS keyRange.lower is 31
    … …  
    207207PASS keyRange.lowerOpen is false
    208208PASS keyRange.upperOpen is false
    209 PASS keyRange.contains(31) is true
    210 PASS keyRange.contains(41) is true
     209PASS keyRange.includes(31) is true
     210PASS keyRange.includes(41) is true
    211211IDBKeyRange.bound(32,42, false, true)
    212212PASS keyRange.lower is 32
    … …  
    214214PASS keyRange.lowerOpen is false
    215215PASS keyRange.upperOpen is true
    216 PASS keyRange.contains(32) is true
    217 PASS keyRange.contains(42) is false
     216PASS keyRange.includes(32) is true
     217PASS keyRange.includes(42) is false
    218218IDBKeyRange.bound(33,43, true, false)
    219219PASS keyRange.lower is 33
    … …  
    221221PASS keyRange.lowerOpen is true
    222222PASS keyRange.upperOpen is false
    223 PASS keyRange.contains(33) is false
    224 PASS keyRange.contains(43) is true
     223PASS keyRange.includes(33) is false
     224PASS keyRange.includes(43) is true
    225225IDBKeyRange.bound(34,44, true, true)
    226226PASS keyRange.lower is 34
    … …  
    228228PASS keyRange.lowerOpen is true
    229229PASS keyRange.upperOpen is true
    230 PASS keyRange.contains(34) is false
    231 PASS keyRange.contains(44) is false
     230PASS keyRange.includes(34) is false
     231PASS keyRange.includes(44) is false
    232232IDBKeyRange.bound(30.1,40.2, undefined, undefined)
    233233PASS keyRange.lower is 30.1
    … …  
    235235PASS keyRange.lowerOpen is false
    236236PASS keyRange.upperOpen is false
    237 PASS keyRange.contains(30.1) is true
    238 PASS keyRange.contains(40.2) is true
     237PASS keyRange.includes(30.1) is true
     238PASS keyRange.includes(40.2) is true
    239239IDBKeyRange.bound(31.3,41.4, false, false)
    240240PASS keyRange.lower is 31.3
    … …  
    242242PASS keyRange.lowerOpen is false
    243243PASS keyRange.upperOpen is false
    244 PASS keyRange.contains(31.3) is true
    245 PASS keyRange.contains(41.4) is true
     244PASS keyRange.includes(31.3) is true
     245PASS keyRange.includes(41.4) is true
    246246IDBKeyRange.bound(32.5,42.6, false, true)
    247247PASS keyRange.lower is 32.5
    … …  
    249249PASS keyRange.lowerOpen is false
    250250PASS keyRange.upperOpen is true
    251 PASS keyRange.contains(32.5) is true
    252 PASS keyRange.contains(42.6) is false
     251PASS keyRange.includes(32.5) is true
     252PASS keyRange.includes(42.6) is false
    253253IDBKeyRange.bound(33.7,43.8, true, false)
    254254PASS keyRange.lower is 33.7
    … …  
    256256PASS keyRange.lowerOpen is true
    257257PASS keyRange.upperOpen is false
    258 PASS keyRange.contains(33.7) is false
    259 PASS keyRange.contains(43.8) is true
     258PASS keyRange.includes(33.7) is false
     259PASS keyRange.includes(43.8) is true
    260260IDBKeyRange.bound(34.9,44, true, true)
    261261PASS keyRange.lower is 34.9
    … …  
    263263PASS keyRange.lowerOpen is true
    264264PASS keyRange.upperOpen is true
    265 PASS keyRange.contains(34.9) is false
    266 PASS keyRange.contains(44) is false
     265PASS keyRange.includes(34.9) is false
     266PASS keyRange.includes(44) is false
    267267IDBKeyRange.bound('aaa','aba', false, false)
    268268PASS keyRange.lower is 'aaa'
    … …  
    270270PASS keyRange.lowerOpen is false
    271271PASS keyRange.upperOpen is false
    272 PASS keyRange.contains('aaa') is true
    273 PASS keyRange.contains('aba') is true
     272PASS keyRange.includes('aaa') is true
     273PASS keyRange.includes('aba') is true
    274274IDBKeyRange.bound('aab','abb', undefined, undefined)
    275275PASS keyRange.lower is 'aab'
    … …  
    277277PASS keyRange.lowerOpen is false
    278278PASS keyRange.upperOpen is false
    279 PASS keyRange.contains('aab') is true
    280 PASS keyRange.contains('abb') is true
     279PASS keyRange.includes('aab') is true
     280PASS keyRange.includes('abb') is true
    281281IDBKeyRange.bound('aac','abc', false, false)
    282282PASS keyRange.lower is 'aac'
    … …  
    284284PASS keyRange.lowerOpen is false
    285285PASS keyRange.upperOpen is false
    286 PASS keyRange.contains('aac') is true
    287 PASS keyRange.contains('abc') is true
     286PASS keyRange.includes('aac') is true
     287PASS keyRange.includes('abc') is true
    288288IDBKeyRange.bound('aad','abd', false, true)
    289289PASS keyRange.lower is 'aad'
    … …  
    291291PASS keyRange.lowerOpen is false
    292292PASS keyRange.upperOpen is true
    293 PASS keyRange.contains('aad') is true
    294 PASS keyRange.contains('abd') is false
     293PASS keyRange.includes('aad') is true
     294PASS keyRange.includes('abd') is false
    295295IDBKeyRange.bound('aae','abe', true, false)
    296296PASS keyRange.lower is 'aae'
    … …  
    298298PASS keyRange.lowerOpen is true
    299299PASS keyRange.upperOpen is false
    300 PASS keyRange.contains('aae') is false
    301 PASS keyRange.contains('abe') is true
     300PASS keyRange.includes('aae') is false
     301PASS keyRange.includes('abe') is true
    302302IDBKeyRange.bound('aaf','abf', true, true)
    303303PASS keyRange.lower is 'aaf'
    … …  
    305305PASS keyRange.lowerOpen is true
    306306PASS keyRange.upperOpen is true
    307 PASS keyRange.contains('aaf') is false
    308 PASS keyRange.contains('abf') is false
     307PASS keyRange.includes('aaf') is false
     308PASS keyRange.includes('abf') is false
    309309Passing an invalid key into only({})
    310310Expecting exception from IDBKeyRange.only({})
    … …  
    368368Exception message: The data provided does not meet requirements.
    369369Equal keys, none of the bounds is open, bound(4, 4, false, false)
    370 Passing an invalid key in to IDBKeyRange.contains({})
    371 Expecting exception from invalidKeyKeyRange.contains({})
    372 PASS Exception was thrown.
    373 PASS code is 0
    374 PASS ename is 'DataError'
    375 Exception message: Failed to execute 'contains' on 'IDBKeyRange': The passed-in value is not a valid IndexedDB key.
     370Passing an invalid key in to IDBKeyRange.includes({})
     371Expecting exception from invalidKeyKeyRange.includes({})
     372PASS Exception was thrown.
     373PASS code is 0
     374PASS ename is 'DataError'
     375Exception message: Failed to execute 'includes' on 'IDBKeyRange': The passed-in value is not a valid IndexedDB key.
    376376PASS successfullyParsed is true
    377377

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

    r207788 r208359  
    1010PASS 'lowerOpen' in IDBKeyRange is false
    1111PASS 'upperOpen' in IDBKeyRange is false
    12 PASS 'contains' in IDBKeyRange is false
     12PASS 'includes' in IDBKeyRange is false
    1313PASS 'only' in IDBKeyRange is true
    1414PASS 'lowerBound' in IDBKeyRange is true
    … …  
    2121PASS 'lowerOpen' in instance is true
    2222PASS 'upperOpen' in instance is true
    23 PASS 'contains' in instance is true
     23PASS 'includes' in instance is true
    2424PASS 'only' in instance is false
    2525PASS 'lowerBound' in instance is false
    … …  
    3232PASS keyRange.lowerOpen is false
    3333PASS keyRange.upperOpen is false
    34 PASS keyRange.contains(1.1) is false
    35 PASS keyRange.contains(0.9) is false
    36 PASS keyRange.contains(1) is true
     34PASS keyRange.includes(1.1) is false
     35PASS keyRange.includes(0.9) is false
     36PASS keyRange.includes(1) is true
    3737IDBKeyRange.only(3.14)
    3838PASS keyRange.lower is 3.14
    … …  
    4040PASS keyRange.lowerOpen is false
    4141PASS keyRange.upperOpen is false
    42 PASS keyRange.contains(3.24) is false
    43 PASS keyRange.contains(3.04) is false
    44 PASS keyRange.contains(3.14) is true
     42PASS keyRange.includes(3.24) is false
     43PASS keyRange.includes(3.04) is false
     44PASS keyRange.includes(3.14) is true
    4545IDBKeyRange.only('a')
    4646PASS keyRange.lower is 'a'
    … …  
    4848PASS keyRange.lowerOpen is false
    4949PASS keyRange.upperOpen is false
    50 PASS keyRange.contains('aa') is false
    51 PASS keyRange.contains('') is false
    52 PASS keyRange.contains('a') is true
     50PASS keyRange.includes('aa') is false
     51PASS keyRange.includes('') is false
     52PASS keyRange.includes('a') is true
    5353IDBKeyRange.lowerBound(10,true)
    5454PASS keyRange.lower is 10
    … …  
    5656PASS keyRange.upper is undefined.
    5757PASS keyRange.upperOpen is true
    58 PASS keyRange.contains(10) is false
    59 PASS keyRange.contains(10.1) is true
    60 PASS keyRange.contains(9.9) is false
     58PASS keyRange.includes(10) is false
     59PASS keyRange.includes(10.1) is true
     60PASS keyRange.includes(9.9) is false
    6161IDBKeyRange.lowerBound(11,false)
    6262PASS keyRange.lower is 11
    … …  
    6464PASS keyRange.upper is undefined.
    6565PASS keyRange.upperOpen is true
    66 PASS keyRange.contains(11) is true
    67 PASS keyRange.contains(11.1) is true
    68 PASS keyRange.contains(10.9) is false
     66PASS keyRange.includes(11) is true
     67PASS keyRange.includes(11.1) is true
     68PASS keyRange.includes(10.9) is false
    6969IDBKeyRange.lowerBound(12,undefined)
    7070PASS keyRange.lower is 12
    … …  
    7272PASS keyRange.upper is undefined.
    7373PASS keyRange.upperOpen is true
    74 PASS keyRange.contains(12) is true
    75 PASS keyRange.contains(12.1) is true
    76 PASS keyRange.contains(11.9) is false
     74PASS keyRange.includes(12) is true
     75PASS keyRange.includes(12.1) is true
     76PASS keyRange.includes(11.9) is false
    7777IDBKeyRange.lowerBound(10.1,true)
    7878PASS keyRange.lower is 10.1
    … …  
    8080PASS keyRange.upper is undefined.
    8181PASS keyRange.upperOpen is true
    82 PASS keyRange.contains(10.1) is false
    83 PASS keyRange.contains(10.2) is true
    84 PASS keyRange.contains(10) is false
     82PASS keyRange.includes(10.1) is false
     83PASS keyRange.includes(10.2) is true
     84PASS keyRange.includes(10) is false
    8585IDBKeyRange.lowerBound(11.2,false)
    8686PASS keyRange.lower is 11.2
    … …  
    8888PASS keyRange.upper is undefined.
    8989PASS keyRange.upperOpen is true
    90 PASS keyRange.contains(11.2) is true
    91 PASS keyRange.contains(11.299999999999999) is true
    92 PASS keyRange.contains(11.1) is false
     90PASS keyRange.includes(11.2) is true
     91PASS keyRange.includes(11.299999999999999) is true
     92PASS keyRange.includes(11.1) is false
    9393IDBKeyRange.lowerBound(12.3,undefined)
    9494PASS keyRange.lower is 12.3
    … …  
    9696PASS keyRange.upper is undefined.
    9797PASS keyRange.upperOpen is true
    98 PASS keyRange.contains(12.3) is true
    99 PASS keyRange.contains(12.4) is true
    100 PASS keyRange.contains(12.200000000000001) is false
     98PASS keyRange.includes(12.3) is true
     99PASS keyRange.includes(12.4) is true
     100PASS keyRange.includes(12.200000000000001) is false
    101101IDBKeyRange.lowerBound('aa',true)
    102102PASS keyRange.lower is 'aa'
    … …  
    104104PASS keyRange.upper is undefined.
    105105PASS keyRange.upperOpen is true
    106 PASS keyRange.contains('aa') is false
    107 PASS keyRange.contains('aaa') is true
    108 PASS keyRange.contains('a') is false
     106PASS keyRange.includes('aa') is false
     107PASS keyRange.includes('aaa') is true
     108PASS keyRange.includes('a') is false
    109109IDBKeyRange.lowerBound('ab',false)
    110110PASS keyRange.lower is 'ab'
    … …  
    112112PASS keyRange.upper is undefined.
    113113PASS keyRange.upperOpen is true
    114 PASS keyRange.contains('ab') is true
    115 PASS keyRange.contains('abb') is true
    116 PASS keyRange.contains('a') is false
     114PASS keyRange.includes('ab') is true
     115PASS keyRange.includes('abb') is true
     116PASS keyRange.includes('a') is false
    117117IDBKeyRange.lowerBound('ac',undefined)
    118118PASS keyRange.lower is 'ac'
    … …  
    120120PASS keyRange.upper is undefined.
    121121PASS keyRange.upperOpen is true
    122 PASS keyRange.contains('ac') is true
    123 PASS keyRange.contains('acc') is true
    124 PASS keyRange.contains('a') is false
     122PASS keyRange.includes('ac') is true
     123PASS keyRange.includes('acc') is true
     124PASS keyRange.includes('a') is false
    125125IDBKeyRange.upperBound(20,true)
    126126PASS keyRange.upper is 20
    … …  
    128128PASS keyRange.lower is undefined.
    129129PASS keyRange.lowerOpen is true
    130 PASS keyRange.contains(20) is false
    131 PASS keyRange.contains(20.1) is false
    132 PASS keyRange.contains(19.9) is true
     130PASS keyRange.includes(20) is false
     131PASS keyRange.includes(20.1) is false
     132PASS keyRange.includes(19.9) is true
    133133IDBKeyRange.upperBound(21,false)
    134134PASS keyRange.upper is 21
    … …  
    136136PASS keyRange.lower is undefined.
    137137PASS keyRange.lowerOpen is true
    138 PASS keyRange.contains(21) is true
    139 PASS keyRange.contains(21.1) is false
    140 PASS keyRange.contains(20.9) is true
     138PASS keyRange.includes(21) is true
     139PASS keyRange.includes(21.1) is false
     140PASS keyRange.includes(20.9) is true
    141141IDBKeyRange.upperBound(22,undefined)
    142142PASS keyRange.upper is 22
    … …  
    144144PASS keyRange.lower is undefined.
    145145PASS keyRange.lowerOpen is true
    146 PASS keyRange.contains(22) is true
    147 PASS keyRange.contains(22.1) is false
    148 PASS keyRange.contains(21.9) is true
     146PASS keyRange.includes(22) is true
     147PASS keyRange.includes(22.1) is false
     148PASS keyRange.includes(21.9) is true
    149149IDBKeyRange.upperBound(20.2,true)
    150150PASS keyRange.upper is 20.2
    … …  
    152152PASS keyRange.lower is undefined.
    153153PASS keyRange.lowerOpen is true
    154 PASS keyRange.contains(20.2) is false
    155 PASS keyRange.contains(20.3) is false
    156 PASS keyRange.contains(20.099999999999998) is true
     154PASS keyRange.includes(20.2) is false
     155PASS keyRange.includes(20.3) is false
     156PASS keyRange.includes(20.099999999999998) is true
    157157IDBKeyRange.upperBound(21.3,false)
    158158PASS keyRange.upper is 21.3
    … …  
    160160PASS keyRange.lower is undefined.
    161161PASS keyRange.lowerOpen is true
    162 PASS keyRange.contains(21.3) is true
    163 PASS keyRange.contains(21.400000000000002) is false
    164 PASS keyRange.contains(21.2) is true
     162PASS keyRange.includes(21.3) is true
     163PASS keyRange.includes(21.400000000000002) is false
     164PASS keyRange.includes(21.2) is true
    165165IDBKeyRange.upperBound(22.4,undefined)
    166166PASS keyRange.upper is 22.4
    … …  
    168168PASS keyRange.lower is undefined.
    169169PASS keyRange.lowerOpen is true
    170 PASS keyRange.contains(22.4) is true
    171 PASS keyRange.contains(22.5) is false
    172 PASS keyRange.contains(22.299999999999997) is true
     170PASS keyRange.includes(22.4) is true
     171PASS keyRange.includes(22.5) is false
     172PASS keyRange.includes(22.299999999999997) is true
    173173IDBKeyRange.upperBound('ba',true)
    174174PASS keyRange.upper is 'ba'
    … …  
    176176PASS keyRange.lower is undefined.
    177177PASS keyRange.lowerOpen is true
    178 PASS keyRange.contains('ba') is false
    179 PASS keyRange.contains('baa') is false
    180 PASS keyRange.contains('b') is true
     178PASS keyRange.includes('ba') is false
     179PASS keyRange.includes('baa') is false
     180PASS keyRange.includes('b') is true
    181181IDBKeyRange.upperBound('bb',false)
    182182PASS keyRange.upper is 'bb'
    … …  
    184184PASS keyRange.lower is undefined.
    185185PASS keyRange.lowerOpen is true
    186 PASS keyRange.contains('bb') is true
    187 PASS keyRange.contains('bbb') is false
    188 PASS keyRange.contains('b') is true
     186PASS keyRange.includes('bb') is true
     187PASS keyRange.includes('bbb') is false
     188PASS keyRange.includes('b') is true
    189189IDBKeyRange.upperBound('bc',undefined)
    190190PASS keyRange.upper is 'bc'
    … …  
    192192PASS keyRange.lower is undefined.
    193193PASS keyRange.lowerOpen is true
    194 PASS keyRange.contains('bc') is true
    195 PASS keyRange.contains('bcc') is false
    196 PASS keyRange.contains('b') is true
     194PASS keyRange.includes('bc') is true
     195PASS keyRange.includes('bcc') is false
     196PASS keyRange.includes('b') is true
    197197IDBKeyRange.bound(30,40, undefined, undefined)
    198198PASS keyRange.lower is 30
    … …  
    200200PASS keyRange.lowerOpen is false
    201201PASS keyRange.upperOpen is false
    202 PASS keyRange.contains(30) is true
    203 PASS keyRange.contains(40) is true
     202PASS keyRange.includes(30) is true
     203PASS keyRange.includes(40) is true
    204204IDBKeyRange.bound(31,41, false, false)
    205205PASS keyRange.lower is 31
    … …  
    207207PASS keyRange.lowerOpen is false
    208208PASS keyRange.upperOpen is false
    209 PASS keyRange.contains(31) is true
    210 PASS keyRange.contains(41) is true
     209PASS keyRange.includes(31) is true
     210PASS keyRange.includes(41) is true
    211211IDBKeyRange.bound(32,42, false, true)
    212212PASS keyRange.lower is 32
    … …  
    214214PASS keyRange.lowerOpen is false
    215215PASS keyRange.upperOpen is true
    216 PASS keyRange.contains(32) is true
    217 PASS keyRange.contains(42) is false
     216PASS keyRange.includes(32) is true
     217PASS keyRange.includes(42) is false
    218218IDBKeyRange.bound(33,43, true, false)
    219219PASS keyRange.lower is 33
    … …  
    221221PASS keyRange.lowerOpen is true
    222222PASS keyRange.upperOpen is false
    223 PASS keyRange.contains(33) is false
    224 PASS keyRange.contains(43) is true
     223PASS keyRange.includes(33) is false
     224PASS keyRange.includes(43) is true
    225225IDBKeyRange.bound(34,44, true, true)
    226226PASS keyRange.lower is 34
    … …  
    228228PASS keyRange.lowerOpen is true
    229229PASS keyRange.upperOpen is true
    230 PASS keyRange.contains(34) is false
    231 PASS keyRange.contains(44) is false
     230PASS keyRange.includes(34) is false
     231PASS keyRange.includes(44) is false
    232232IDBKeyRange.bound(30.1,40.2, undefined, undefined)
    233233PASS keyRange.lower is 30.1
    … …  
    235235PASS keyRange.lowerOpen is false
    236236PASS keyRange.upperOpen is false
    237 PASS keyRange.contains(30.1) is true
    238 PASS keyRange.contains(40.2) is true
     237PASS keyRange.includes(30.1) is true
     238PASS keyRange.includes(40.2) is true
    239239IDBKeyRange.bound(31.3,41.4, false, false)
    240240PASS keyRange.lower is 31.3
    … …  
    242242PASS keyRange.lowerOpen is false
    243243PASS keyRange.upperOpen is false
    244 PASS keyRange.contains(31.3) is true
    245 PASS keyRange.contains(41.4) is true
     244PASS keyRange.includes(31.3) is true
     245PASS keyRange.includes(41.4) is true
    246246IDBKeyRange.bound(32.5,42.6, false, true)
    247247PASS keyRange.lower is 32.5
    … …  
    249249PASS keyRange.lowerOpen is false
    250250PASS keyRange.upperOpen is true
    251 PASS keyRange.contains(32.5) is true
    252 PASS keyRange.contains(42.6) is false
     251PASS keyRange.includes(32.5) is true
     252PASS keyRange.includes(42.6) is false
    253253IDBKeyRange.bound(33.7,43.8, true, false)
    254254PASS keyRange.lower is 33.7
    … …  
    256256PASS keyRange.lowerOpen is true
    257257PASS keyRange.upperOpen is false
    258 PASS keyRange.contains(33.7) is false
    259 PASS keyRange.contains(43.8) is true
     258PASS keyRange.includes(33.7) is false
     259PASS keyRange.includes(43.8) is true
    260260IDBKeyRange.bound(34.9,44, true, true)
    261261PASS keyRange.lower is 34.9
    … …  
    263263PASS keyRange.lowerOpen is true
    264264PASS keyRange.upperOpen is true
    265 PASS keyRange.contains(34.9) is false
    266 PASS keyRange.contains(44) is false
     265PASS keyRange.includes(34.9) is false
     266PASS keyRange.includes(44) is false
    267267IDBKeyRange.bound('aaa','aba', false, false)
    268268PASS keyRange.lower is 'aaa'
    … …  
    270270PASS keyRange.lowerOpen is false
    271271PASS keyRange.upperOpen is false
    272 PASS keyRange.contains('aaa') is true
    273 PASS keyRange.contains('aba') is true
     272PASS keyRange.includes('aaa') is true
     273PASS keyRange.includes('aba') is true
    274274IDBKeyRange.bound('aab','abb', undefined, undefined)
    275275PASS keyRange.lower is 'aab'
    … …  
    277277PASS keyRange.lowerOpen is false
    278278PASS keyRange.upperOpen is false
    279 PASS keyRange.contains('aab') is true
    280 PASS keyRange.contains('abb') is true
     279PASS keyRange.includes('aab') is true
     280PASS keyRange.includes('abb') is true
    281281IDBKeyRange.bound('aac','abc', false, false)
    282282PASS keyRange.lower is 'aac'
    … …  
    284284PASS keyRange.lowerOpen is false
    285285PASS keyRange.upperOpen is false
    286 PASS keyRange.contains('aac') is true
    287 PASS keyRange.contains('abc') is true
     286PASS keyRange.includes('aac') is true
     287PASS keyRange.includes('abc') is true
    288288IDBKeyRange.bound('aad','abd', false, true)
    289289PASS keyRange.lower is 'aad'
    … …  
    291291PASS keyRange.lowerOpen is false
    292292PASS keyRange.upperOpen is true
    293 PASS keyRange.contains('aad') is true
    294 PASS keyRange.contains('abd') is false
     293PASS keyRange.includes('aad') is true
     294PASS keyRange.includes('abd') is false
    295295IDBKeyRange.bound('aae','abe', true, false)
    296296PASS keyRange.lower is 'aae'
    … …  
    298298PASS keyRange.lowerOpen is true
    299299PASS keyRange.upperOpen is false
    300 PASS keyRange.contains('aae') is false
    301 PASS keyRange.contains('abe') is true
     300PASS keyRange.includes('aae') is false
     301PASS keyRange.includes('abe') is true
    302302IDBKeyRange.bound('aaf','abf', true, true)
    303303PASS keyRange.lower is 'aaf'
    … …  
    305305PASS keyRange.lowerOpen is true
    306306PASS keyRange.upperOpen is true
    307 PASS keyRange.contains('aaf') is false
    308 PASS keyRange.contains('abf') is false
     307PASS keyRange.includes('aaf') is false
     308PASS keyRange.includes('abf') is false
    309309Passing an invalid key into only({})
    310310Expecting exception from IDBKeyRange.only({})
    … …  
    368368Exception message: The data provided does not meet requirements.
    369369Equal keys, none of the bounds is open, bound(4, 4, false, false)
    370 Passing an invalid key in to IDBKeyRange.contains({})
    371 Expecting exception from invalidKeyKeyRange.contains({})
    372 PASS Exception was thrown.
    373 PASS code is 0
    374 PASS ename is 'DataError'
    375 Exception message: Failed to execute 'contains' on 'IDBKeyRange': The passed-in value is not a valid IndexedDB key.
     370Passing an invalid key in to IDBKeyRange.includes({})
     371Expecting exception from invalidKeyKeyRange.includes({})
     372PASS Exception was thrown.
     373PASS code is 0
     374PASS ename is 'DataError'
     375Exception message: Failed to execute 'includes' on 'IDBKeyRange': The passed-in value is not a valid IndexedDB key.
    376376PASS successfullyParsed is true
    377377

  • trunk/LayoutTests/storage/indexeddb/resources/keyrange.js

    r207788 r208359  
    4545    shouldBeFalse("keyRange.lowerOpen");
    4646    shouldBeFalse("keyRange.upperOpen");
    47     shouldBeFalse("keyRange.contains(" + incrementedKey(value) + ")");
    48     shouldBeFalse("keyRange.contains(" + decrementedKey(value) + ")");
    49     shouldBeTrue("keyRange.contains(" + value + ")");
     47    shouldBeFalse("keyRange.includes(" + incrementedKey(value) + ")");
     48    shouldBeFalse("keyRange.includes(" + decrementedKey(value) + ")");
     49    shouldBeTrue("keyRange.includes(" + value + ")");
    5050}
    5151
    … …  
    6161
    6262    if (open)
    63         shouldBeFalse("keyRange.contains(" + value + ")");
    64     else
    65         shouldBeTrue("keyRange.contains(" + value + ")");
    66 
    67     shouldBeTrue("keyRange.contains(" + incrementedKey(value) + ")");
    68     shouldBeFalse("keyRange.contains(" + decrementedKey(value) + ")");
     63        shouldBeFalse("keyRange.includes(" + value + ")");
     64    else
     65        shouldBeTrue("keyRange.includes(" + value + ")");
     66
     67    shouldBeTrue("keyRange.includes(" + incrementedKey(value) + ")");
     68    shouldBeFalse("keyRange.includes(" + decrementedKey(value) + ")");
    6969}
    7070
    … …  
    8080
    8181    if (open)
    82         shouldBeFalse("keyRange.contains(" + value + ")");
    83     else
    84         shouldBeTrue("keyRange.contains(" + value + ")");
    85 
    86     shouldBeFalse("keyRange.contains(" + incrementedKey(value) + ")");
    87     shouldBeTrue("keyRange.contains(" + decrementedKey(value) + ")");
     82        shouldBeFalse("keyRange.includes(" + value + ")");
     83    else
     84        shouldBeTrue("keyRange.includes(" + value + ")");
     85
     86    shouldBeFalse("keyRange.includes(" + incrementedKey(value) + ")");
     87    shouldBeTrue("keyRange.includes(" + decrementedKey(value) + ")");
    8888}
    8989
    … …  
    101101   
    102102    if (lowerOpen)
    103         shouldBeFalse("keyRange.contains(" + lower + ")");
    104     else
    105         shouldBeTrue("keyRange.contains(" + lower + ")");
     103        shouldBeFalse("keyRange.includes(" + lower + ")");
     104    else
     105        shouldBeTrue("keyRange.includes(" + lower + ")");
    106106
    107107    if (upperOpen)
    108         shouldBeFalse("keyRange.contains(" + upper + ")");
    109     else
    110         shouldBeTrue("keyRange.contains(" + upper + ")");
     108        shouldBeFalse("keyRange.includes(" + upper + ")");
     109    else
     110        shouldBeTrue("keyRange.includes(" + upper + ")");
    111111}
    112112
    … …  
    118118    shouldBeFalse("'lowerOpen' in IDBKeyRange");
    119119    shouldBeFalse("'upperOpen' in IDBKeyRange");
    120     shouldBeFalse("'contains' in IDBKeyRange");
     120    shouldBeFalse("'includes' in IDBKeyRange");
    121121    shouldBeTrue("'only' in IDBKeyRange");
    122122    shouldBeTrue("'lowerBound' in IDBKeyRange");
    … …  
    131131    shouldBeTrue("'lowerOpen' in instance");
    132132    shouldBeTrue("'upperOpen' in instance");
    133     shouldBeTrue("'contains' in instance");
     133    shouldBeTrue("'includes' in instance");
    134134    shouldBeFalse("'only' in instance");
    135135    shouldBeFalse("'lowerBound' in instance");
    … …  
    215215    IDBKeyRange.bound(4, 4, false, false);
    216216
    217     debug("Passing an invalid key in to IDBKeyRange.contains({})");
     217    debug("Passing an invalid key in to IDBKeyRange.includes({})");
    218218    eval("invalidKeyKeyRange = IDBKeyRange.only('a')");
    219     evalAndExpectException("invalidKeyKeyRange.contains({})", "0", "'DataError'");
     219    evalAndExpectException("invalidKeyKeyRange.includes({})", "0", "'DataError'");
    220220}
    221221

  • trunk/Source/WebCore/ChangeLog

    r208356 r208359  
     12016-11-03  Brady Eidson  <beidson@apple.com>
     2
     3        IndexedDB 2.0: Rename IDBKeyRange.contains to IDBKeyRange.includes.
     4        https://bugs.webkit.org/show_bug.cgi?id=164383
     5
     6        Reviewed by Beth Dakin.
     7
     8        No new tests (Updated existing tests).
     9
     10        * Modules/indexeddb/IDBKeyRange.cpp:
     11        (WebCore::IDBKeyRange::includes):
     12        (WebCore::IDBKeyRange::contains): Deleted.
     13        * Modules/indexeddb/IDBKeyRange.h:
     14        * Modules/indexeddb/IDBKeyRange.idl:
     15
    1162016-11-03  Ryan Haddad  <ryanhaddad@apple.com>
    217

  • trunk/Source/WebCore/Modules/indexeddb/IDBKeyRange.cpp

    r207788 r208359  
    114114}
    115115
    116 ExceptionOr<bool> IDBKeyRange::contains(JSC::ExecState& state, JSC::JSValue keyValue)
     116ExceptionOr<bool> IDBKeyRange::includes(JSC::ExecState& state, JSC::JSValue keyValue)
    117117{
    118118    auto key = scriptValueToIDBKey(state, keyValue);
    119119    if (!key->isValid())
    120         return Exception { IDBDatabaseException::DataError, "Failed to execute 'contains' on 'IDBKeyRange': The passed-in value is not a valid IndexedDB key." };
     120        return Exception { IDBDatabaseException::DataError, "Failed to execute 'includes' on 'IDBKeyRange': The passed-in value is not a valid IndexedDB key." };
    121121
    122122    if (m_lower) {

  • trunk/Source/WebCore/Modules/indexeddb/IDBKeyRange.h

    r207788 r208359  
    6464    static ExceptionOr<Ref<IDBKeyRange>> bound(JSC::ExecState&, JSC::JSValue lower, JSC::JSValue upper, bool lowerOpen, bool upperOpen);
    6565
    66     ExceptionOr<bool> contains(JSC::ExecState&, JSC::JSValue key);
     66    ExceptionOr<bool> includes(JSC::ExecState&, JSC::JSValue key);
    6767
    6868    WEBCORE_EXPORT bool isOnlyKey() const;

  • trunk/Source/WebCore/Modules/indexeddb/IDBKeyRange.idl

    r207788 r208359  
    3939    [CallWith=ScriptState, MayThrowException] static IDBKeyRange bound(any lower, any upper, optional boolean lowerOpen = false, optional boolean upperOpen = false);
    4040
    41     [CallWith=ScriptState, MayThrowException] boolean contains(any key);
     41    [CallWith=ScriptState, MayThrowException] boolean includes(any key);
    4242};
Note: See TracChangeset for help on using the changeset viewer.