Changeset 214772 in webkit

Timestamp:

Apr 3, 2017 5:24:23 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

[OWR] Fix class structure for the OWR mock classes after last modifications
​https://bugs.webkit.org/show_bug.cgi?id=170173

Patch by Alejandro G. Castro <​alex@igalia.com> on 2017-04-03
Reviewed by Youenn Fablet.

In case of OWR MockRealtimeMediaSource inherits from
RealtimeMediaSourceOwr, so we have to change some of the function
interfaces.

• platform/mock/MockRealtimeMediaSource.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mock/MockRealtimeMediaSource.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-04-03  Alejandro G. Castro  <alex@igalia.com>
+
+        [OWR] Fix class structure for the OWR mock classes after last modifications
+        https://bugs.webkit.org/show_bug.cgi?id=170173
+
+        Reviewed by Youenn Fablet.
+
+        In case of OWR MockRealtimeMediaSource inherits from
+        RealtimeMediaSourceOwr, so we have to change some of the function
+        interfaces.
+
+        * platform/mock/MockRealtimeMediaSource.h:
+
 2017-04-02  Alexey Proskuryakov  <ap@apple.com>
 

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

@@ -62 +62 @@
     virtual void updateSettings(RealtimeMediaSourceSettings&) = 0;
     virtual void initializeCapabilities(RealtimeMediaSourceCapabilities&) = 0;
+#if !USE(OPENWEBRTC)
     virtual void initializeSupportedConstraints(RealtimeMediaSourceSupportedConstraints&) = 0;
+#endif
 
     void startProducingData() override;
@@ -77 +79 @@
 private:
     void initializeCapabilities();
+#if USE(OPENWEBRTC)
+    void initializeSettings() final;
+#else
     void initializeSettings();
+#endif
+
     bool isProducingData() const override { return m_isProducingData; }