<!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>[173898] branches/safari-600.1-branch/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/173898">173898</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-09-23 16:07:28 -0700 (Tue, 23 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rollout 173848. rdar://problem/12708225</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebCoreChangeLog">branches/safari-600.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreModuleswebsocketsWebSocketChannelcpp">branches/safari-600.1-branch/Source/WebCore/Modules/websockets/WebSocketChannel.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (173897 => 173898)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-09-23 22:30:50 UTC (rev 173897)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-09-23 23:07:28 UTC (rev 173898)
</span><span class="lines">@@ -1,5 +1,9 @@
</span><span class="cx"> 2014-09-23 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Rollout trunk r173848 | (r173897 on branch)
+
+2014-09-23 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r173848
</span><span class="cx">
</span><span class="cx"> 2014-09-22 Alexey Proskuryakov <ap@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreModuleswebsocketsWebSocketChannelcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/Modules/websockets/WebSocketChannel.cpp (173897 => 173898)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2014-09-23 22:30:50 UTC (rev 173897)
+++ branches/safari-600.1-branch/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2014-09-23 23:07:28 UTC (rev 173898)
</span><span class="lines">@@ -85,13 +85,10 @@
</span><span class="cx"> {
</span><span class="cx"> if (Page* page = m_document->page())
</span><span class="cx"> m_identifier = page->progress().createUniqueIdentifier();
</span><del>-
- LOG(Network, "WebSocketChannel %p ctor, identifier %lu", this, m_identifier);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebSocketChannel::~WebSocketChannel()
</span><span class="cx"> {
</span><del>- LOG(Network, "WebSocketChannel %p dtor", this);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebSocketChannel::connect(const URL& url, const String& protocol)
</span><span class="lines">@@ -184,7 +181,6 @@
</span><span class="cx"> ASSERT(!m_suspended);
</span><span class="cx"> if (!m_handle)
</span><span class="cx"> return;
</span><del>- Ref<WebSocketChannel> protect(*this); // An attempt to send closing handshake may fail, which will get the channel closed and dereferenced.
</del><span class="cx"> startClosingHandshake(code, reason);
</span><span class="cx"> if (m_closing && !m_closingTimer.isActive())
</span><span class="cx"> m_closingTimer.startOneShot(2 * TCPMaximumSegmentLifetime);
</span><span class="lines">@@ -212,8 +208,6 @@
</span><span class="cx">
</span><span class="cx"> if (m_handle && !m_closed)
</span><span class="cx"> m_handle->disconnect(); // Will call didClose().
</span><del>-
- ASSERT(m_closed);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebSocketChannel::disconnect()
</span><span class="lines">@@ -464,7 +458,6 @@
</span><span class="cx"> void WebSocketChannel::startClosingHandshake(int code, const String& reason)
</span><span class="cx"> {
</span><span class="cx"> LOG(Network, "WebSocketChannel %p startClosingHandshake() code=%d m_receivedClosingHandshake=%d", this, m_closing, m_receivedClosingHandshake);
</span><del>- ASSERT(!m_closed);
</del><span class="cx"> if (m_closing)
</span><span class="cx"> return;
</span><span class="cx"> ASSERT(m_handle);
</span><span class="lines">@@ -478,14 +471,8 @@
</span><span class="cx"> buf.append(reason.utf8().data(), reason.utf8().length());
</span><span class="cx"> }
</span><span class="cx"> enqueueRawFrame(WebSocketFrame::OpCodeClose, buf.data(), buf.size());
</span><del>- Ref<WebSocketChannel> protect(*this); // An attempt to send closing handshake may fail, which will get the channel closed and dereferenced.
</del><span class="cx"> processOutgoingFrameQueue();
</span><span class="cx">
</span><del>- if (m_closed) {
- // The channel got closed because processOutgoingFrameQueue() failed.
- return;
- }
-
</del><span class="cx"> m_closing = true;
</span><span class="cx"> if (m_client)
</span><span class="cx"> m_client->didStartClosingHandshake();
</span><span class="lines">@@ -719,8 +706,6 @@
</span><span class="cx"> if (m_outgoingFrameQueueStatus == OutgoingFrameQueueClosed)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- Ref<WebSocketChannel> protect(*this); // Any call to fail() will get the channel closed and dereferenced.
-
</del><span class="cx"> while (!m_outgoingFrameQueue.isEmpty()) {
</span><span class="cx"> OwnPtr<QueuedFrame> frame = m_outgoingFrameQueue.takeFirst();
</span><span class="cx"> switch (frame->frameType) {
</span></span></pre>
</div>
</div>
</body>
</html>