Title: [186640] trunk/Source/WebCore
- Revision
- 186640
- Author
- commit-qu...@webkit.org
- Date
- 2015-07-09 15:11:53 -0700 (Thu, 09 Jul 2015)
Log Message
Expose MediaStream methods to be used in the MediaStream Engine
https://bugs.webkit.org/show_bug.cgi?id=146791
<rdar://problem/21747589>
Patch by Matthew Daiter <mdai...@apple.com> on 2015-07-09
Reviewed by Brent Fulgham.
* Modules/mediastream/MediaStream.cpp:
(WebCore::MediaStream::getAudioTracks): Removed const
(WebCore::MediaStream::getVideoTracks): Ditto
* Modules/mediastream/MediaStream.h: Needed to change functions to
override
* platform/mediastream/MediaStreamPrivate.h: Added certain calls to
PrivateClient that exposes methods to be used in the engine
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (186639 => 186640)
--- trunk/Source/WebCore/ChangeLog 2015-07-09 22:07:51 UTC (rev 186639)
+++ trunk/Source/WebCore/ChangeLog 2015-07-09 22:11:53 UTC (rev 186640)
@@ -1,3 +1,19 @@
+2015-07-09 Matthew Daiter <mdai...@apple.com>
+
+ Expose MediaStream methods to be used in the MediaStream Engine
+ https://bugs.webkit.org/show_bug.cgi?id=146791
+ <rdar://problem/21747589>
+
+ Reviewed by Brent Fulgham.
+
+ * Modules/mediastream/MediaStream.cpp:
+ (WebCore::MediaStream::getAudioTracks): Removed const
+ (WebCore::MediaStream::getVideoTracks): Ditto
+ * Modules/mediastream/MediaStream.h: Needed to change functions to
+ override
+ * platform/mediastream/MediaStreamPrivate.h: Added certain calls to
+ PrivateClient that exposes methods to be used in the engine
+
2015-07-09 Devin Rousso <drou...@apple.com>
Web Inspector: Fix shape-highlight layout tests
Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp (186639 => 186640)
--- trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2015-07-09 22:07:51 UTC (rev 186639)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2015-07-09 22:11:53 UTC (rev 186640)
@@ -140,12 +140,12 @@
return nullptr;
}
-Vector<RefPtr<MediaStreamTrack>> MediaStream::getAudioTracks() const
+Vector<RefPtr<MediaStreamTrack>> MediaStream::getAudioTracks()
{
return trackVectorForType(RealtimeMediaSource::Audio);
}
-Vector<RefPtr<MediaStreamTrack>> MediaStream::getVideoTracks() const
+Vector<RefPtr<MediaStreamTrack>> MediaStream::getVideoTracks()
{
return trackVectorForType(RealtimeMediaSource::Video);
}
Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.h (186639 => 186640)
--- trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2015-07-09 22:07:51 UTC (rev 186639)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2015-07-09 22:11:53 UTC (rev 186640)
@@ -64,8 +64,8 @@
void removeTrack(MediaStreamTrack*);
MediaStreamTrack* getTrackById(String);
- Vector<RefPtr<MediaStreamTrack>> getAudioTracks() const;
- Vector<RefPtr<MediaStreamTrack>> getVideoTracks() const;
+ Vector<RefPtr<MediaStreamTrack>> getAudioTracks() override final;
+ Vector<RefPtr<MediaStreamTrack>> getVideoTracks() override final;
Vector<RefPtr<MediaStreamTrack>> getTracks() const;
RefPtr<MediaStream> clone();
Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h (186639 => 186640)
--- trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h 2015-07-09 22:07:51 UTC (rev 186639)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h 2015-07-09 22:11:53 UTC (rev 186640)
@@ -39,6 +39,7 @@
#include "MediaStreamTrackPrivate.h"
#include <wtf/HashMap.h>
#include <wtf/RefCounted.h>
+#include <wtf/RefPtr.h>
#include <wtf/Vector.h>
namespace WebCore {
@@ -52,6 +53,8 @@
virtual void activeStatusChanged() = 0;
virtual void didAddTrackToPrivate(MediaStreamTrackPrivate&) = 0;
virtual void didRemoveTrackFromPrivate(MediaStreamTrackPrivate&) = 0;
+ virtual Vector<RefPtr<MediaStreamTrack>> getVideoTracks() = 0;
+ virtual Vector<RefPtr<MediaStreamTrack>> getAudioTracks() = 0;
};
class MediaStreamPrivate : public RefCounted<MediaStreamPrivate> {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
