Title: [214772] trunk/Source/WebCore
- Revision
- 214772
- Author
- commit-qu...@webkit.org
- Date
- 2017-04-03 05:24:23 -0700 (Mon, 03 Apr 2017)
Log 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 <a...@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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (214771 => 214772)
--- trunk/Source/WebCore/ChangeLog 2017-04-03 12:01:58 UTC (rev 214771)
+++ trunk/Source/WebCore/ChangeLog 2017-04-03 12:24:23 UTC (rev 214772)
@@ -1,3 +1,16 @@
+2017-04-03 Alejandro G. Castro <a...@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 <a...@apple.com>
Build fix for
Modified: trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.h (214771 => 214772)
--- trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.h 2017-04-03 12:01:58 UTC (rev 214771)
+++ trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.h 2017-04-03 12:24:23 UTC (rev 214772)
@@ -61,7 +61,9 @@
virtual void updateSettings(RealtimeMediaSourceSettings&) = 0;
virtual void initializeCapabilities(RealtimeMediaSourceCapabilities&) = 0;
+#if !USE(OPENWEBRTC)
virtual void initializeSupportedConstraints(RealtimeMediaSourceSupportedConstraints&) = 0;
+#endif
void startProducingData() override;
void stopProducingData() override;
@@ -76,7 +78,12 @@
private:
void initializeCapabilities();
+#if USE(OPENWEBRTC)
+ void initializeSettings() final;
+#else
void initializeSettings();
+#endif
+
bool isProducingData() const override { return m_isProducingData; }
RealtimeMediaSourceSettings m_currentSettings;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes