<!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>[205961] trunk</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/205961">205961</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-15 01:47:35 -0700 (Thu, 15 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebRTC][OpenWebRTC] crash in maybeHandleChangeMutedState
https://bugs.webkit.org/show_bug.cgi?id=161619
Source/WebCore:
Added OpenWebRTC support to the RealtimeMediaSource mock class.
Patch by Alejandro G. Castro <alex@igalia.com> on 2016-09-15
Reviewed by Eric Carlson.
Fixed tests.
* platform/mediastream/openwebrtc/RealtimeMediaSourceOwr.h:
(WebCore::RealtimeMediaSourceOwr::RealtimeMediaSourceOwr): Allowed
inheritance of the class, required to use it when creating the
mock class. Added a new constructor to create the class with null
mediastream.
* platform/mock/MockRealtimeMediaSource.cpp:
(WebCore::MockRealtimeMediaSource::MockRealtimeMediaSource): Use
the new BaseRealtimeMediaSourceClass in the constructor.
* platform/mock/MockRealtimeMediaSource.h: Added a new
BaseRealtimeMediaSourceClass defined using the
RealtimeMediaSourceOwr class for OpenWebRTC platform.
LayoutTests:
Patch by Alejandro G. Castro <alex@igalia.com> on 2016-09-15
Reviewed by Eric Carlson.
* platform/gtk/TestExpectations: Modify the expectations, the
tests do not crash anymore.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformgtkTestExpectations">trunk/LayoutTests/platform/gtk/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamopenwebrtcRealtimeMediaSourceOwrh">trunk/Source/WebCore/platform/mediastream/openwebrtc/RealtimeMediaSourceOwr.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmockMockRealtimeMediaSourcecpp">trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmockMockRealtimeMediaSourceh">trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (205960 => 205961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-09-15 08:42:10 UTC (rev 205960)
+++ trunk/LayoutTests/ChangeLog 2016-09-15 08:47:35 UTC (rev 205961)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-09-15 Alejandro G. Castro <alex@igalia.com>
+
+ [WebRTC][OpenWebRTC] crash in maybeHandleChangeMutedState
+ https://bugs.webkit.org/show_bug.cgi?id=161619
+
+ Reviewed by Eric Carlson.
+
+ * platform/gtk/TestExpectations: Modify the expectations, the
+ tests do not crash anymore.
+
</ins><span class="cx"> 2016-09-15 Sergio Villar Senin <svillar@igalia.com>
</span><span class="cx">
</span><span class="cx"> [css-grid] Fix intrinsic size computation with flexible sized tracks
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/TestExpectations (205960 => 205961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/TestExpectations 2016-09-15 08:42:10 UTC (rev 205960)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2016-09-15 08:47:35 UTC (rev 205961)
</span><span class="lines">@@ -796,8 +796,7 @@
</span><span class="cx">
</span><span class="cx"> webkit.org/b/153937 http/tests/misc/detach-during-notifyDone.html [ Crash Pass ]
</span><span class="cx">
</span><del>-webkit.org/b/161619 fast/mediastream/MediaStream-video-element-displays-buffer.html [ Crash ]
-webkit.org/b/161619 fast/mediastream/MediaStream-video-element-video-tracks-disabled.html [ Crash ]
</del><ins>+webkit.org/b/161956 fast/mediastream/MediaStream-video-element-displays-buffer.html [ Timeout ]
</ins><span class="cx">
</span><span class="cx"> #////////////////////////////////////////////////////////////////////////////////////////
</span><span class="cx"> # End of Crashing tests
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205960 => 205961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-15 08:42:10 UTC (rev 205960)
+++ trunk/Source/WebCore/ChangeLog 2016-09-15 08:47:35 UTC (rev 205961)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-09-15 Alejandro G. Castro <alex@igalia.com>
+
+ [WebRTC][OpenWebRTC] crash in maybeHandleChangeMutedState
+ https://bugs.webkit.org/show_bug.cgi?id=161619
+
+ Added OpenWebRTC support to the RealtimeMediaSource mock class.
+
+ Reviewed by Eric Carlson.
+
+ Fixed tests.
+
+ * platform/mediastream/openwebrtc/RealtimeMediaSourceOwr.h:
+ (WebCore::RealtimeMediaSourceOwr::RealtimeMediaSourceOwr): Allowed
+ inheritance of the class, required to use it when creating the
+ mock class. Added a new constructor to create the class with null
+ mediastream.
+ * platform/mock/MockRealtimeMediaSource.cpp:
+ (WebCore::MockRealtimeMediaSource::MockRealtimeMediaSource): Use
+ the new BaseRealtimeMediaSourceClass in the constructor.
+ * platform/mock/MockRealtimeMediaSource.h: Added a new
+ BaseRealtimeMediaSourceClass defined using the
+ RealtimeMediaSourceOwr class for OpenWebRTC platform.
+
</ins><span class="cx"> 2016-09-15 Sergio Villar Senin <svillar@igalia.com>
</span><span class="cx">
</span><span class="cx"> [css-grid] Fix intrinsic size computation with flexible sized tracks
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamopenwebrtcRealtimeMediaSourceOwrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/openwebrtc/RealtimeMediaSourceOwr.h (205960 => 205961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/openwebrtc/RealtimeMediaSourceOwr.h 2016-09-15 08:42:10 UTC (rev 205960)
+++ trunk/Source/WebCore/platform/mediastream/openwebrtc/RealtimeMediaSourceOwr.h 2016-09-15 08:47:35 UTC (rev 205961)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> class RealtimeMediaSourceCapabilities;
</span><span class="cx">
</span><del>-class RealtimeMediaSourceOwr final : public RealtimeMediaSource {
</del><ins>+class RealtimeMediaSourceOwr : public RealtimeMediaSource {
</ins><span class="cx"> public:
</span><span class="cx"> RealtimeMediaSourceOwr(OwrMediaSource* mediaSource, const String& id, RealtimeMediaSource::Type type, const String& name)
</span><span class="cx"> : RealtimeMediaSource(id, type, name)
</span><span class="lines">@@ -56,6 +56,12 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+RealtimeMediaSourceOwr(const String& id, RealtimeMediaSource::Type type, const String& name)
+ : RealtimeMediaSource(id, type, name)
+ , m_mediaSource(nullptr)
+ {
+ }
+
</ins><span class="cx"> virtual ~RealtimeMediaSourceOwr() { }
</span><span class="cx">
</span><span class="cx"> virtual RefPtr<RealtimeMediaSourceCapabilities> capabilities() { return m_capabilities; }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockMockRealtimeMediaSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.cpp (205960 => 205961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.cpp 2016-09-15 08:42:10 UTC (rev 205960)
+++ trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.cpp 2016-09-15 08:47:35 UTC (rev 205961)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> MockRealtimeMediaSource::MockRealtimeMediaSource(const String& id, RealtimeMediaSource::Type type, const String& name)
</span><del>- : RealtimeMediaSource(id, type, name)
</del><ins>+ : BaseRealtimeMediaSourceClass(id, type, name)
</ins><span class="cx"> {
</span><span class="cx"> if (type == RealtimeMediaSource::Audio)
</span><span class="cx"> setPersistentID(mockAudioSourcePersistentID());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockMockRealtimeMediaSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.h (205960 => 205961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.h 2016-09-15 08:42:10 UTC (rev 205960)
+++ trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.h 2016-09-15 08:47:35 UTC (rev 205961)
</span><span class="lines">@@ -35,11 +35,21 @@
</span><span class="cx">
</span><span class="cx"> #include "RealtimeMediaSource.h"
</span><span class="cx">
</span><ins>+#if USE(OPENWEBRTC)
+#include "RealtimeMediaSourceOwr.h"
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class CaptureDevice;
</span><span class="cx">
</span><del>-class MockRealtimeMediaSource : public RealtimeMediaSource {
</del><ins>+#if USE(OPENWEBRTC)
+using BaseRealtimeMediaSourceClass = RealtimeMediaSourceOwr;
+#else
+using BaseRealtimeMediaSourceClass = RealtimeMediaSource;
+#endif
+
+class MockRealtimeMediaSource : public BaseRealtimeMediaSourceClass {
</ins><span class="cx"> public:
</span><span class="cx"> virtual ~MockRealtimeMediaSource() { }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>