<!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>[200158] 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/200158">200158</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-04-27 16:31:39 -0700 (Wed, 27 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Let the bindings generator use WTF::Optional for optional parameters using [Clamp]
https://bugs.webkit.org/show_bug.cgi?id=157077
Reviewed by Darin Adler.
Let the bindings generator use WTF::Optional for optional parameters using [Clamp],
if they do not have a default value.
* Modules/websockets/WebSocket.cpp:
(WebCore::WebSocket::close):
* Modules/websockets/WebSocket.h:
* Modules/websockets/WebSocket.idl:
* bindings/scripts/CodeGeneratorJS.pm:
(CanUseWTFOptionalForParameter): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketcpp">trunk/Source/WebCore/Modules/websockets/WebSocket.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketh">trunk/Source/WebCore/Modules/websockets/WebSocket.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketidl">trunk/Source/WebCore/Modules/websockets/WebSocket.idl</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestTypedefscpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200157 => 200158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-27 23:24:36 UTC (rev 200157)
+++ trunk/Source/WebCore/ChangeLog 2016-04-27 23:31:39 UTC (rev 200158)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-04-27 Chris Dumez <cdumez@apple.com>
+
+ Let the bindings generator use WTF::Optional for optional parameters using [Clamp]
+ https://bugs.webkit.org/show_bug.cgi?id=157077
+
+ Reviewed by Darin Adler.
+
+ Let the bindings generator use WTF::Optional for optional parameters using [Clamp],
+ if they do not have a default value.
+
+ * Modules/websockets/WebSocket.cpp:
+ (WebCore::WebSocket::close):
+ * Modules/websockets/WebSocket.h:
+ * Modules/websockets/WebSocket.idl:
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (CanUseWTFOptionalForParameter): Deleted.
+
</ins><span class="cx"> 2016-04-26 Ada Chan <adachan@apple.com>
</span><span class="cx">
</span><span class="cx"> Set WebVideoFullscreenInterfaceMac up as a client of WebPlaybackSessionInterfaceMac to listen for playback state changes
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocket.cpp (200157 => 200158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocket.cpp 2016-04-27 23:24:36 UTC (rev 200157)
+++ trunk/Source/WebCore/Modules/websockets/WebSocket.cpp 2016-04-27 23:31:39 UTC (rev 200158)
</span><span class="lines">@@ -375,8 +375,9 @@
</span><span class="cx"> m_channel->send(binaryData);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebSocket::close(int code, const String& reason, ExceptionCode& ec)
</del><ins>+void WebSocket::close(Optional<unsigned short> optionalCode, const String& reason, ExceptionCode& ec)
</ins><span class="cx"> {
</span><ins>+ int code = optionalCode ? optionalCode.value() : static_cast<int>(WebSocketChannel::CloseEventCodeNotSpecified);
</ins><span class="cx"> if (code == WebSocketChannel::CloseEventCodeNotSpecified)
</span><span class="cx"> LOG(Network, "WebSocket %p close() without code and reason", this);
</span><span class="cx"> else {
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocket.h (200157 => 200158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocket.h 2016-04-27 23:24:36 UTC (rev 200157)
+++ trunk/Source/WebCore/Modules/websockets/WebSocket.h 2016-04-27 23:31:39 UTC (rev 200158)
</span><span class="lines">@@ -76,9 +76,7 @@
</span><span class="cx"> void send(JSC::ArrayBufferView*, ExceptionCode&);
</span><span class="cx"> void send(Blob&, ExceptionCode&);
</span><span class="cx">
</span><del>- void close(int code, const String& reason, ExceptionCode&);
- void close(ExceptionCode& ec) { close(WebSocketChannel::CloseEventCodeNotSpecified, String(), ec); }
- void close(int code, ExceptionCode& ec) { close(code, String(), ec); }
</del><ins>+ void close(Optional<unsigned short> code, const String& reason, ExceptionCode&);
</ins><span class="cx">
</span><span class="cx"> const URL& url() const;
</span><span class="cx"> State readyState() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocket.idl (200157 => 200158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocket.idl 2016-04-27 23:24:36 UTC (rev 200157)
+++ trunk/Source/WebCore/Modules/websockets/WebSocket.idl 2016-04-27 23:31:39 UTC (rev 200158)
</span><span class="lines">@@ -67,5 +67,5 @@
</span><span class="cx"> [RaisesException] void send(Blob data);
</span><span class="cx"> [RaisesException] void send(DOMString data);
</span><span class="cx">
</span><del>- [RaisesException] void close([Clamp] optional unsigned short code, optional DOMString reason);
</del><ins>+ [RaisesException] void close([Clamp] optional unsigned short code, optional DOMString reason = null);
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (200157 => 200158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-04-27 23:24:36 UTC (rev 200157)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-04-27 23:31:39 UTC (rev 200158)
</span><span class="lines">@@ -3377,7 +3377,6 @@
</span><span class="cx">
</span><span class="cx"> # FIXME: We should progressively stop blacklisting each type below
</span><span class="cx"> # and eventually get rid of this function entirely.
</span><del>- return 0 if $parameter->extendedAttributes->{"Clamp"};
</del><span class="cx"> return 0 if $parameter->isVariadic;
</span><span class="cx"> return 0 if $codeGenerator->IsCallbackInterface($type);
</span><span class="cx"> return 0 if $codeGenerator->IsEnumType($type);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestTypedefscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp (200157 => 200158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2016-04-27 23:24:36 UTC (rev 200157)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2016-04-27 23:31:39 UTC (rev 200158)
</span><span class="lines">@@ -553,14 +553,7 @@
</span><span class="cx"> unsigned long long arg1 = toUInt64(state, state->argument(0), Clamp);
</span><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>-
- size_t argsCount = state->argumentCount();
- if (argsCount <= 1) {
- impl.funcWithClamp(arg1);
- return JSValue::encode(jsUndefined());
- }
-
- unsigned long long arg2 = toUInt64(state, state->argument(1), Clamp);
</del><ins>+ Optional<unsigned long long> arg2 = state->argument(1).isUndefined() ? Optional<unsigned long long>() : toUInt64(state, state->uncheckedArgument(1), Clamp);
</ins><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.funcWithClamp(arg1, arg2);
</span></span></pre>
</div>
</div>
</body>
</html>