<!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>[165858] 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/165858">165858</a></dd>
<dt>Author</dt> <dd>thiago.lacerda@openbossa.org</dd>
<dt>Date</dt> <dd>2014-03-18 17:28:29 -0700 (Tue, 18 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebRTC] Fix layering violation in RTCStatsRequest
https://bugs.webkit.org/show_bug.cgi?id=130426
Reviewed by Eric Carlson.
RTCStatsRequest::track() should return a MediaStreamTrackPrivate*.
No new tests needed.
* Modules/mediastream/RTCPeerConnection.cpp:
(WebCore::RTCPeerConnection::getStats):
* Modules/mediastream/RTCStatsRequestImpl.cpp:
(WebCore::RTCStatsRequestImpl::create):
(WebCore::RTCStatsRequestImpl::RTCStatsRequestImpl):
(WebCore::RTCStatsRequestImpl::track):
* Modules/mediastream/RTCStatsRequestImpl.h:
* platform/mediastream/RTCStatsRequest.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCStatsRequestImplcpp">trunk/Source/WebCore/Modules/mediastream/RTCStatsRequestImpl.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCStatsRequestImplh">trunk/Source/WebCore/Modules/mediastream/RTCStatsRequestImpl.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRTCStatsRequesth">trunk/Source/WebCore/platform/mediastream/RTCStatsRequest.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165857 => 165858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-19 00:01:41 UTC (rev 165857)
+++ trunk/Source/WebCore/ChangeLog 2014-03-19 00:28:29 UTC (rev 165858)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-03-18 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org>
+
+ [WebRTC] Fix layering violation in RTCStatsRequest
+ https://bugs.webkit.org/show_bug.cgi?id=130426
+
+ Reviewed by Eric Carlson.
+
+ RTCStatsRequest::track() should return a MediaStreamTrackPrivate*.
+
+ No new tests needed.
+
+ * Modules/mediastream/RTCPeerConnection.cpp:
+ (WebCore::RTCPeerConnection::getStats):
+ * Modules/mediastream/RTCStatsRequestImpl.cpp:
+ (WebCore::RTCStatsRequestImpl::create):
+ (WebCore::RTCStatsRequestImpl::RTCStatsRequestImpl):
+ (WebCore::RTCStatsRequestImpl::track):
+ * Modules/mediastream/RTCStatsRequestImpl.h:
+ * platform/mediastream/RTCStatsRequest.h:
+
</ins><span class="cx"> 2014-03-18 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix a trivial FIXME
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (165857 => 165858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2014-03-19 00:01:41 UTC (rev 165857)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2014-03-19 00:28:29 UTC (rev 165858)
</span><span class="lines">@@ -529,7 +529,7 @@
</span><span class="cx">
</span><span class="cx"> void RTCPeerConnection::getStats(PassRefPtr<RTCStatsCallback> successCallback, PassRefPtr<RTCPeerConnectionErrorCallback> errorCallback, PassRefPtr<MediaStreamTrack> selector)
</span><span class="cx"> {
</span><del>- RefPtr<RTCStatsRequestImpl> statsRequest = RTCStatsRequestImpl::create(scriptExecutionContext(), successCallback, errorCallback, selector);
</del><ins>+ RefPtr<RTCStatsRequestImpl> statsRequest = RTCStatsRequestImpl::create(scriptExecutionContext(), successCallback, errorCallback, &selector->privateTrack());
</ins><span class="cx"> // FIXME: Add passing selector as part of the statsRequest.
</span><span class="cx"> m_peerHandler->getStats(statsRequest.release());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCStatsRequestImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCStatsRequestImpl.cpp (165857 => 165858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCStatsRequestImpl.cpp 2014-03-19 00:01:41 UTC (rev 165857)
+++ trunk/Source/WebCore/Modules/mediastream/RTCStatsRequestImpl.cpp 2014-03-19 00:28:29 UTC (rev 165858)
</span><span class="lines">@@ -36,14 +36,14 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-PassRefPtr<RTCStatsRequestImpl> RTCStatsRequestImpl::create(ScriptExecutionContext* context, PassRefPtr<RTCStatsCallback> successCallback, PassRefPtr<RTCPeerConnectionErrorCallback> errorCallback, PassRefPtr<MediaStreamTrack> selector)
</del><ins>+PassRefPtr<RTCStatsRequestImpl> RTCStatsRequestImpl::create(ScriptExecutionContext* context, PassRefPtr<RTCStatsCallback> successCallback, PassRefPtr<RTCPeerConnectionErrorCallback> errorCallback, PassRefPtr<MediaStreamTrackPrivate> selector)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<RTCStatsRequestImpl> request = adoptRef(new RTCStatsRequestImpl(context, successCallback, errorCallback, selector));
</span><span class="cx"> request->suspendIfNeeded();
</span><span class="cx"> return request.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RTCStatsRequestImpl::RTCStatsRequestImpl(ScriptExecutionContext* context, PassRefPtr<RTCStatsCallback> successCallback, PassRefPtr<RTCPeerConnectionErrorCallback> errorCallback, PassRefPtr<MediaStreamTrack> selector)
</del><ins>+RTCStatsRequestImpl::RTCStatsRequestImpl(ScriptExecutionContext* context, PassRefPtr<RTCStatsCallback> successCallback, PassRefPtr<RTCPeerConnectionErrorCallback> errorCallback, PassRefPtr<MediaStreamTrackPrivate> selector)
</ins><span class="cx"> : ActiveDOMObject(context)
</span><span class="cx"> , m_successCallback(successCallback)
</span><span class="cx"> , m_errorCallback(errorCallback)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> return m_track;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-MediaStreamTrack* RTCStatsRequestImpl::track()
</del><ins>+MediaStreamTrackPrivate* RTCStatsRequestImpl::track()
</ins><span class="cx"> {
</span><span class="cx"> return m_track.get();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCStatsRequestImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCStatsRequestImpl.h (165857 => 165858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCStatsRequestImpl.h 2014-03-19 00:01:41 UTC (rev 165857)
+++ trunk/Source/WebCore/Modules/mediastream/RTCStatsRequestImpl.h 2014-03-19 00:28:29 UTC (rev 165858)
</span><span class="lines">@@ -41,12 +41,12 @@
</span><span class="cx">
</span><span class="cx"> class RTCStatsRequestImpl : public RTCStatsRequest, public ActiveDOMObject {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<RTCStatsRequestImpl> create(ScriptExecutionContext*, PassRefPtr<RTCStatsCallback>, PassRefPtr<RTCPeerConnectionErrorCallback>, PassRefPtr<MediaStreamTrack>);
</del><ins>+ static PassRefPtr<RTCStatsRequestImpl> create(ScriptExecutionContext*, PassRefPtr<RTCStatsCallback>, PassRefPtr<RTCPeerConnectionErrorCallback>, PassRefPtr<MediaStreamTrackPrivate>);
</ins><span class="cx"> virtual ~RTCStatsRequestImpl();
</span><span class="cx">
</span><span class="cx"> virtual PassRefPtr<RTCStatsResponseBase> createResponse() override;
</span><span class="cx"> virtual bool hasSelector() override;
</span><del>- virtual MediaStreamTrack* track() override;
</del><ins>+ virtual MediaStreamTrackPrivate* track() override;
</ins><span class="cx">
</span><span class="cx"> virtual void requestSucceeded(PassRefPtr<RTCStatsResponseBase>) override;
</span><span class="cx"> virtual void requestFailed(const String&) override;
</span><span class="lines">@@ -55,13 +55,13 @@
</span><span class="cx"> virtual void stop() override;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- RTCStatsRequestImpl(ScriptExecutionContext*, PassRefPtr<RTCStatsCallback>, PassRefPtr<RTCPeerConnectionErrorCallback>, PassRefPtr<MediaStreamTrack>);
</del><ins>+ RTCStatsRequestImpl(ScriptExecutionContext*, PassRefPtr<RTCStatsCallback>, PassRefPtr<RTCPeerConnectionErrorCallback>, PassRefPtr<MediaStreamTrackPrivate>);
</ins><span class="cx">
</span><span class="cx"> void clear();
</span><span class="cx">
</span><span class="cx"> RefPtr<RTCStatsCallback> m_successCallback;
</span><span class="cx"> RefPtr<RTCPeerConnectionErrorCallback> m_errorCallback;
</span><del>- RefPtr<MediaStreamTrack> m_track;
</del><ins>+ RefPtr<MediaStreamTrackPrivate> m_track;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRTCStatsRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RTCStatsRequest.h (165857 => 165858)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RTCStatsRequest.h 2014-03-19 00:01:41 UTC (rev 165857)
+++ trunk/Source/WebCore/platform/mediastream/RTCStatsRequest.h 2014-03-19 00:28:29 UTC (rev 165858)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class MediaStreamTrack;
</del><ins>+class MediaStreamTrackPrivate;
</ins><span class="cx"> class RTCStatsResponseBase;
</span><span class="cx">
</span><span class="cx"> class RTCStatsRequest : public RefCounted<RTCStatsRequest> {
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> virtual PassRefPtr<RTCStatsResponseBase> createResponse() = 0;
</span><span class="cx"> virtual bool hasSelector() = 0;
</span><del>- virtual MediaStreamTrack* track() = 0;
</del><ins>+ virtual MediaStreamTrackPrivate* track() = 0;
</ins><span class="cx"> virtual void requestSucceeded(PassRefPtr<RTCStatsResponseBase>) = 0;
</span><span class="cx"> virtual void requestFailed(const String&) = 0;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>