Diff
Modified: trunk/Source/WebCore/ChangeLog (186768 => 186769)
--- trunk/Source/WebCore/ChangeLog 2015-07-13 19:11:42 UTC (rev 186768)
+++ trunk/Source/WebCore/ChangeLog 2015-07-13 19:50:44 UTC (rev 186769)
@@ -1,3 +1,24 @@
+2015-07-13 Matthew Daiter <[email protected]>
+
+ Change MediaPlayer Media Stream method signatures to use references
+ https://bugs.webkit.org/show_bug.cgi?id=146839
+ <rdar://problem/21769035>
+
+ Reviewed by Darin Adler.
+
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::MediaPlayer::loadWithNextMediaEngine):
+ * platform/graphics/MediaPlayerPrivate.h: Changed to references
+ * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::load): Ditto
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::MediaPlayerPrivateGStreamer::load): Ditto
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
+ * platform/graphics/mac/MediaPlayerPrivateQTKit.h:
+ * platform/mock/mediasource/MockMediaPlayerMediaSource.h:
+
2015-07-13 Carlos Alberto Lopez Perez <[email protected]>
GTK] Build race with -DENABLE_WAYLAND_TARGET=ON
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (186768 => 186769)
--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2015-07-13 19:11:42 UTC (rev 186768)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2015-07-13 19:50:44 UTC (rev 186769)
@@ -90,7 +90,7 @@
void load(const String&, MediaSourcePrivateClient*) override { }
#endif
#if ENABLE(MEDIA_STREAM)
- void load(MediaStreamPrivate*) override { }
+ void load(MediaStreamPrivate&) override { }
#endif
void cancelLoad() override { }
@@ -424,7 +424,7 @@
#endif
#if ENABLE(MEDIA_STREAM)
if (m_mediaStream)
- m_private->load(m_mediaStream.get());
+ m_private->load(*m_mediaStream);
else
#endif
m_private->load(m_url.string());
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h (186768 => 186769)
--- trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2015-07-13 19:11:42 UTC (rev 186768)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2015-07-13 19:50:44 UTC (rev 186769)
@@ -50,7 +50,7 @@
virtual void load(const String& url, MediaSourcePrivateClient*) = 0;
#endif
#if ENABLE(MEDIA_STREAM)
- virtual void load(MediaStreamPrivate*) = 0;
+ virtual void load(MediaStreamPrivate&) = 0;
#endif
virtual void cancelLoad() = 0;
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h (186768 => 186769)
--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h 2015-07-13 19:11:42 UTC (rev 186768)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h 2015-07-13 19:50:44 UTC (rev 186769)
@@ -154,7 +154,7 @@
virtual void load(const String&, MediaSourcePrivateClient*) override;
#endif
#if ENABLE(MEDIA_STREAM)
- void load(MediaStreamPrivate*) override { }
+ void load(MediaStreamPrivate&) override { }
#endif
virtual void cancelLoad() override = 0;
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h (186768 => 186769)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h 2015-07-13 19:11:42 UTC (rev 186768)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h 2015-07-13 19:50:44 UTC (rev 186769)
@@ -96,7 +96,7 @@
virtual void load(const String& url) override;
virtual void load(const String& url, MediaSourcePrivateClient*) override;
#if ENABLE(MEDIA_STREAM)
- void load(MediaStreamPrivate*) override;
+ void load(MediaStreamPrivate&) override;
#endif
virtual void cancelLoad() override;
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (186768 => 186769)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2015-07-13 19:11:42 UTC (rev 186768)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2015-07-13 19:50:44 UTC (rev 186769)
@@ -270,7 +270,7 @@
}
#if ENABLE(MEDIA_STREAM)
-void MediaPlayerPrivateMediaSourceAVFObjC::load(MediaStreamPrivate*)
+void MediaPlayerPrivateMediaSourceAVFObjC::load(MediaStreamPrivate&)
{
setNetworkState(MediaPlayer::FormatError);
}
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (186768 => 186769)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2015-07-13 19:11:42 UTC (rev 186768)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2015-07-13 19:50:44 UTC (rev 186769)
@@ -320,7 +320,7 @@
#endif
#if ENABLE(MEDIA_STREAM)
-void MediaPlayerPrivateGStreamer::load(MediaStreamPrivate*)
+void MediaPlayerPrivateGStreamer::load(MediaStreamPrivate&)
{
notImplemented();
}
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h (186768 => 186769)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2015-07-13 19:11:42 UTC (rev 186768)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2015-07-13 19:50:44 UTC (rev 186769)
@@ -77,7 +77,7 @@
void load(const String& url, MediaSourcePrivateClient*) override;
#endif
#if ENABLE(MEDIA_STREAM)
- void load(MediaStreamPrivate*) override;
+ void load(MediaStreamPrivate&) override;
#endif
void commitLoad();
void cancelLoad() override;
Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h (186768 => 186769)
--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h 2015-07-13 19:11:42 UTC (rev 186768)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h 2015-07-13 19:50:44 UTC (rev 186769)
@@ -87,7 +87,7 @@
virtual void load(const String&, MediaSourcePrivateClient*) override;
#endif
#if ENABLE(MEDIA_STREAM)
- void load(MediaStreamPrivate*) override { }
+ void load(MediaStreamPrivate&) override { }
#endif
void cancelLoad() override;
void loadInternal(const String& url);
Modified: trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.h (186768 => 186769)
--- trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.h 2015-07-13 19:11:42 UTC (rev 186768)
+++ trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.h 2015-07-13 19:50:44 UTC (rev 186769)
@@ -61,7 +61,7 @@
virtual void load(const String& url) override;
virtual void load(const String& url, MediaSourcePrivateClient*) override;
#if ENABLE(MEDIA_STREAM)
- virtual void load(MediaStreamPrivate*) override { };
+ virtual void load(MediaStreamPrivate&) override { }
#endif
virtual void cancelLoad() override;
virtual void play() override;
