Title: [205961] trunk
Revision
205961
Author
commit-qu...@webkit.org
Date
2016-09-15 01:47:35 -0700 (Thu, 15 Sep 2016)

Log Message

[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 <a...@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 <a...@igalia.com> on 2016-09-15
Reviewed by Eric Carlson.

* platform/gtk/TestExpectations: Modify the expectations, the
tests do not crash anymore.

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (205960 => 205961)


--- trunk/LayoutTests/ChangeLog	2016-09-15 08:42:10 UTC (rev 205960)
+++ trunk/LayoutTests/ChangeLog	2016-09-15 08:47:35 UTC (rev 205961)
@@ -1,3 +1,13 @@
+2016-09-15  Alejandro G. Castro  <a...@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.
+
 2016-09-15  Sergio Villar Senin  <svil...@igalia.com>
 
         [css-grid] Fix intrinsic size computation with flexible sized tracks

Modified: trunk/LayoutTests/platform/gtk/TestExpectations (205960 => 205961)


--- 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)
@@ -796,8 +796,7 @@
 
 webkit.org/b/153937 http/tests/misc/detach-during-notifyDone.html [ Crash Pass ]
 
-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 ]
+webkit.org/b/161956 fast/mediastream/MediaStream-video-element-displays-buffer.html [ Timeout ]
 
 #////////////////////////////////////////////////////////////////////////////////////////
 # End of Crashing tests

Modified: trunk/Source/WebCore/ChangeLog (205960 => 205961)


--- 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)
@@ -1,3 +1,26 @@
+2016-09-15  Alejandro G. Castro  <a...@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.
+
 2016-09-15  Sergio Villar Senin  <svil...@igalia.com>
 
         [css-grid] Fix intrinsic size computation with flexible sized tracks

Modified: trunk/Source/WebCore/platform/mediastream/openwebrtc/RealtimeMediaSourceOwr.h (205960 => 205961)


--- 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)
@@ -48,7 +48,7 @@
 
 class RealtimeMediaSourceCapabilities;
 
-class RealtimeMediaSourceOwr final : public RealtimeMediaSource {
+class RealtimeMediaSourceOwr : public RealtimeMediaSource {
 public:
 RealtimeMediaSourceOwr(OwrMediaSource* mediaSource, const String& id, RealtimeMediaSource::Type type, const String& name)
     : RealtimeMediaSource(id, type, name)
@@ -56,6 +56,12 @@
     {
     }
 
+RealtimeMediaSourceOwr(const String& id, RealtimeMediaSource::Type type, const String& name)
+    : RealtimeMediaSource(id, type, name)
+    , m_mediaSource(nullptr)
+    {
+    }
+
     virtual ~RealtimeMediaSourceOwr() { }
 
     virtual RefPtr<RealtimeMediaSourceCapabilities> capabilities() { return m_capabilities; }

Modified: trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.cpp (205960 => 205961)


--- 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)
@@ -82,7 +82,7 @@
 
 
 MockRealtimeMediaSource::MockRealtimeMediaSource(const String& id, RealtimeMediaSource::Type type, const String& name)
-    : RealtimeMediaSource(id, type, name)
+    : BaseRealtimeMediaSourceClass(id, type, name)
 {
     if (type == RealtimeMediaSource::Audio)
         setPersistentID(mockAudioSourcePersistentID());

Modified: trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.h (205960 => 205961)


--- 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)
@@ -35,11 +35,21 @@
 
 #include "RealtimeMediaSource.h"
 
+#if USE(OPENWEBRTC)
+#include "RealtimeMediaSourceOwr.h"
+#endif
+
 namespace WebCore {
 
 class CaptureDevice;
 
-class MockRealtimeMediaSource : public RealtimeMediaSource {
+#if USE(OPENWEBRTC)
+using BaseRealtimeMediaSourceClass = RealtimeMediaSourceOwr;
+#else
+using BaseRealtimeMediaSourceClass = RealtimeMediaSource;
+#endif
+
+class MockRealtimeMediaSource : public BaseRealtimeMediaSourceClass {
 public:
     virtual ~MockRealtimeMediaSource() { }
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to