Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(33)

Unified Diff: LayoutTests/http/tests/fetch/script-tests/fetch-body-mixin.js

Issue 1001233002: Streams Implementation Update: Reader name and Stream methods (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | LayoutTests/http/tests/fetch/script-tests/stream-reader.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: LayoutTests/http/tests/fetch/script-tests/fetch-body-mixin.js
diff --git a/LayoutTests/http/tests/fetch/script-tests/fetch-body-mixin.js b/LayoutTests/http/tests/fetch/script-tests/fetch-body-mixin.js
index ca84568e299c43b0954f62b757a26e418d18b552..2e52fe8df97de685a89a0d7a972028c0244fd490 100644
--- a/LayoutTests/http/tests/fetch/script-tests/fetch-body-mixin.js
+++ b/LayoutTests/http/tests/fetch/script-tests/fetch-body-mixin.js
@@ -12,29 +12,32 @@ function arrayBufferToString(buffer) {
});
}
-function readStream(stream, values) {
- while (stream.state === 'readable') {
- values.push(stream.read());
+function readStream(reader, values) {
+ while (reader.state === 'readable') {
+ values.push(reader.read());
}
- if (stream.state === 'waiting') {
- return stream.ready.then(function() {
- readStream(stream, values);
+ if (reader.state === 'waiting') {
+ return reader.ready.then(function() {
+ readStream(reader, values);
});
}
- return stream.closed;
+ return reader.closed;
}
sequential_promise_test(function(test) {
var response;
+ var reader;
return fetch('/fetch/resources/doctype.html')
.then(function(resp) {
response = resp;
- return response.body.ready;
+ reader = resp.body.getReader();
+ return reader.ready;
})
.then(function() {
- if (response.body.state !== 'readable') {
+ if (reader.state !== 'readable') {
return Promise.reject(TypeError('stream state get wrong'));
} else {
+ reader.releaseLock();
return response.text();
}
})
@@ -60,7 +63,7 @@ sequential_promise_test(function(test) {
return fetch('/fetch/resources/doctype.html')
.then(function(response) {
r = response;
- return readStream(response.body, values);
+ return readStream(response.body.getReader(), values);
})
.then(function() {
return Promise.all(values.map(arrayBufferToString));
@@ -149,19 +152,22 @@ sequential_promise_test(function(test) {
var values = [];
function partialReadResponse(response, read_count) {
+ var reader = response.body.getReader();
function read(resolve, reject) {
- while (response.body.state === 'readable') {
- values.push(response.body.read());
+ while (reader.state === 'readable') {
+ values.push(reader.read());
if (values.length > read_count) {
+ reader.releaseLock();
resolve();
return;
}
}
- if (response.body.state === 'closed') {
+ if (reader.state === 'closed') {
+ reader.releaseLock();
resolve();
return;
}
- response.body.ready.then(function() {
+ reader.ready.then(function() {
read(resolve, reject);
}).catch(reject);
}
« no previous file with comments | « no previous file | LayoutTests/http/tests/fetch/script-tests/stream-reader.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698