<!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>[212733] trunk/Source/WebKit2</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/212733">212733</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-21 11:34:50 -0800 (Tue, 21 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebRTC] NetworkRTCMonitor should ensure clearing its manager only once
https://bugs.webkit.org/show_bug.cgi?id=168661
Patch by Youenn Fablet <youenn@apple.com> on 2017-02-21
Reviewed by Alex Christensen.
Making sure NetworkRTCMonitor manager is cleared only once.
ALso ensuring that manager does not get destroyed as part of NetworkRTCMonitor destructor.
The manager needs to be destroyed in the RTC network thread.
* NetworkProcess/webrtc/NetworkRTCMonitor.cpp:
(WebKit::NetworkRTCMonitor::~NetworkRTCMonitor):
(WebKit::NetworkRTCMonitor::stopUpdating):
* NetworkProcess/webrtc/NetworkRTCMonitor.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesswebrtcNetworkRTCMonitorcpp">trunk/Source/WebKit2/NetworkProcess/webrtc/NetworkRTCMonitor.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesswebrtcNetworkRTCMonitorh">trunk/Source/WebKit2/NetworkProcess/webrtc/NetworkRTCMonitor.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (212732 => 212733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-02-21 19:29:10 UTC (rev 212732)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-21 19:34:50 UTC (rev 212733)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2017-02-21 Youenn Fablet <youenn@apple.com>
+
+ [WebRTC] NetworkRTCMonitor should ensure clearing its manager only once
+ https://bugs.webkit.org/show_bug.cgi?id=168661
+
+ Reviewed by Alex Christensen.
+
+ Making sure NetworkRTCMonitor manager is cleared only once.
+ ALso ensuring that manager does not get destroyed as part of NetworkRTCMonitor destructor.
+ The manager needs to be destroyed in the RTC network thread.
+
+ * NetworkProcess/webrtc/NetworkRTCMonitor.cpp:
+ (WebKit::NetworkRTCMonitor::~NetworkRTCMonitor):
+ (WebKit::NetworkRTCMonitor::stopUpdating):
+ * NetworkProcess/webrtc/NetworkRTCMonitor.h:
+
</ins><span class="cx"> 2017-02-21 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [WebRTC][Mac][WebKit2] Revise sandbox to limit connections to UDP and TCP
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesswebrtcNetworkRTCMonitorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/webrtc/NetworkRTCMonitor.cpp (212732 => 212733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/webrtc/NetworkRTCMonitor.cpp 2017-02-21 19:29:10 UTC (rev 212732)
+++ trunk/Source/WebKit2/NetworkProcess/webrtc/NetworkRTCMonitor.cpp 2017-02-21 19:34:50 UTC (rev 212733)
</span><span class="lines">@@ -35,6 +35,11 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+NetworkRTCMonitor::~NetworkRTCMonitor()
+{
+ ASSERT(!m_manager);
+}
+
</ins><span class="cx"> void NetworkRTCMonitor::startUpdating()
</span><span class="cx"> {
</span><span class="cx"> m_isStarted = true;
</span><span class="lines">@@ -49,6 +54,8 @@
</span><span class="cx"> {
</span><span class="cx"> m_isStarted = false;
</span><span class="cx"> m_rtcProvider.callOnRTCNetworkThread([this]() {
</span><ins>+ if (!m_manager)
+ return;
</ins><span class="cx"> m_manager->StopUpdating();
</span><span class="cx"> m_manager = nullptr;
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesswebrtcNetworkRTCMonitorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/webrtc/NetworkRTCMonitor.h (212732 => 212733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/webrtc/NetworkRTCMonitor.h 2017-02-21 19:29:10 UTC (rev 212732)
+++ trunk/Source/WebKit2/NetworkProcess/webrtc/NetworkRTCMonitor.h 2017-02-21 19:34:50 UTC (rev 212733)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> class NetworkRTCMonitor final : public sigslot::has_slots<> {
</span><span class="cx"> public:
</span><span class="cx"> explicit NetworkRTCMonitor(NetworkRTCProvider& rtcProvider) : m_rtcProvider(rtcProvider) { }
</span><ins>+ ~NetworkRTCMonitor();
</ins><span class="cx">
</span><span class="cx"> void didReceiveMessage(IPC::Connection&, IPC::Decoder&);
</span><span class="cx"> void stopUpdating();
</span></span></pre>
</div>
</div>
</body>
</html>