<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[192621] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/192621">192621</a></dd>
<dt>Author</dt> <dd>calvaris@igalia.com</dd>
<dt>Date</dt> <dd>2015-11-19 01:21:47 -0800 (Thu, 19 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Streams API] Implement IsReadableStreamDisturbed according to spec
https://bugs.webkit.org/show_bug.cgi?id=151356
Reviewed by Darin Adler.
Source/WebCore:
Implemente IsReadableStreamDisturbed according to the spec. This is an internal function to be used by other
internal implementations.
The function is exported as internals to be tested.
Test: streams/reference-implementation/abstract-ops.html.
* Modules/streams/ReadableStream.js:
(initializeReadableStream):
* Modules/streams/ReadableStreamInternals.js:
(cancelReadableStream):
(readFromReadableStreamReader):
(isReadableStreamDisturbed):
* bindings/js/WebCoreBuiltinNames.h:
* testing/Internals.cpp:
(WebCore::Internals::isReadableStreamDisturbed):
* testing/Internals.h:
* testing/Internals.idl:
LayoutTests:
* streams/reference-implementation/abstract-ops-expected.txt: Updated expectations.
* streams/reference-implementation/abstract-ops.html: Use internals to export IsReadableStreamDisturbed to the
tests.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsstreamsreferenceimplementationabstractopsexpectedtxt">trunk/LayoutTests/streams/reference-implementation/abstract-ops-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstreamsreferenceimplementationabstractopshtml">trunk/LayoutTests/streams/reference-implementation/abstract-ops.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsReadableStreamjs">trunk/Source/WebCore/Modules/streams/ReadableStream.js</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsReadableStreamInternalsjs">trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js</a></li>
<li><a href="#trunkSourceWebCorebindingsjsWebCoreBuiltinNamesh">trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsidl">trunk/Source/WebCore/testing/Internals.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (192620 => 192621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-11-19 09:14:36 UTC (rev 192620)
+++ trunk/LayoutTests/ChangeLog 2015-11-19 09:21:47 UTC (rev 192621)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-11-19 Xabier Rodriguez Calvar <calvaris@igalia.com>
+
+ [Streams API] Implement IsReadableStreamDisturbed according to spec
+ https://bugs.webkit.org/show_bug.cgi?id=151356
+
+ Reviewed by Darin Adler.
+
+ * streams/reference-implementation/abstract-ops-expected.txt: Updated expectations.
+ * streams/reference-implementation/abstract-ops.html: Use internals to export IsReadableStreamDisturbed to the
+ tests.
+
</ins><span class="cx"> 2015-11-19 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: Populate indexes created in object stores that already have records.
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsreferenceimplementationabstractopsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/reference-implementation/abstract-ops-expected.txt (192620 => 192621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/reference-implementation/abstract-ops-expected.txt 2015-11-19 09:14:36 UTC (rev 192620)
+++ trunk/LayoutTests/streams/reference-implementation/abstract-ops-expected.txt 2015-11-19 09:21:47 UTC (rev 192621)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><span class="cx">
</span><del>-FAIL IsReadableStreamDisturbed returns true for an empty non-closed stream on which read() has been called Can't find variable: IsReadableStreamDisturbed
-FAIL IsReadableStreamDisturbed returns true for an empty non-closed stream on which cancel() has been called Can't find variable: IsReadableStreamDisturbed
-FAIL IsReadableStreamDisturbed returns true for a closed stream on which read() has been called Can't find variable: IsReadableStreamDisturbed
-FAIL IsReadableStreamDisturbed returns true for a closed stream on which cancel() has been called Can't find variable: IsReadableStreamDisturbed
-FAIL IsReadableStreamDisturbed returns true for an errored stream on which read() has been called Can't find variable: IsReadableStreamDisturbed
-FAIL IsReadableStreamDisturbed returns true for an errored stream on which cancel() has been called Can't find variable: IsReadableStreamDisturbed
</del><ins>+PASS IsReadableStreamDisturbed returns true for an empty non-closed stream on which read() has been called
+PASS IsReadableStreamDisturbed returns true for an empty non-closed stream on which cancel() has been called
+PASS IsReadableStreamDisturbed returns true for a closed stream on which read() has been called
+PASS IsReadableStreamDisturbed returns true for a closed stream on which cancel() has been called
+PASS IsReadableStreamDisturbed returns true for an errored stream on which read() has been called
+PASS IsReadableStreamDisturbed returns true for an errored stream on which cancel() has been called
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsreferenceimplementationabstractopshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/reference-implementation/abstract-ops.html (192620 => 192621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/reference-implementation/abstract-ops.html 2015-11-19 09:14:36 UTC (rev 192620)
+++ trunk/LayoutTests/streams/reference-implementation/abstract-ops.html 2015-11-19 09:21:47 UTC (rev 192621)
</span><span class="lines">@@ -4,6 +4,8 @@
</span><span class="cx"> <script src='resources/streams-utils.js'></script>
</span><span class="cx"> <!-- FIXME: enable IsReadableStreamDisturbed -->
</span><span class="cx"> <script>
</span><ins>+const IsReadableStreamDisturbed = internals.isReadableStreamDisturbed.bind(internals);
+
</ins><span class="cx"> // This is updated till https://github.com/whatwg/streams/commit/ec5ffa036308d9f6350d2946560d48cdbf090939
</span><span class="cx">
</span><span class="cx"> test(function() {
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192620 => 192621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-19 09:14:36 UTC (rev 192620)
+++ trunk/Source/WebCore/ChangeLog 2015-11-19 09:21:47 UTC (rev 192621)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-11-19 Xabier Rodriguez Calvar <calvaris@igalia.com>
+
+ [Streams API] Implement IsReadableStreamDisturbed according to spec
+ https://bugs.webkit.org/show_bug.cgi?id=151356
+
+ Reviewed by Darin Adler.
+
+ Implemente IsReadableStreamDisturbed according to the spec. This is an internal function to be used by other
+ internal implementations.
+
+ The function is exported as internals to be tested.
+
+ Test: streams/reference-implementation/abstract-ops.html.
+
+ * Modules/streams/ReadableStream.js:
+ (initializeReadableStream):
+ * Modules/streams/ReadableStreamInternals.js:
+ (cancelReadableStream):
+ (readFromReadableStreamReader):
+ (isReadableStreamDisturbed):
+ * bindings/js/WebCoreBuiltinNames.h:
+ * testing/Internals.cpp:
+ (WebCore::Internals::isReadableStreamDisturbed):
+ * testing/Internals.h:
+ * testing/Internals.idl:
+
</ins><span class="cx"> 2015-11-19 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> XHR should not combine empty content-type value with default one
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStream.js (192620 => 192621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStream.js 2015-11-19 09:14:36 UTC (rev 192620)
+++ trunk/Source/WebCore/Modules/streams/ReadableStream.js 2015-11-19 09:21:47 UTC (rev 192621)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> this.@pulling = false;
</span><span class="cx"> this.@reader = undefined;
</span><span class="cx"> this.@storedError = undefined;
</span><ins>+ this.@disturbed = false;
</ins><span class="cx"> this.@controller = new @ReadableStreamController(this);
</span><span class="cx"> this.@strategy = @validateAndNormalizeQueuingStrategy(strategy.size, strategy.highWaterMark);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamInternalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js (192620 => 192621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js 2015-11-19 09:14:36 UTC (rev 192620)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js 2015-11-19 09:21:47 UTC (rev 192621)
</span><span class="lines">@@ -266,6 +266,7 @@
</span><span class="cx"> {
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><ins>+ stream.@disturbed = true;
</ins><span class="cx"> if (stream.@state === @streamClosed)
</span><span class="cx"> return @Promise.@resolve();
</span><span class="cx"> if (stream.@state === @streamErrored)
</span><span class="lines">@@ -340,6 +341,7 @@
</span><span class="cx">
</span><span class="cx"> const stream = reader.@ownerReadableStream;
</span><span class="cx"> @assert(!!stream);
</span><ins>+ stream.@disturbed = true;
</ins><span class="cx"> if (stream.@state === @streamClosed)
</span><span class="cx"> return @Promise.@resolve({value: undefined, done: true});
</span><span class="cx"> if (stream.@state === @streamErrored)
</span><span class="lines">@@ -358,3 +360,11 @@
</span><span class="cx"> @requestReadableStreamPull(stream);
</span><span class="cx"> return readPromiseCapability.@promise;
</span><span class="cx"> }
</span><ins>+
+function isReadableStreamDisturbed(stream)
+{
+ "use strict";
+
+ @assert(@isReadableStream(stream));
+ return stream.@disturbed;
+}
</ins></span></pre></div>
<a id="trunkSourceWebCorebindingsjsWebCoreBuiltinNamesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h (192620 => 192621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h 2015-11-19 09:14:36 UTC (rev 192620)
+++ trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h 2015-11-19 09:21:47 UTC (rev 192621)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> macro(closedPromiseCapability) \
</span><span class="cx"> macro(controlledReadableStream) \
</span><span class="cx"> macro(controller) \
</span><ins>+ macro(disturbed) \
</ins><span class="cx"> macro(getUserMediaFromJS) \
</span><span class="cx"> macro(ownerReadableStream) \
</span><span class="cx"> macro(privateGetStats) \
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (192620 => 192621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2015-11-19 09:14:36 UTC (rev 192620)
+++ trunk/Source/WebCore/testing/Internals.cpp 2015-11-19 09:21:47 UTC (rev 192621)
</span><span class="lines">@@ -114,6 +114,7 @@
</span><span class="cx"> #include "TypeConversions.h"
</span><span class="cx"> #include "UserMediaController.h"
</span><span class="cx"> #include "ViewportArguments.h"
</span><ins>+#include "WebCoreJSClientData.h"
</ins><span class="cx"> #include "WorkerThread.h"
</span><span class="cx"> #include "XMLHttpRequest.h"
</span><span class="cx"> #include <JavaScriptCore/Profile.h>
</span><span class="lines">@@ -199,10 +200,17 @@
</span><span class="cx"> #include "MediaPlaybackTargetContext.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+using JSC::CallData;
+using JSC::CallType;
</ins><span class="cx"> using JSC::CodeBlock;
</span><span class="cx"> using JSC::FunctionExecutable;
</span><ins>+using JSC::Identifier;
</ins><span class="cx"> using JSC::JSFunction;
</span><ins>+using JSC::JSGlobalObject;
+using JSC::JSObject;
</ins><span class="cx"> using JSC::JSValue;
</span><ins>+using JSC::MarkedArgumentBuffer;
+using JSC::PropertySlot;
</ins><span class="cx"> using JSC::ScriptExecutable;
</span><span class="cx"> using JSC::StackVisitor;
</span><span class="cx">
</span><span class="lines">@@ -3191,4 +3199,29 @@
</span><span class="cx"> page->setShowAllPlugins(show);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(STREAMS_API)
+bool Internals::isReadableStreamDisturbed(ScriptState& state, JSValue stream)
+{
+ JSGlobalObject* globalObject = state.vmEntryGlobalObject();
+ JSVMClientData* clientData = static_cast<JSVMClientData*>(state.vm().clientData);
+ const Identifier& privateName = clientData->builtinFunctions().readableStreamInternalsBuiltins().isReadableStreamDisturbedPrivateName();
+ JSValue value;
+ PropertySlot propertySlot(value);
+ globalObject->fastGetOwnPropertySlot(&state, state.vm(), *globalObject->structure(), privateName, propertySlot);
+ value = propertySlot.getValue(&state, privateName);
+ ASSERT(value.isFunction());
+
+ JSObject* function = value.getObject();
+ CallData callData;
+ CallType callType = JSC::getCallData(function, callData);
+ ASSERT(callType != JSC::CallTypeNone);
+ MarkedArgumentBuffer arguments;
+ arguments.append(stream);
+ JSValue returnedValue = JSC::call(&state, function, callType, callData, JSC::jsUndefined(), arguments);
+ ASSERT(returnedValue.isBoolean());
+
+ return returnedValue.asBoolean();
</ins><span class="cx"> }
</span><ins>+#endif
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (192620 => 192621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2015-11-19 09:14:36 UTC (rev 192620)
+++ trunk/Source/WebCore/testing/Internals.h 2015-11-19 09:21:47 UTC (rev 192621)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "ExceptionCodePlaceholder.h"
</span><span class="cx"> #include "NodeList.h"
</span><span class="cx"> #include "PageConsoleClient.h"
</span><ins>+#include "ScriptState.h"
</ins><span class="cx"> #include <bindings/ScriptValue.h>
</span><span class="cx"> #include <runtime/ArrayBuffer.h>
</span><span class="cx"> #include <runtime/Float32Array.h>
</span><span class="lines">@@ -442,6 +443,10 @@
</span><span class="cx"> String userVisibleString(const DOMURL*);
</span><span class="cx"> void setShowAllPlugins(bool);
</span><span class="cx">
</span><ins>+#if ENABLE(STREAMS_API)
+ bool isReadableStreamDisturbed(ScriptState&, JSC::JSValue);
+#endif
+
</ins><span class="cx"> private:
</span><span class="cx"> explicit Internals(Document*);
</span><span class="cx"> Document* contextDocument() const;
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (192620 => 192621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2015-11-19 09:14:36 UTC (rev 192620)
+++ trunk/Source/WebCore/testing/Internals.idl 2015-11-19 09:21:47 UTC (rev 192621)
</span><span class="lines">@@ -409,4 +409,6 @@
</span><span class="cx"> DOMString userVisibleString(DOMURL url);
</span><span class="cx">
</span><span class="cx"> void setShowAllPlugins(boolean showAll);
</span><ins>+
+ [Conditional=STREAMS_API, CallWith=ScriptState] boolean isReadableStreamDisturbed(any stream);
</ins><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>