Attachment 256423 Details for Bug 146748 – Patch

[patch] Patch

bug-146748-20150708163849.patch (text/plain), 4.05 KB, created by Matthew Daiter on 2015-07-08 16:39:48 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Daiter

Created: 2015-07-08 16:39:48 PDT

Size: 4.05 KB

patch

obsolete

>Subversion Revision: 186528
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 35c14fa7c9de17a94d1b15f84923ac327fe7840f..55ca44c5d565b17e290c1bd6f447cc3ab3647831 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,20 @@
>+2015-07-08  Matthew Daiter  <mdaiter@apple.com>
>+
>+        Make sure MediaStream engine loaded for interpreting MediaStreams
>+        https://bugs.webkit.org/show_bug.cgi?id=146748
>+        <rdar://problem/21735416>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm: 
>+        (WebCore::MediaPlayerPrivateAVFoundationObjC::supportsType):
>+        Changed MediaStream to never be loaded
>+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:
>+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
>+        (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::supportsType): 
>+        Changed MediaStream to never be loaded
>+
>+
> 2015-07-08  Csaba OsztrogonÃ¡c  <ossy@webkit.org>
> 
>         Add new sources to StyleAllInOne.cpp
>diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
>index 040dadafe006c79bf54ca0979f53a4c894445637..7bab5c78c5fd93a2f0a576ac5f9c0957a158a8db 100644
>--- a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
>+++ b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
>@@ -1627,7 +1627,10 @@ MediaPlayer::SupportsType MediaPlayerPrivateAVFoundationObjC::supportsType(const
>     if (parameters.isMediaSource)
>         return MediaPlayer::IsNotSupported;
> #endif
>-
>+#if ENABLE(MEDIA_STREAM)
>+    if (parameters.isMediaStream)
>+        return MediaPlayer::IsNotSupported;
>+#endif
>     if (isUnsupportedMIMEType(parameters.type))
>         return MediaPlayer::IsNotSupported;
> 
>diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h
>index afd1569985c0c6b11616d720ae7df533df7eef17..adaac58a39468cf141628bc34f88bc96df28fc92 100644
>--- a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h
>+++ b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h
>@@ -96,7 +96,7 @@ private:
>     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;
> 
>diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm
>index 3238e68a92a4bc611f1437d81a99dee0ed4a764c..89ab30eb27c3cf6c54ad0a4732f9d889cf72544e 100644
>--- a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm
>+++ b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm
>@@ -236,7 +236,10 @@ MediaPlayer::SupportsType MediaPlayerPrivateMediaSourceAVFObjC::supportsType(con
>     // This engine does not support non-media-source sources.
>     if (!parameters.isMediaSource)
>         return MediaPlayer::IsNotSupported;
>-
>+#if ENABLE(MEDIA_STREAM)
>+    if (parameters.isMediaStream)
>+        return MediaPlayer::IsNotSupported;
>+#endif
>     if (!mimeTypeCache().contains(parameters.type))
>         return MediaPlayer::IsNotSupported;
> 
>@@ -266,6 +269,11 @@ void MediaPlayerPrivateMediaSourceAVFObjC::load(const String& url, MediaSourcePr
>     m_mediaSourcePrivate = MediaSourcePrivateAVFObjC::create(this, client);
> }
> 
>+void MediaPlayerPrivateMediaSourceAVFObjC::load(MediaStreamPrivate*)
>+{
>+    setNetworkState(MediaPlayer::FormatError);
>+}
>+
> void MediaPlayerPrivateMediaSourceAVFObjC::cancelLoad()
> {
> }

Actions: View | Formatted Diff | Diff

Attachments on bug 146748: 256418 | 256423 | 256424