Commit 73dde766 authored by corona10's avatar corona10 Committed by Commit bot

Remove Headers.prototype.getAll()

It's no longer part of the spec
(https://github.com/whatwg/fetch/commit/42464c)

intent-to-deprecate-and-remove
https://groups.google.com/a/chromium.org/forum/#!topic/blink-dev/x3YXciXQWM0

BUG=645492

Review-Url: https://codereview.chromium.org/2591723003
Cr-Commit-Position: refs/heads/master@{#468022}
parent fa845ac5
...@@ -2537,7 +2537,6 @@ interface Headers ...@@ -2537,7 +2537,6 @@ interface Headers
method entries method entries
method forEach method forEach
method get method get
method getAll
method has method has
method keys method keys
method set method set
......
...@@ -345,15 +345,11 @@ function headersToArray(headers) { ...@@ -345,15 +345,11 @@ function headersToArray(headers) {
// iterable. // iterable.
['content-length', 'content-type', 'x-serviceworker-serverheader'].forEach( ['content-length', 'content-type', 'x-serviceworker-serverheader'].forEach(
function(name) { function(name) {
for (var value of headers.getAll(name)) for (var header of headers){
ret.push([name, value]); ret.push(header);
}
}); });
// Original code:
// for (var header of headers) {
// ret.push(header);
// }
return ret; return ret;
} }
......
...@@ -128,8 +128,8 @@ test(function() { ...@@ -128,8 +128,8 @@ test(function() {
assert_equals(headersObject, headers); assert_equals(headersObject, headers);
}, thisObject); }, thisObject);
// 'append()', 'getAll()' // 'append()'
var allValues = headers.getAll('X-Fetch-Test'); var allValues = headers.get('X-Fetch-Test').split(', ');
assert_equals(allValues.length, 1); assert_equals(allValues.length, 1);
assert_equals(size(headers), 4); assert_equals(size(headers), 4);
headers.append('X-FETCH-TEST', 'response test field - append'); headers.append('X-FETCH-TEST', 'response test field - append');
...@@ -138,13 +138,13 @@ test(function() { ...@@ -138,13 +138,13 @@ test(function() {
assert_equals(headers.get('X-FETCH-Test'), assert_equals(headers.get('X-FETCH-Test'),
'response test field - updated, response test field - append', 'response test field - updated, response test field - append',
'the value of the first header added should be returned.'); 'the value of the first header added should be returned.');
allValues = headers.getAll('X-FETch-TEST'); allValues = headers.get('X-FETch-TEST').split(', ');
assert_equals(allValues.length, 2); assert_equals(allValues.length, 2);
assert_equals(allValues[0], 'response test field - updated'); assert_equals(allValues[0], 'response test field - updated');
assert_equals(allValues[1], 'response test field - append'); assert_equals(allValues[1], 'response test field - append');
headers.set('X-FETch-Test', 'response test field - set'); headers.set('X-FETch-Test', 'response test field - set');
assert_equals(size(headers), 5, 'the second header should be deleted'); assert_equals(size(headers), 5, 'the second header should be deleted');
allValues = headers.getAll('X-Fetch-Test'); allValues = headers.get('X-Fetch-Test').split(', ');
assert_equals(allValues.length, 1, 'the second header should be deleted'); assert_equals(allValues.length, 1, 'the second header should be deleted');
assert_equals(allValues[0], 'response test field - set'); assert_equals(allValues[0], 'response test field - set');
headers.append('X-Fetch-TEST', 'response test field - append'); headers.append('X-Fetch-TEST', 'response test field - append');
...@@ -157,16 +157,16 @@ test(function() { ...@@ -157,16 +157,16 @@ test(function() {
assert_equals(size(headers), 2, 'headers size should match'); assert_equals(size(headers), 2, 'headers size should match');
assert_equals(headers.get('a'), 'b'); assert_equals(headers.get('a'), 'b');
assert_equals(headers.get('c'), 'd, e'); assert_equals(headers.get('c'), 'd, e');
assert_equals(headers.getAll('c')[0], 'd'); assert_equals(headers.get('c').split(', ')[0], 'd');
assert_equals(headers.getAll('c')[1], 'e'); assert_equals(headers.get('c').split(', ')[1], 'e');
// new Headers with Headers // new Headers with Headers
var headers2 = new Headers(headers); var headers2 = new Headers(headers);
assert_equals(size(headers2), 2, 'headers size should match'); assert_equals(size(headers2), 2, 'headers size should match');
assert_equals(headers2.get('a'), 'b'); assert_equals(headers2.get('a'), 'b');
assert_equals(headers2.get('c'), 'd, e'); assert_equals(headers2.get('c'), 'd, e');
assert_equals(headers2.getAll('c')[0], 'd'); assert_equals(headers2.get('c').split(', ')[0], 'd');
assert_equals(headers2.getAll('c')[1], 'e'); assert_equals(headers2.get('c').split(', ')[1], 'e');
headers.set('a', 'x'); headers.set('a', 'x');
assert_equals(headers.get('a'), 'x'); assert_equals(headers.get('a'), 'x');
assert_equals(headers2.get('a'), 'b'); assert_equals(headers2.get('a'), 'b');
......
...@@ -113,44 +113,44 @@ test(function() { ...@@ -113,44 +113,44 @@ test(function() {
assert_equals(request2.mode, 'cors', 'Request.mode should match'); assert_equals(request2.mode, 'cors', 'Request.mode should match');
assert_equals(request2.credentials, 'omit', assert_equals(request2.credentials, 'omit',
'Request.credentials should match'); 'Request.credentials should match');
assert_equals(request2.headers.getAll('X-Fetch-Foo')[0], 'foo1', assert_equals(request2.headers.get('X-Fetch-Foo').split(', ')[0], 'foo1',
'Request.headers should match'); 'Request.headers should match');
assert_equals(request2.headers.getAll('X-Fetch-Foo')[1], 'foo2', assert_equals(request2.headers.get('X-Fetch-Foo').split(', ')[1], 'foo2',
'Request.headers should match'); 'Request.headers should match');
assert_equals(request2.headers.getAll('X-Fetch-Bar')[0], 'bar', assert_equals(request2.headers.get('X-Fetch-Bar').split(', ')[0], 'bar',
'Request.headers should match'); 'Request.headers should match');
var request3 = new Request(URL, var request3 = new Request(URL,
{headers: [['X-Fetch-Foo', 'foo1'], {headers: [['X-Fetch-Foo', 'foo1'],
['X-Fetch-Foo', 'foo2'], ['X-Fetch-Foo', 'foo2'],
['X-Fetch-Bar', 'bar']]}); ['X-Fetch-Bar', 'bar']]});
assert_equals(request3.headers.getAll('X-Fetch-Foo')[0], 'foo1', assert_equals(request3.headers.get('X-Fetch-Foo').split(', ')[0], 'foo1',
'Request.headers should match'); 'Request.headers should match');
assert_equals(request3.headers.getAll('X-Fetch-Foo')[1], 'foo2', assert_equals(request3.headers.get('X-Fetch-Foo').split(', ')[1], 'foo2',
'Request.headers should match'); 'Request.headers should match');
assert_equals(request3.headers.getAll('X-Fetch-Bar')[0], 'bar', assert_equals(request3.headers.get('X-Fetch-Bar').split(', ')[0], 'bar',
'Request.headers should match'); 'Request.headers should match');
var request4 = new Request(URL, var request4 = new Request(URL,
{headers: {'X-Fetch-Foo': 'foo1', {headers: {'X-Fetch-Foo': 'foo1',
'X-Fetch-Foo': 'foo2', 'X-Fetch-Foo': 'foo2',
'X-Fetch-Bar': 'bar'}}); 'X-Fetch-Bar': 'bar'}});
assert_equals(request4.headers.getAll('X-Fetch-Foo')[0], 'foo2', assert_equals(request4.headers.get('X-Fetch-Foo').split(', ')[0], 'foo2',
'Request.headers should match'); 'Request.headers should match');
assert_equals(request4.headers.getAll('X-Fetch-Bar')[0], 'bar', assert_equals(request4.headers.get('X-Fetch-Bar').split(', ')[0], 'bar',
'Request.headers should match'); 'Request.headers should match');
// https://github.com/whatwg/fetch/issues/479 // https://github.com/whatwg/fetch/issues/479
var request5 = new Request(request, {headers: undefined}); var request5 = new Request(request, {headers: undefined});
assert_equals(request5.headers.getAll('X-Fetch-Foo')[0], 'foo1', assert_equals(request5.headers.get('X-Fetch-Foo').split(', ')[0], 'foo1',
'Request.headers should match'); 'Request.headers should match');
assert_equals(request5.headers.getAll('X-Fetch-Foo')[1], 'foo2', assert_equals(request5.headers.get('X-Fetch-Foo').split(', ')[1], 'foo2',
'Request.headers should match'); 'Request.headers should match');
assert_equals(request5.headers.getAll('X-Fetch-Bar')[0], 'bar', assert_equals(request5.headers.get('X-Fetch-Bar').split(', ')[0], 'bar',
'Request.headers should match'); 'Request.headers should match');
var request6 = new Request(request, {}); var request6 = new Request(request, {});
assert_equals(request6.headers.getAll('X-Fetch-Foo')[0], 'foo1', assert_equals(request6.headers.get('X-Fetch-Foo').split(', ')[0], 'foo1',
'Request.headers should match'); 'Request.headers should match');
assert_equals(request6.headers.getAll('X-Fetch-Foo')[1], 'foo2', assert_equals(request6.headers.get('X-Fetch-Foo').split(', ')[1], 'foo2',
'Request.headers should match'); 'Request.headers should match');
assert_equals(request6.headers.getAll('X-Fetch-Bar')[0], 'bar', assert_equals(request6.headers.get('X-Fetch-Bar').split(', ')[0], 'bar',
'Request.headers should match'); 'Request.headers should match');
assert_throws(new TypeError(), assert_throws(new TypeError(),
() => { new Request(request, {headers: null}) }, () => { new Request(request, {headers: null}) },
......
...@@ -450,7 +450,6 @@ interface Headers ...@@ -450,7 +450,6 @@ interface Headers
method entries method entries
method forEach method forEach
method get method get
method getAll
method has method has
method keys method keys
method set method set
......
...@@ -237,7 +237,6 @@ interface Headers ...@@ -237,7 +237,6 @@ interface Headers
method entries method entries
method forEach method forEach
method get method get
method getAll
method has method has
method keys method keys
method set method set
......
...@@ -250,7 +250,6 @@ Starting worker: resources/global-interface-listing.js ...@@ -250,7 +250,6 @@ Starting worker: resources/global-interface-listing.js
[Worker] method entries [Worker] method entries
[Worker] method forEach [Worker] method forEach
[Worker] method get [Worker] method get
[Worker] method getAll
[Worker] method has [Worker] method has
[Worker] method keys [Worker] method keys
[Worker] method set [Worker] method set
......
...@@ -2921,7 +2921,6 @@ interface Headers ...@@ -2921,7 +2921,6 @@ interface Headers
method entries method entries
method forEach method forEach
method get method get
method getAll
method has method has
method keys method keys
method set method set
......
...@@ -245,7 +245,6 @@ Starting worker: resources/global-interface-listing.js ...@@ -245,7 +245,6 @@ Starting worker: resources/global-interface-listing.js
[Worker] method entries [Worker] method entries
[Worker] method forEach [Worker] method forEach
[Worker] method get [Worker] method get
[Worker] method getAll
[Worker] method has [Worker] method has
[Worker] method keys [Worker] method keys
[Worker] method set [Worker] method set
......
...@@ -2850,7 +2850,6 @@ interface Headers ...@@ -2850,7 +2850,6 @@ interface Headers
method entries method entries
method forEach method forEach
method get method get
method getAll
method has method has
method keys method keys
method set method set
......
...@@ -449,7 +449,6 @@ interface Headers ...@@ -449,7 +449,6 @@ interface Headers
method entries method entries
method forEach method forEach
method get method get
method getAll
method has method has
method keys method keys
method set method set
......
...@@ -458,7 +458,6 @@ Starting worker: resources/global-interface-listing.js ...@@ -458,7 +458,6 @@ Starting worker: resources/global-interface-listing.js
[Worker] method entries [Worker] method entries
[Worker] method forEach [Worker] method forEach
[Worker] method get [Worker] method get
[Worker] method getAll
[Worker] method has [Worker] method has
[Worker] method keys [Worker] method keys
[Worker] method set [Worker] method set
......
...@@ -3550,7 +3550,6 @@ interface Headers ...@@ -3550,7 +3550,6 @@ interface Headers
method entries method entries
method forEach method forEach
method get method get
method getAll
method has method has
method keys method keys
method set method set
......
...@@ -453,7 +453,6 @@ Starting worker: resources/global-interface-listing.js ...@@ -453,7 +453,6 @@ Starting worker: resources/global-interface-listing.js
[Worker] method entries [Worker] method entries
[Worker] method forEach [Worker] method forEach
[Worker] method get [Worker] method get
[Worker] method getAll
[Worker] method has [Worker] method has
[Worker] method keys [Worker] method keys
[Worker] method set [Worker] method set
......
...@@ -450,7 +450,6 @@ interface Headers ...@@ -450,7 +450,6 @@ interface Headers
method entries method entries
method forEach method forEach
method get method get
method getAll
method has method has
method keys method keys
method set method set
......
...@@ -237,7 +237,6 @@ interface Headers ...@@ -237,7 +237,6 @@ interface Headers
method entries method entries
method forEach method forEach
method get method get
method getAll
method has method has
method keys method keys
method set method set
......
...@@ -250,7 +250,6 @@ Starting worker: resources/global-interface-listing.js ...@@ -250,7 +250,6 @@ Starting worker: resources/global-interface-listing.js
[Worker] method entries [Worker] method entries
[Worker] method forEach [Worker] method forEach
[Worker] method get [Worker] method get
[Worker] method getAll
[Worker] method has [Worker] method has
[Worker] method keys [Worker] method keys
[Worker] method set [Worker] method set
......
...@@ -245,7 +245,6 @@ Starting worker: resources/global-interface-listing.js ...@@ -245,7 +245,6 @@ Starting worker: resources/global-interface-listing.js
[Worker] method entries [Worker] method entries
[Worker] method forEach [Worker] method forEach
[Worker] method get [Worker] method get
[Worker] method getAll
[Worker] method has [Worker] method has
[Worker] method keys [Worker] method keys
[Worker] method set [Worker] method set
......
...@@ -458,7 +458,6 @@ Starting worker: resources/global-interface-listing.js ...@@ -458,7 +458,6 @@ Starting worker: resources/global-interface-listing.js
[Worker] method entries [Worker] method entries
[Worker] method forEach [Worker] method forEach
[Worker] method get [Worker] method get
[Worker] method getAll
[Worker] method has [Worker] method has
[Worker] method keys [Worker] method keys
[Worker] method set [Worker] method set
......
...@@ -3550,7 +3550,6 @@ interface Headers ...@@ -3550,7 +3550,6 @@ interface Headers
method entries method entries
method forEach method forEach
method get method get
method getAll
method has method has
method keys method keys
method set method set
......
...@@ -453,7 +453,6 @@ Starting worker: resources/global-interface-listing.js ...@@ -453,7 +453,6 @@ Starting worker: resources/global-interface-listing.js
[Worker] method entries [Worker] method entries
[Worker] method forEach [Worker] method forEach
[Worker] method get [Worker] method get
[Worker] method getAll
[Worker] method has [Worker] method has
[Worker] method keys [Worker] method keys
[Worker] method set [Worker] method set
......
...@@ -167,21 +167,6 @@ String Headers::get(const String& name, ExceptionState& exception_state) { ...@@ -167,21 +167,6 @@ String Headers::get(const String& name, ExceptionState& exception_state) {
return result; return result;
} }
Vector<String> Headers::getAll(const String& name,
ExceptionState& exception_state) {
// "The getAll(|name|) method, when invoked, must run these steps:"
// "1. If |name| is not a name, throw a TypeError."
if (!FetchHeaderList::IsValidHeaderName(name)) {
exception_state.ThrowTypeError("Invalid name");
return Vector<String>();
}
// "2. Return the values of all headers in header list whose name is |name|,
// in list order, and the empty sequence otherwise."
Vector<String> result;
header_list_->GetAll(name, result);
return result;
}
bool Headers::has(const String& name, ExceptionState& exception_state) { bool Headers::has(const String& name, ExceptionState& exception_state) {
// "The has(|name|) method, when invoked, must run these steps:" // "The has(|name|) method, when invoked, must run these steps:"
// "1. If |name| is not a name, throw a TypeError." // "1. If |name| is not a name, throw a TypeError."
......
...@@ -46,7 +46,6 @@ class MODULES_EXPORT Headers final : public GarbageCollected<Headers>, ...@@ -46,7 +46,6 @@ class MODULES_EXPORT Headers final : public GarbageCollected<Headers>,
void append(const String& name, const String& value, ExceptionState&); void append(const String& name, const String& value, ExceptionState&);
void remove(const String& key, ExceptionState&); void remove(const String& key, ExceptionState&);
String get(const String& key, ExceptionState&); String get(const String& key, ExceptionState&);
Vector<String> getAll(const String& key, ExceptionState&);
bool has(const String& key, ExceptionState&); bool has(const String& key, ExceptionState&);
void set(const String& key, const String& value, ExceptionState&); void set(const String& key, const String& value, ExceptionState&);
......
...@@ -20,7 +20,6 @@ typedef (sequence<sequence<ByteString>> or record<ByteString, ByteString> or Hea ...@@ -20,7 +20,6 @@ typedef (sequence<sequence<ByteString>> or record<ByteString, ByteString> or Hea
[RaisesException] void append(ByteString name, ByteString value); [RaisesException] void append(ByteString name, ByteString value);
[ImplementedAs=remove, RaisesException] void delete(ByteString key); [ImplementedAs=remove, RaisesException] void delete(ByteString key);
[RaisesException] ByteString? get(ByteString key); [RaisesException] ByteString? get(ByteString key);
[RaisesException, Measure] sequence<ByteString> getAll(ByteString name);
[RaisesException] boolean has(ByteString key); [RaisesException] boolean has(ByteString key);
[RaisesException] void set(ByteString key, ByteString value); [RaisesException] void set(ByteString key, ByteString value);
iterable<ByteString, ByteString>; iterable<ByteString, ByteString>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment