Title: [186730] branches/safari-601.1-branch/Source/WebCore
Diff
Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (186729 => 186730)
--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-12 07:06:58 UTC (rev 186729)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-12 07:15:13 UTC (rev 186730)
@@ -1,3 +1,15 @@
+2015-07-12 Babak Shafiei <[email protected]>
+
+ Merge r186727.
+
+ 2015-07-11 Babak Shafiei <[email protected]>
+
+ Unreviewed build fix.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::load):
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::cancelLoad):
+
2015-07-10 Matthew Hanson <[email protected]>
Disable non-shipping features.
Modified: branches/safari-601.1-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (186729 => 186730)
--- branches/safari-601.1-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2015-07-12 07:06:58 UTC (rev 186729)
+++ branches/safari-601.1-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2015-07-12 07:15:13 UTC (rev 186730)
@@ -269,10 +269,12 @@
m_mediaSourcePrivate = MediaSourcePrivateAVFObjC::create(this, client);
}
+#if ENABLE(MEDIA_STREAM)
void MediaPlayerPrivateMediaSourceAVFObjC::load(MediaStreamPrivate*)
{
setNetworkState(MediaPlayer::FormatError);
}
+#endif
void MediaPlayerPrivateMediaSourceAVFObjC::cancelLoad()
{
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
