<!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>[186257] trunk/Source/WebCore</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/186257">186257</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2015-07-03 00:28:08 -0700 (Fri, 03 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Streams API] Remove ReadableStream and Reader cancel() custom binding
https://bugs.webkit.org/show_bug.cgi?id=146458
Reviewed by Darin Adler.
Removed stream and reader cancel custom binding.
Updated binding generator to correctly handle promise-based APIs with optional parameters.
No behavior changes.
* Modules/streams/ReadableStream.idl: Removed custom
* Modules/streams/ReadableStreamReader.idl: Ditto.
* bindings/js/JSReadableStreamCustom.cpp:
(WebCore::JSReadableStream::cancel): Deleted.
* bindings/js/JSReadableStreamReaderCustom.cpp:
(WebCore::JSReadableStreamReader::cancel): Deleted.
* bindings/scripts/CodeGeneratorJS.pm: Handling of promise parameter in case of optional arguments.
(GenerateParametersCheck):
(GenerateReturnParameters): Utility function to generate return parameters (exception and promise).
* bindings/scripts/test/JS/JSTestObj.cpp:
(WebCore::jsTestObjPrototypeFunctionTestPromiseFunctionWithOptionalIntArgument):
(WebCore::jsTestObjPrototypeFunctionTestPromiseFunctionWithOptionalIntArgumentPromise):
* bindings/scripts/test/TestObj.idl:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsReadableStreamidl">trunk/Source/WebCore/Modules/streams/ReadableStream.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsReadableStreamReaderidl">trunk/Source/WebCore/Modules/streams/ReadableStreamReader.idl</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSReadableStreamCustomcpp">trunk/Source/WebCore/bindings/js/JSReadableStreamCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSReadableStreamReaderCustomcpp">trunk/Source/WebCore/bindings/js/JSReadableStreamReaderCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestTestObjidl">trunk/Source/WebCore/bindings/scripts/test/TestObj.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186256 => 186257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-03 03:34:36 UTC (rev 186256)
+++ trunk/Source/WebCore/ChangeLog 2015-07-03 07:28:08 UTC (rev 186257)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-07-03 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ [Streams API] Remove ReadableStream and Reader cancel() custom binding
+ https://bugs.webkit.org/show_bug.cgi?id=146458
+
+ Reviewed by Darin Adler.
+
+ Removed stream and reader cancel custom binding.
+ Updated binding generator to correctly handle promise-based APIs with optional parameters.
+
+ No behavior changes.
+
+ * Modules/streams/ReadableStream.idl: Removed custom
+ * Modules/streams/ReadableStreamReader.idl: Ditto.
+ * bindings/js/JSReadableStreamCustom.cpp:
+ (WebCore::JSReadableStream::cancel): Deleted.
+ * bindings/js/JSReadableStreamReaderCustom.cpp:
+ (WebCore::JSReadableStreamReader::cancel): Deleted.
+ * bindings/scripts/CodeGeneratorJS.pm: Handling of promise parameter in case of optional arguments.
+ (GenerateParametersCheck):
+ (GenerateReturnParameters): Utility function to generate return parameters (exception and promise).
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ (WebCore::jsTestObjPrototypeFunctionTestPromiseFunctionWithOptionalIntArgument):
+ (WebCore::jsTestObjPrototypeFunctionTestPromiseFunctionWithOptionalIntArgumentPromise):
+ * bindings/scripts/test/TestObj.idl:
+
+
</ins><span class="cx"> 2015-07-02 Doug Russell <d_russell@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Selection change as a result of focusing an element should include that
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStream.idl (186256 => 186257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStream.idl 2015-07-03 03:34:36 UTC (rev 186256)
+++ trunk/Source/WebCore/Modules/streams/ReadableStream.idl 2015-07-03 07:28:08 UTC (rev 186257)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> Conditional=STREAMS_API,
</span><span class="cx"> SkipVTableValidation
</span><span class="cx"> ] interface ReadableStream {
</span><del>- [Custom] Promise cancel(any reason);
</del><ins>+ [RaisesException] Promise cancel([Default=Undefined] optional any reason);
</ins><span class="cx"> [RaisesException] ReadableStreamReader getReader();
</span><span class="cx"> [Custom] Promise pipeTo(any streams, any options);
</span><span class="cx"> [Custom] Object pipeThrough(any dest, any options);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamReaderidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamReader.idl (186256 => 186257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamReader.idl 2015-07-03 03:34:36 UTC (rev 186256)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamReader.idl 2015-07-03 07:28:08 UTC (rev 186257)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> SkipVTableValidation
</span><span class="cx"> ] interface ReadableStreamReader {
</span><span class="cx"> [Custom] Object read();
</span><del>- [Custom] Promise cancel(any reason);
</del><ins>+ Promise cancel([Default=Undefined] optional any reason);
</ins><span class="cx"> [RaisesException] void releaseLock();
</span><span class="cx">
</span><span class="cx"> [CustomGetter] readonly attribute Promise closed;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSReadableStreamCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSReadableStreamCustom.cpp (186256 => 186257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSReadableStreamCustom.cpp 2015-07-03 03:34:36 UTC (rev 186256)
+++ trunk/Source/WebCore/bindings/js/JSReadableStreamCustom.cpp 2015-07-03 07:28:08 UTC (rev 186257)
</span><span class="lines">@@ -47,19 +47,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-JSValue JSReadableStream::cancel(ExecState* exec)
-{
- // FIXME: We should be able to remove this custom binding, once we can pass a JSValue or a ScriptValue.
- ExceptionCode ec = 0;
- JSPromiseDeferred& promiseDeferred = *JSPromiseDeferred::create(exec, globalObject());
- impl().cancel(exec->argument(0), DeferredWrapper(exec, globalObject(), &promiseDeferred), ec);
-
- if (ec)
- DeferredWrapper(exec, globalObject(), &promiseDeferred).reject(ec);
-
- return promiseDeferred.promise();
-}
-
</del><span class="cx"> JSValue JSReadableStream::pipeTo(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue error = createError(exec, ASCIILiteral("pipeTo is not implemented"));
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSReadableStreamReaderCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSReadableStreamReaderCustom.cpp (186256 => 186257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSReadableStreamReaderCustom.cpp 2015-07-03 03:34:36 UTC (rev 186256)
+++ trunk/Source/WebCore/bindings/js/JSReadableStreamReaderCustom.cpp 2015-07-03 07:28:08 UTC (rev 186257)
</span><span class="lines">@@ -77,14 +77,6 @@
</span><span class="cx"> return m_closedPromiseDeferred->promise();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JSReadableStreamReader::cancel(ExecState* exec)
-{
- // FIXME: We should be able to remove this custom binding, once we can pass a JSValue or a ScriptValue.
- JSPromiseDeferred& promiseDeferred = *JSPromiseDeferred::create(exec, globalObject());
- impl().cancel(exec->argument(0), DeferredWrapper(exec, globalObject(), &promiseDeferred));
- return promiseDeferred.promise();
-}
-
</del><span class="cx"> EncodedJSValue JSC_HOST_CALL constructJSReadableStreamReader(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> if (!exec->argumentCount())
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (186256 => 186257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2015-07-03 03:34:36 UTC (rev 186256)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2015-07-03 07:28:08 UTC (rev 186257)
</span><span class="lines">@@ -3243,7 +3243,7 @@
</span><span class="cx"> push(@$outputArray, " if (argsCount <= $argsIndex) {\n");
</span><span class="cx">
</span><span class="cx"> my @optionalCallbackArguments = @arguments;
</span><del>- push(@optionalCallbackArguments, "ec") if $raisesException;
</del><ins>+ push @optionalCallbackArguments, GenerateReturnParameters($function);
</ins><span class="cx"> my $functionString = "$functionName(" . join(", ", @optionalCallbackArguments) . ")";
</span><span class="cx"> GenerateImplementationFunctionCall($function, $functionString, " " x 2, $svgPropertyType, $interfaceName);
</span><span class="cx"> push(@$outputArray, " }\n\n");
</span><span class="lines">@@ -3411,13 +3411,21 @@
</span><span class="cx"> $argsIndex++;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- push(@arguments, "DeferredWrapper(exec, castedThis->globalObject(), promiseDeferred)") if IsReturningPromise($function);
</del><ins>+ push @arguments, GenerateReturnParameters($function);
</ins><span class="cx">
</span><del>- push(@arguments, "ec") if $raisesException;
-
</del><span class="cx"> return ("$functionName(" . join(", ", @arguments) . ")", scalar @arguments);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+sub GenerateReturnParameters
+{
+ my $function = shift;
+ my @arguments;
+
+ push(@arguments, "DeferredWrapper(exec, castedThis->globalObject(), promiseDeferred)") if IsReturningPromise($function);
+ push(@arguments, "ec") if $function->signature->extendedAttributes->{"RaisesException"};
+ return @arguments;
+}
+
</ins><span class="cx"> sub GenerateCallbackHeader
</span><span class="cx"> {
</span><span class="cx"> my $object = shift;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (186256 => 186257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2015-07-03 03:34:36 UTC (rev 186256)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2015-07-03 07:28:08 UTC (rev 186257)
</span><span class="lines">@@ -159,6 +159,7 @@
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionTestPromiseFunction(JSC::ExecState*);
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionTestPromiseFunctionWithFloatArgument(JSC::ExecState*);
</span><span class="cx"> JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionTestPromiseFunctionWithException(JSC::ExecState*);
</span><ins>+JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionTestPromiseFunctionWithOptionalIntArgument(JSC::ExecState*);
</ins><span class="cx">
</span><span class="cx"> // Attributes
</span><span class="cx">
</span><span class="lines">@@ -656,6 +657,7 @@
</span><span class="cx"> { "testPromiseFunction", JSC::Function, NoIntrinsic, (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionTestPromiseFunction), (intptr_t) (0) },
</span><span class="cx"> { "testPromiseFunctionWithFloatArgument", JSC::Function, NoIntrinsic, (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionTestPromiseFunctionWithFloatArgument), (intptr_t) (1) },
</span><span class="cx"> { "testPromiseFunctionWithException", JSC::Function, NoIntrinsic, (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionTestPromiseFunctionWithException), (intptr_t) (0) },
</span><ins>+ { "testPromiseFunctionWithOptionalIntArgument", JSC::Function, NoIntrinsic, (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionTestPromiseFunctionWithOptionalIntArgument), (intptr_t) (0) },
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> const ClassInfo JSTestObjPrototype::s_info = { "TestObjectPrototype", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestObjPrototype) };
</span><span class="lines">@@ -4496,6 +4498,34 @@
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline EncodedJSValue jsTestObjPrototypeFunctionTestPromiseFunctionWithOptionalIntArgumentPromise(ExecState*, JSTestObj*, JSPromiseDeferred*);
+EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionTestPromiseFunctionWithOptionalIntArgument(ExecState* exec)
+{
+ JSValue thisValue = exec->thisValue();
+ JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
+ if (UNLIKELY(!castedThis))
+ return throwThisTypeError(*exec, "TestObj", "testPromiseFunctionWithOptionalIntArgument");
+ ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
+ return JSValue::encode(callPromiseFunction(*exec, *castedThis, jsTestObjPrototypeFunctionTestPromiseFunctionWithOptionalIntArgumentPromise));
+}
+
+static inline EncodedJSValue jsTestObjPrototypeFunctionTestPromiseFunctionWithOptionalIntArgumentPromise(ExecState* exec, JSTestObj* castedThis, JSPromiseDeferred* promiseDeferred)
+{
+ auto& impl = castedThis->impl();
+
+ size_t argsCount = exec->argumentCount();
+ if (argsCount <= 0) {
+ impl.testPromiseFunctionWithOptionalIntArgument(DeferredWrapper(exec, castedThis->globalObject(), promiseDeferred));
+ return JSValue::encode(jsUndefined());
+ }
+
+ int a = toInt32(exec, exec->argument(0), NormalConversion);
+ if (UNLIKELY(exec->hadException()))
+ return JSValue::encode(jsUndefined());
+ impl.testPromiseFunctionWithOptionalIntArgument(a, DeferredWrapper(exec, castedThis->globalObject(), promiseDeferred));
+ return JSValue::encode(jsUndefined());
+}
+
</ins><span class="cx"> void JSTestObj::visitChildren(JSCell* cell, SlotVisitor& visitor)
</span><span class="cx"> {
</span><span class="cx"> auto* thisObject = jsCast<JSTestObj*>(cell);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestTestObjidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/TestObj.idl (186256 => 186257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2015-07-03 03:34:36 UTC (rev 186256)
+++ trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2015-07-03 07:28:08 UTC (rev 186257)
</span><span class="lines">@@ -278,6 +278,7 @@
</span><span class="cx"> Promise testPromiseFunction();
</span><span class="cx"> Promise testPromiseFunctionWithFloatArgument(float a);
</span><span class="cx"> [RaisesException] Promise testPromiseFunctionWithException();
</span><ins>+ Promise testPromiseFunctionWithOptionalIntArgument(optional long a);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // The following comment should not generate any code.
</span></span></pre>
</div>
</div>
</body>
</html>