Changeset 261447 in webkit

Timestamp:

May 9, 2020 5:05:59 PM (4 years ago)

Author:

jer.noble@apple.com

Message:

REGRESSION(r258493): CRASH running fast/mediastream/RTCPeerConnection tests
​https://bugs.webkit.org/show_bug.cgi?id=211666
<rdar://problem/63055644>

Reviewed by Eric Carlson.

MockMediaStreamTrack advertises that it's a webrtc::VideoTrackInterface, but doesn't inherit from
that interface, leading to a crash when its pointer is cast to webrtc::VideoTrackInterface and a
virtual method called on the resulting pointer. Since it's only used in one place, and since there's
an existing mock webrtc::VideoTrackInterface object in that same file, remove MockMediaStreamTrack
and replace the one place it's used with MockLibWebRTCVideoTrack.

• testing/MockLibWebRTCPeerConnection.h:

(WebCore::MockMediaStreamTrack::state const): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• testing/MockLibWebRTCPeerConnection.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-05-09  Jer Noble  <jer.noble@apple.com>
+
+        REGRESSION(r258493): CRASH running fast/mediastream/RTCPeerConnection tests
+        https://bugs.webkit.org/show_bug.cgi?id=211666
+        <rdar://problem/63055644>
+
+        Reviewed by Eric Carlson.
+
+        MockMediaStreamTrack advertises that it's a webrtc::VideoTrackInterface, but doesn't inherit from
+        that interface, leading to a crash when its pointer is cast to webrtc::VideoTrackInterface and a
+        virtual method called on the resulting pointer. Since it's only used in one place, and since there's
+        an existing mock webrtc::VideoTrackInterface object in that same file, remove MockMediaStreamTrack
+        and replace the one place it's used with MockLibWebRTCVideoTrack.
+
+        * testing/MockLibWebRTCPeerConnection.h:
+        (WebCore::MockMediaStreamTrack::state const): Deleted.
+
 2020-05-09  David Kilzer  <ddkilzer@apple.com>
 

trunk/Source/WebCore/testing/MockLibWebRTCPeerConnection.h

@@ -130 +130 @@
     bool set_enabled(bool enabled) final { m_enabled = enabled; return true; }
 
-    bool m_enabled;
+    bool m_enabled { true };
     std::string m_id;
     rtc::scoped_refptr<webrtc::VideoTrackSourceInterface> m_source;
@@ -190 +190 @@
 };
 
-class MockMediaStreamTrack : public webrtc::MediaStreamTrackInterface {
-public:
-    MockMediaStreamTrack() = default;
-private:
-    std::string kind() const final { return "video"; }
-    std::string id() const final { return "mymocktrack"; }
-    bool enabled() const final { return true; }
-    bool set_enabled(bool) final { return true; }
-    TrackState state() const  { return TrackState::kLive; }
-    void RegisterObserver(webrtc::ObserverInterface*) final { }
-    void UnregisterObserver(webrtc::ObserverInterface*) final { }
-};
-
 class MockRtpReceiver : public webrtc::RtpReceiverInterface {
 private:
@@ -214 +201 @@
     {
         if (!m_track)
-            const_cast<MockRtpReceiver*>(this)->m_track = new rtc::RefCountedObject<MockMediaStreamTrack>();
+            const_cast<MockRtpReceiver*>(this)->m_track = new rtc::RefCountedObject<MockLibWebRTCVideoTrack>("", nullptr);
         return m_track;
     }