<!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>[199961] 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/199961">199961</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2016-04-24 05:37:43 -0700 (Sun, 24 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Drop [UsePointersEvenForNonNullableObjectArguments] from WebSocket
https://bugs.webkit.org/show_bug.cgi?id=156897
Reviewed by Chris Dumez.
No change of behavior.
Updating WebSocket::send methods to take references, except for ArrayBufferView, which is not yet supported by the binding generator.
* Modules/websockets/WebSocket.cpp:
(WebCore::WebSocket::send):
* Modules/websockets/WebSocket.h:
* Modules/websockets/WebSocket.idl:</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199960 => 199961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-24 02:49:49 UTC (rev 199960)
+++ trunk/Source/WebCore/ChangeLog 2016-04-24 12:37:43 UTC (rev 199961)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-04-24 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ Drop [UsePointersEvenForNonNullableObjectArguments] from WebSocket
+ https://bugs.webkit.org/show_bug.cgi?id=156897
+
+ Reviewed by Chris Dumez.
+
+ No change of behavior.
+
+ Updating WebSocket::send methods to take references, except for ArrayBufferView, which is not yet supported by the binding generator.
+
+ * Modules/websockets/WebSocket.cpp:
+ (WebCore::WebSocket::send):
+ * Modules/websockets/WebSocket.h:
+ * Modules/websockets/WebSocket.idl:
+
</ins><span class="cx"> 2016-04-23 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix issues found by the clang static analyzer
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocket.cpp (199960 => 199961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocket.cpp 2016-04-24 02:49:49 UTC (rev 199960)
+++ trunk/Source/WebCore/Modules/websockets/WebSocket.cpp 2016-04-24 12:37:43 UTC (rev 199961)
</span><span class="lines">@@ -322,22 +322,21 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebSocket::send(ArrayBuffer* binaryData, ExceptionCode& ec)
</del><ins>+void WebSocket::send(ArrayBuffer& binaryData, ExceptionCode& ec)
</ins><span class="cx"> {
</span><del>- LOG(Network, "WebSocket %p send() Sending ArrayBuffer %p", this, binaryData);
- ASSERT(binaryData);
</del><ins>+ LOG(Network, "WebSocket %p send() Sending ArrayBuffer %p", this, &binaryData);
</ins><span class="cx"> if (m_state == CONNECTING) {
</span><span class="cx"> ec = INVALID_STATE_ERR;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (m_state == CLOSING || m_state == CLOSED) {
</span><del>- unsigned payloadSize = binaryData->byteLength();
</del><ins>+ unsigned payloadSize = binaryData.byteLength();
</ins><span class="cx"> m_bufferedAmountAfterClose = saturateAdd(m_bufferedAmountAfterClose, payloadSize);
</span><span class="cx"> m_bufferedAmountAfterClose = saturateAdd(m_bufferedAmountAfterClose, getFramingOverhead(payloadSize));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> ASSERT(m_channel);
</span><del>- m_channel->send(*binaryData, 0, binaryData->byteLength());
</del><ins>+ m_channel->send(binaryData, 0, binaryData.byteLength());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebSocket::send(ArrayBufferView* arrayBufferView, ExceptionCode& ec)
</span><span class="lines">@@ -359,21 +358,21 @@
</span><span class="cx"> m_channel->send(*arrayBuffer, arrayBufferView->byteOffset(), arrayBufferView->byteLength());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebSocket::send(Blob* binaryData, ExceptionCode& ec)
</del><ins>+void WebSocket::send(Blob& binaryData, ExceptionCode& ec)
</ins><span class="cx"> {
</span><del>- LOG(Network, "WebSocket %p send() Sending Blob '%s'", this, binaryData->url().stringCenterEllipsizedToLength().utf8().data());
</del><ins>+ LOG(Network, "WebSocket %p send() Sending Blob '%s'", this, binaryData.url().stringCenterEllipsizedToLength().utf8().data());
</ins><span class="cx"> if (m_state == CONNECTING) {
</span><span class="cx"> ec = INVALID_STATE_ERR;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (m_state == CLOSING || m_state == CLOSED) {
</span><del>- unsigned long payloadSize = static_cast<unsigned long>(binaryData->size());
</del><ins>+ unsigned long payloadSize = static_cast<unsigned long>(binaryData.size());
</ins><span class="cx"> m_bufferedAmountAfterClose = saturateAdd(m_bufferedAmountAfterClose, payloadSize);
</span><span class="cx"> m_bufferedAmountAfterClose = saturateAdd(m_bufferedAmountAfterClose, getFramingOverhead(payloadSize));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> ASSERT(m_channel);
</span><del>- m_channel->send(*binaryData);
</del><ins>+ m_channel->send(binaryData);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebSocket::close(int code, const String& reason, ExceptionCode& ec)
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocket.h (199960 => 199961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocket.h 2016-04-24 02:49:49 UTC (rev 199960)
+++ trunk/Source/WebCore/Modules/websockets/WebSocket.h 2016-04-24 12:37:43 UTC (rev 199961)
</span><span class="lines">@@ -72,9 +72,9 @@
</span><span class="cx"> void connect(const String& url, const Vector<String>& protocols, ExceptionCode&);
</span><span class="cx">
</span><span class="cx"> void send(const String& message, ExceptionCode&);
</span><del>- void send(JSC::ArrayBuffer*, ExceptionCode&);
</del><ins>+ void send(JSC::ArrayBuffer&, ExceptionCode&);
</ins><span class="cx"> void send(JSC::ArrayBufferView*, ExceptionCode&);
</span><del>- void send(Blob*, ExceptionCode&);
</del><ins>+ void send(Blob&, ExceptionCode&);
</ins><span class="cx">
</span><span class="cx"> void close(int code, const String& reason, ExceptionCode&);
</span><span class="cx"> void close(ExceptionCode& ec) { close(WebSocketChannel::CloseEventCodeNotSpecified, String(), ec); }
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocket.idl (199960 => 199961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocket.idl 2016-04-24 02:49:49 UTC (rev 199960)
+++ trunk/Source/WebCore/Modules/websockets/WebSocket.idl 2016-04-24 12:37:43 UTC (rev 199961)
</span><span class="lines">@@ -30,15 +30,14 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> [
</span><del>- Exposed=(Window,Worker),
- EnabledAtRuntime,
- Conditional=WEB_SOCKETS,
</del><span class="cx"> ActiveDOMObject,
</span><ins>+ Conditional=WEB_SOCKETS,
</ins><span class="cx"> Constructor(DOMString url, [Default=Undefined] optional sequence<DOMString>? protocols),
</span><span class="cx"> Constructor(DOMString url, DOMString protocol),
</span><span class="cx"> ConstructorRaisesException,
</span><span class="cx"> ConstructorCallWith=ScriptExecutionContext,
</span><del>- UsePointersEvenForNonNullableObjectArguments,
</del><ins>+ EnabledAtRuntime,
+ Exposed=(Window,Worker),
</ins><span class="cx"> ] interface WebSocket : EventTarget {
</span><span class="cx"> readonly attribute DOMString URL; // Lowercased .url is the one in the spec, but leaving .URL for compatibility reasons.
</span><span class="cx"> readonly attribute DOMString url;
</span></span></pre>
</div>
</div>
</body>
</html>