<!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>[186076] trunk/Source</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/186076">186076</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2015-06-29 12:04:36 -0700 (Mon, 29 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Binding generator should allow using JSC::Value for "any" parameter in lieu of ScriptValue
https://bugs.webkit.org/show_bug.cgi?id=146403
Reviewed by Darin Adler.
Source/JavaScriptCore:
* bindings/ScriptValue.h: Added implicit conversion to JSC::JSValue.
Source/WebCore:
Covered by existing tests.
Enabling new APIs to use JSC::JSValue by using implicit case from ScriptValue to JSC::JSValue.
Updated binding generator to include ScruptValue header in the needed JSXX.cpp files.
Applied approach to ReadableStreamController.error.
* Modules/streams/ReadableStreamController.h:
(WebCore::ReadableStreamController::error):
* Modules/streams/ReadableStreamController.idl:
* bindings/js/JSReadableStreamControllerCustom.cpp:
(WebCore::constructJSReadableStreamController): Deleted.
* bindings/js/ReadableJSStream.cpp:
(WebCore::ReadableJSStream::error):
* bindings/js/ReadableJSStream.h:
* bindings/scripts/CodeGeneratorJS.pm:
(JSValueToNative):
* bindings/scripts/test/JS/JSTestObj.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebindingsScriptValueh">trunk/Source/JavaScriptCore/bindings/ScriptValue.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsReadableStreamControllerh">trunk/Source/WebCore/Modules/streams/ReadableStreamController.h</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsReadableStreamControlleridl">trunk/Source/WebCore/Modules/streams/ReadableStreamController.idl</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSReadableStreamControllerCustomcpp">trunk/Source/WebCore/bindings/js/JSReadableStreamControllerCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsReadableJSStreamcpp">trunk/Source/WebCore/bindings/js/ReadableJSStream.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsReadableJSStreamh">trunk/Source/WebCore/bindings/js/ReadableJSStream.h</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (186075 => 186076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-06-29 18:56:56 UTC (rev 186075)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-06-29 19:04:36 UTC (rev 186076)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-06-29 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ Binding generator should allow using JSC::Value for "any" parameter in lieu of ScriptValue
+ https://bugs.webkit.org/show_bug.cgi?id=146403
+
+ Reviewed by Darin Adler.
+
+ * bindings/ScriptValue.h: Added implicit conversion to JSC::JSValue.
+
</ins><span class="cx"> 2015-06-28 Aleksandr Skachkov <gskachkov@gmail.com>
</span><span class="cx">
</span><span class="cx"> [ES6] Implement ES6 arrow function syntax. No Line terminator between function parameters and =>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebindingsScriptValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bindings/ScriptValue.h (186075 => 186076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bindings/ScriptValue.h 2015-06-29 18:56:56 UTC (rev 186075)
+++ trunk/Source/JavaScriptCore/bindings/ScriptValue.h 2015-06-29 19:04:36 UTC (rev 186076)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> ScriptValue(JSC::VM& vm, JSC::JSValue value) : m_value(vm, value) { }
</span><span class="cx"> virtual ~ScriptValue();
</span><span class="cx">
</span><ins>+ operator JSC::JSValue() const { return jsValue(); }
</ins><span class="cx"> JSC::JSValue jsValue() const { return m_value.get(); }
</span><span class="cx"> bool getString(JSC::ExecState*, String& result) const;
</span><span class="cx"> String toString(JSC::ExecState*) const;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186075 => 186076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-29 18:56:56 UTC (rev 186075)
+++ trunk/Source/WebCore/ChangeLog 2015-06-29 19:04:36 UTC (rev 186076)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-06-29 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ Binding generator should allow using JSC::Value for "any" parameter in lieu of ScriptValue
+ https://bugs.webkit.org/show_bug.cgi?id=146403
+
+ Reviewed by Darin Adler.
+
+ Covered by existing tests.
+
+ Enabling new APIs to use JSC::JSValue by using implicit case from ScriptValue to JSC::JSValue.
+ Updated binding generator to include ScruptValue header in the needed JSXX.cpp files.
+ Applied approach to ReadableStreamController.error.
+
+ * Modules/streams/ReadableStreamController.h:
+ (WebCore::ReadableStreamController::error):
+ * Modules/streams/ReadableStreamController.idl:
+ * bindings/js/JSReadableStreamControllerCustom.cpp:
+ (WebCore::constructJSReadableStreamController): Deleted.
+ * bindings/js/ReadableJSStream.cpp:
+ (WebCore::ReadableJSStream::error):
+ * bindings/js/ReadableJSStream.h:
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (JSValueToNative):
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+
</ins><span class="cx"> 2015-06-29 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Use DISPATCH_SOURCE_TYPE_MEMORYPRESSURE instead of DISPATCH_SOURCE_TYPE_MEMORYSTATUS
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamController.h (186075 => 186076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamController.h 2015-06-29 18:56:56 UTC (rev 186075)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamController.h 2015-06-29 19:04:36 UTC (rev 186076)
</span><span class="lines">@@ -48,6 +48,9 @@
</span><span class="cx">
</span><span class="cx"> ReadableJSStream& stream() { return m_stream; }
</span><span class="cx">
</span><ins>+ void error(JSC::ExecState* state, ExceptionCode& ec) { m_stream.error(*state, ec); }
+ void error(JSC::ExecState* state, JSC::JSValue, ExceptionCode& ec) { m_stream.error(*state, ec); }
+
</ins><span class="cx"> void ref() { m_stream.ref(); }
</span><span class="cx"> void deref() { m_stream.deref(); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamControlleridl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamController.idl (186075 => 186076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamController.idl 2015-06-29 18:56:56 UTC (rev 186075)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamController.idl 2015-06-29 19:04:36 UTC (rev 186076)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> ] interface ReadableStreamController {
</span><span class="cx"> [Custom, RaisesException] boolean enqueue(any chunk);
</span><span class="cx"> [RaisesException] void close();
</span><del>- [Custom, RaisesException] void error(any error);
</del><ins>+ [CallWith=ScriptState, RaisesException] void error(optional any error);
</ins><span class="cx">
</span><span class="cx"> readonly attribute double desiredSize;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSReadableStreamControllerCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSReadableStreamControllerCustom.cpp (186075 => 186076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSReadableStreamControllerCustom.cpp 2015-06-29 18:56:56 UTC (rev 186075)
+++ trunk/Source/WebCore/bindings/js/JSReadableStreamControllerCustom.cpp 2015-06-29 19:04:36 UTC (rev 186076)
</span><span class="lines">@@ -51,15 +51,6 @@
</span><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JSReadableStreamController::error(ExecState* state)
-{
- ReadableJSStream& stream = impl().stream();
- if (!stream.isReadable())
- return state->vm().throwException(state, createTypeError(state, ASCIILiteral("Calling error on a stream which is not readable")));
- stream.storeError(*state, state->argument(0));
- return jsUndefined();
-}
-
</del><span class="cx"> EncodedJSValue JSC_HOST_CALL constructJSReadableStreamController(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> return throwVMError(exec, createTypeError(exec, ASCIILiteral("ReadableStreamController constructor should not be called directly")));
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsReadableJSStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ReadableJSStream.cpp (186075 => 186076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ReadableJSStream.cpp 2015-06-29 18:56:56 UTC (rev 186075)
+++ trunk/Source/WebCore/bindings/js/ReadableJSStream.cpp 2015-06-29 19:04:36 UTC (rev 186076)
</span><span class="lines">@@ -298,6 +298,15 @@
</span><span class="cx"> changeStateToClosed();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ReadableJSStream::error(JSC::ExecState& state, ExceptionCode& ec)
+{
+ if (!isReadable()) {
+ ec = TypeError;
+ return;
+ }
+ storeError(state, state.argument(0));
+}
+
</ins><span class="cx"> void ReadableJSStream::storeException(JSC::ExecState& state)
</span><span class="cx"> {
</span><span class="cx"> JSValue exception = state.exception()->value();
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsReadableJSStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ReadableJSStream.h (186075 => 186076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ReadableJSStream.h 2015-06-29 18:56:56 UTC (rev 186075)
+++ trunk/Source/WebCore/bindings/js/ReadableJSStream.h 2015-06-29 19:04:36 UTC (rev 186076)
</span><span class="lines">@@ -63,6 +63,7 @@
</span><span class="cx"> JSC::JSValue error() override { return m_error.get(); }
</span><span class="cx">
</span><span class="cx"> void enqueue(JSC::ExecState&);
</span><ins>+ void error(JSC::ExecState&, ExceptionCode&);
</ins><span class="cx">
</span><span class="cx"> double desiredSize() const { return m_highWaterMark - m_totalQueueSize; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (186075 => 186076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2015-06-29 18:56:56 UTC (rev 186075)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2015-06-29 19:04:36 UTC (rev 186076)
</span><span class="lines">@@ -3868,6 +3868,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ($type eq "any") {
</span><ins>+ AddToImplIncludes("<bindings/ScriptValue.h>");
</ins><span class="cx"> return "{ exec->vm(), $value }";
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (186075 => 186076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2015-06-29 18:56:56 UTC (rev 186075)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2015-06-29 19:04:36 UTC (rev 186076)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx"> #include "TestObj.h"
</span><span class="cx"> #include "URL.h"
</span><span class="cx"> #include "bool.h"
</span><ins>+#include <bindings/ScriptValue.h>
</ins><span class="cx"> #include <inspector/ScriptArguments.h>
</span><span class="cx"> #include <inspector/ScriptCallStackFactory.h>
</span><span class="cx"> #include <runtime/Error.h>
</span></span></pre>
</div>
</div>
</body>
</html>