Changeset 205961 in webkit

Timestamp:

Sep 15, 2016, 1:47:35 AM (9 years ago)

Author:

commit-queue@webkit.org

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 <​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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/mediastream/openwebrtc/RealtimeMediaSourceOwr.h (modified) (1 diff)
• Source/WebCore/platform/mock/MockRealtimeMediaSource.cpp (modified) (1 diff)
• Source/WebCore/platform/mock/MockRealtimeMediaSource.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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.
+
 2016-09-15  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/LayoutTests/platform/gtk/TestExpectations

@@ -797 +797 @@
 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 ]
 
 #////////////////////////////////////////////////////////////////////////////////////////

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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.
+
 2016-09-15  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/Source/WebCore/platform/mediastream/openwebrtc/RealtimeMediaSourceOwr.h

@@ -49 +49 @@
 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)
     , m_mediaSource(mediaSource)
+    {
+    }
+
+RealtimeMediaSourceOwr(const String& id, RealtimeMediaSource::Type type, const String& name)
+    : RealtimeMediaSource(id, type, name)
+    , m_mediaSource(nullptr)
     {
     }

trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.cpp

@@ -83 +83 @@
 
 MockRealtimeMediaSource::MockRealtimeMediaSource(const String& id, RealtimeMediaSource::Type type, const String& name)
-    : RealtimeMediaSource(id, type, name)
+    : BaseRealtimeMediaSourceClass(id, type, name)
 {
     if (type == RealtimeMediaSource::Audio)

trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.h

@@ -36 +36 @@
 #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() { }