<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[190020] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/190020">190020</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2015-09-19 17:43:08 -0700 (Sat, 19 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cleanup code that finds and loads a media engine
https://bugs.webkit.org/show_bug.cgi?id=149371
Reviewed by Darin Adler.
No new tests, no functional change.
* Modules/mediastream/MediaStream.cpp:
(WebCore::MediaStream::setRegistry): New, set the registry.
(WebCore::MediaStream::lookup): New, lookup a url in the registry.
* Modules/mediastream/MediaStream.h:
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::loadResource): Restructure and simplify the code that tries the
different types of media engine so the code is easier to understand and modify.
(WebCore::HTMLMediaElement::createMediaPlayer): Clear m_mediaStreamSrcObject.
* platform/graphics/MediaPlayer.cpp:
(WebCore::buildMediaEnginesVector): Add some whitespace to make it easier to read.
(WebCore::bestMediaEngineForSupportParameters): Also process mediastream and mediasource urls.
(WebCore::MediaPlayer::load): ASSERT if called when the reload timer is active.
(WebCore::MediaPlayer::loadWithNextMediaEngine): Also process mediastream and mediasource urls.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::supportsType): Don't test empty/null urls.
* platform/mock/mediasource/MockMediaPlayerMediaSource.cpp:
(WebCore::MockMediaPlayerMediaSource::supportsType): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamcpp">trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamh">trunk/Source/WebCore/Modules/mediastream/MediaStream.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayercpp">trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayerh">trunk/Source/WebCore/platform/graphics/MediaPlayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmockmediasourceMockMediaPlayerMediaSourcecpp">trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190019 => 190020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-20 00:17:27 UTC (rev 190019)
+++ trunk/Source/WebCore/ChangeLog 2015-09-20 00:43:08 UTC (rev 190020)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2015-09-19 Eric Carlson <eric.carlson@apple.com>
+
+ Cleanup code that finds and loads a media engine
+ https://bugs.webkit.org/show_bug.cgi?id=149371
+
+ Reviewed by Darin Adler.
+
+ No new tests, no functional change.
+
+ * Modules/mediastream/MediaStream.cpp:
+ (WebCore::MediaStream::setRegistry): New, set the registry.
+ (WebCore::MediaStream::lookup): New, lookup a url in the registry.
+ * Modules/mediastream/MediaStream.h:
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::loadResource): Restructure and simplify the code that tries the
+ different types of media engine so the code is easier to understand and modify.
+ (WebCore::HTMLMediaElement::createMediaPlayer): Clear m_mediaStreamSrcObject.
+
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::buildMediaEnginesVector): Add some whitespace to make it easier to read.
+ (WebCore::bestMediaEngineForSupportParameters): Also process mediastream and mediasource urls.
+ (WebCore::MediaPlayer::load): ASSERT if called when the reload timer is active.
+ (WebCore::MediaPlayer::loadWithNextMediaEngine): Also process mediastream and mediasource urls.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::supportsType): Don't test empty/null urls.
+
+ * platform/mock/mediasource/MockMediaPlayerMediaSource.cpp:
+ (WebCore::MockMediaPlayerMediaSource::supportsType): Ditto.
+
</ins><span class="cx"> 2015-09-19 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Get rid of most custom bindings for Location.idl
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp (190019 => 190020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2015-09-20 00:17:27 UTC (rev 190019)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2015-09-20 00:43:08 UTC (rev 190020)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2011, 2012, 2015 Ericsson AB. All rights reserved.
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -35,10 +35,27 @@
</span><span class="cx"> #include "MediaStreamRegistry.h"
</span><span class="cx"> #include "MediaStreamTrackEvent.h"
</span><span class="cx"> #include "RealtimeMediaSource.h"
</span><ins>+#include "URL.h"
</ins><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+static URLRegistry* s_registry;
+
+void MediaStream::setRegistry(URLRegistry& registry)
+{
+ ASSERT(!s_registry);
+ s_registry = &registry;
+}
+
+MediaStream* MediaStream::lookUp(const URL& url)
+{
+ if (!s_registry)
+ return nullptr;
+
+ return static_cast<MediaStream*>(s_registry->lookup(url.string()));
+}
+
</ins><span class="cx"> Ref<MediaStream> MediaStream::create(ScriptExecutionContext& context)
</span><span class="cx"> {
</span><span class="cx"> return MediaStream::create(context, MediaStreamPrivate::create());
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.h (190019 => 190020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2015-09-20 00:17:27 UTC (rev 190019)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2015-09-20 00:43:08 UTC (rev 190020)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2011, 2015 Ericsson AB. All rights reserved.
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -52,6 +52,9 @@
</span><span class="cx"> virtual void didAddOrRemoveTrack() = 0;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+ static void setRegistry(URLRegistry&);
+ static MediaStream* lookUp(const URL&);
+
</ins><span class="cx"> static Ref<MediaStream> create(ScriptExecutionContext&);
</span><span class="cx"> static Ref<MediaStream> create(ScriptExecutionContext&, MediaStream*);
</span><span class="cx"> static Ref<MediaStream> create(ScriptExecutionContext&, const Vector<RefPtr<MediaStreamTrack>>&);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (190019 => 190020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-09-20 00:17:27 UTC (rev 190019)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-09-20 00:43:08 UTC (rev 190020)
</span><span class="lines">@@ -1267,12 +1267,7 @@
</span><span class="cx">
</span><span class="cx"> LOG(Media, "HTMLMediaElement::loadResource(%p) - m_currentSrc -> %s", this, urlForLoggingMedia(m_currentSrc).utf8().data());
</span><span class="cx">
</span><del>-#if ENABLE(MEDIA_STREAM)
- if (MediaStreamRegistry::registry().lookup(url.string()))
- m_mediaSession->removeBehaviorRestriction(MediaElementSession::RequireUserGestureForRateChange);
-#endif
-
- if (m_sendProgressEvents)
</del><ins>+ if (m_sendProgressEvents)
</ins><span class="cx"> startProgressEventTimer();
</span><span class="cx">
</span><span class="cx"> bool privateMode = document().page() && document().page()->usesEphemeralSession();
</span><span class="lines">@@ -1292,6 +1287,7 @@
</span><span class="cx">
</span><span class="cx"> updateVolume();
</span><span class="cx">
</span><ins>+ bool loadAttempted = false;
</ins><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><span class="cx"> ASSERT(!m_mediaSource);
</span><span class="cx">
</span><span class="lines">@@ -1307,14 +1303,24 @@
</span><span class="cx"> m_mediaSource = nullptr;
</span><span class="cx"> mediaLoadingFailed(MediaPlayer::FormatError);
</span><span class="cx"> }
</span><del>- } else
</del><ins>+ loadAttempted = true;
+ }
</ins><span class="cx"> #endif
</span><ins>+
</ins><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><del>- if (m_mediaStreamSrcObject)
- m_player->load(m_mediaStreamSrcObject->privateStream());
- else
</del><ins>+ if (!loadAttempted) {
+ if (!m_mediaStreamSrcObject && url.protocolIs(mediaStreamBlobProtocol))
+ m_mediaStreamSrcObject = MediaStream::lookUp(url);
+
+ if (m_mediaStreamSrcObject) {
+ loadAttempted = true;
+ if (!m_player->load(m_mediaStreamSrcObject->privateStream()))
+ mediaLoadingFailed(MediaPlayer::FormatError);
+ }
+ }
</ins><span class="cx"> #endif
</span><del>- if (!m_player->load(url, contentType, keySystem))
</del><ins>+
+ if (!loadAttempted && !m_player->load(url, contentType, keySystem))
</ins><span class="cx"> mediaLoadingFailed(MediaPlayer::FormatError);
</span><span class="cx">
</span><span class="cx"> // If there is no poster to display, allow the media engine to render video frames as soon as
</span><span class="lines">@@ -5650,6 +5656,10 @@
</span><span class="cx"> m_mediaSource->close();
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(MEDIA_STREAM)
+ m_mediaStreamSrcObject = nullptr;
+#endif
+
</ins><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> forgetResourceSpecificTracks();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (190019 => 190020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2015-09-20 00:17:27 UTC (rev 190019)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2015-09-20 00:43:08 UTC (rev 190020)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2007-2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2007-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -63,16 +63,19 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> #include "MediaPlayerPrivateQTKit.h"
</span><ins>+
</ins><span class="cx"> #if USE(AVFOUNDATION)
</span><span class="cx"> #include "MediaPlayerPrivateAVFoundationObjC.h"
</span><del>-#if ENABLE(MEDIA_SOURCE)
</del><ins>+#endif
+
+#if ENABLE(MEDIA_SOURCE) && USE(AVFOUNDATION)
</ins><span class="cx"> #include "MediaPlayerPrivateMediaSourceAVFObjC.h"
</span><span class="cx"> #endif
</span><del>-#endif
-#elif PLATFORM(WIN) && !USE(GSTREAMER)
-#if USE(AVFOUNDATION)
</del><ins>+
+#endif // PLATFORM(COCOA)
+
+#if PLATFORM(WIN) && USE(AVFOUNDATION) && !USE(GSTREAMER)
</ins><span class="cx"> #include "MediaPlayerPrivateAVFoundationCF.h"
</span><del>-#endif // USE(AVFOUNDATION)
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -178,16 +181,20 @@
</span><span class="cx"> {
</span><span class="cx"> #if USE(AVFOUNDATION)
</span><span class="cx"> if (Settings::isAVFoundationEnabled()) {
</span><ins>+
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> MediaPlayerPrivateAVFoundationObjC::registerMediaEngine(addMediaEngine);
</span><ins>+#endif
+
</ins><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><span class="cx"> MediaPlayerPrivateMediaSourceAVFObjC::registerMediaEngine(addMediaEngine);
</span><span class="cx"> #endif
</span><del>-#elif PLATFORM(WIN)
</del><ins>+
+#if PLATFORM(WIN)
</ins><span class="cx"> MediaPlayerPrivateAVFoundationCF::registerMediaEngine(addMediaEngine);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><del>-#endif
</del><ins>+#endif // USE(AVFOUNDATION)
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> if (Settings::isQTKitEnabled())
</span><span class="lines">@@ -238,7 +245,7 @@
</span><span class="cx">
</span><span class="cx"> static const MediaPlayerFactory* bestMediaEngineForSupportParameters(const MediaEngineSupportParameters& parameters, const MediaPlayerFactory* current = nullptr)
</span><span class="cx"> {
</span><del>- if (parameters.type.isEmpty())
</del><ins>+ if (parameters.type.isEmpty() && !parameters.isMediaSource && !parameters.isMediaStream)
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> // 4.8.10.3 MIME types - In the absence of a specification to the contrary, the MIME type "application/octet-stream"
</span><span class="lines">@@ -307,6 +314,8 @@
</span><span class="cx">
</span><span class="cx"> bool MediaPlayer::load(const URL& url, const ContentType& contentType, const String& keySystem)
</span><span class="cx"> {
</span><ins>+ ASSERT(!m_reloadTimer.isActive());
+
</ins><span class="cx"> m_contentMIMEType = contentType.type().lower();
</span><span class="cx"> m_contentTypeCodecs = contentType.parameter(codecs());
</span><span class="cx"> m_url = url;
</span><span class="lines">@@ -345,7 +354,9 @@
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><span class="cx"> bool MediaPlayer::load(const URL& url, const ContentType& contentType, MediaSourcePrivateClient* mediaSource)
</span><span class="cx"> {
</span><ins>+ ASSERT(!m_reloadTimer.isActive());
</ins><span class="cx"> ASSERT(mediaSource);
</span><ins>+
</ins><span class="cx"> m_mediaSource = mediaSource;
</span><span class="cx"> m_contentMIMEType = contentType.type().lower();
</span><span class="cx"> m_contentTypeCodecs = contentType.parameter(codecs());
</span><span class="lines">@@ -360,7 +371,9 @@
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx"> bool MediaPlayer::load(MediaStreamPrivate* mediaStream)
</span><span class="cx"> {
</span><ins>+ ASSERT(!m_reloadTimer.isActive());
</ins><span class="cx"> ASSERT(mediaStream);
</span><ins>+
</ins><span class="cx"> m_mediaStream = mediaStream;
</span><span class="cx"> m_keySystem = "";
</span><span class="cx"> m_contentMIMEType = "";
</span><span class="lines">@@ -391,9 +404,21 @@
</span><span class="cx">
</span><span class="cx"> void MediaPlayer::loadWithNextMediaEngine(const MediaPlayerFactory* current)
</span><span class="cx"> {
</span><ins>+#if ENABLE(MEDIA_SOURCE)
+#define MEDIASOURCE m_mediaSource
+#else
+#define MEDIASOURCE 0
+#endif
+
+#if ENABLE(MEDIA_STREAM)
+#define MEDIASTREAM m_mediaStream
+#else
+#define MEDIASTREAM 0
+#endif
+
</ins><span class="cx"> const MediaPlayerFactory* engine = nullptr;
</span><span class="cx">
</span><del>- if (!m_contentMIMEType.isEmpty())
</del><ins>+ if (!m_contentMIMEType.isEmpty() || MEDIASTREAM || MEDIASOURCE)
</ins><span class="cx"> engine = nextBestMediaEngine(current);
</span><span class="cx">
</span><span class="cx"> // If no MIME type is specified or the type was inferred from the file extension, just use the next engine.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (190019 => 190020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2015-09-20 00:17:27 UTC (rev 190019)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2015-09-20 00:43:08 UTC (rev 190020)
</span><span class="lines">@@ -103,28 +103,15 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct MediaEngineSupportParameters {
</span><ins>+
+ MediaEngineSupportParameters() { }
+
</ins><span class="cx"> String type;
</span><span class="cx"> String codecs;
</span><span class="cx"> URL url;
</span><del>-#if ENABLE(ENCRYPTED_MEDIA)
</del><span class="cx"> String keySystem;
</span><del>-#endif
-#if ENABLE(MEDIA_SOURCE)
- bool isMediaSource;
-#endif
-#if ENABLE(MEDIA_STREAM)
- bool isMediaStream;
-#endif
-
- MediaEngineSupportParameters()
-#if ENABLE(MEDIA_SOURCE)
- : isMediaSource(false)
-#endif
- {
-#if ENABLE(MEDIA_STREAM)
- isMediaStream = false;
-#endif
- }
</del><ins>+ bool isMediaSource { false };
+ bool isMediaStream { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> extern const PlatformMedia NoPlatformMedia;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (190019 => 190020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2015-09-20 00:17:27 UTC (rev 190019)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2015-09-20 00:43:08 UTC (rev 190020)
</span><span class="lines">@@ -240,7 +240,8 @@
</span><span class="cx"> if (parameters.isMediaStream)
</span><span class="cx"> return MediaPlayer::IsNotSupported;
</span><span class="cx"> #endif
</span><del>- if (!mimeTypeCache().contains(parameters.type))
</del><ins>+
+ if (parameters.type.isEmpty() || !mimeTypeCache().contains(parameters.type))
</ins><span class="cx"> return MediaPlayer::IsNotSupported;
</span><span class="cx">
</span><span class="cx"> // The spec says:
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockmediasourceMockMediaPlayerMediaSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.cpp (190019 => 190020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.cpp 2015-09-20 00:17:27 UTC (rev 190019)
+++ trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.cpp 2015-09-20 00:43:08 UTC (rev 190020)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> if (!parameters.isMediaSource)
</span><span class="cx"> return MediaPlayer::IsNotSupported;
</span><span class="cx">
</span><del>- if (!mimeTypeCache().contains(parameters.type))
</del><ins>+ if (parameters.type.isEmpty() || !mimeTypeCache().contains(parameters.type))
</ins><span class="cx"> return MediaPlayer::IsNotSupported;
</span><span class="cx">
</span><span class="cx"> if (parameters.codecs.isEmpty())
</span></span></pre>
</div>
</div>
</body>
</html>