<!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>[163023] 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/163023">163023</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2014-01-29 09:36:06 -0800 (Wed, 29 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] cleanup MediaPlayer.cpp
https://bugs.webkit.org/show_bug.cgi?id=127821
Reviewed by Jer Noble.
Don't register MediaPlayerPrivateIOS unless the runtime setting for media player proxy is set.
* platform/graphics/MediaPlayer.cpp: Don't define PlatformMediaEngineClassName on iOS
(WebCore::installedMediaEngines): Drive by cleanup to return early if registration has
already happened.
(WebCore::MediaPlayer::MediaPlayer): Don't force-register the first media engine unless
isVideoPluginProxyEnabled returns true.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayercpp">trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163022 => 163023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-29 17:03:59 UTC (rev 163022)
+++ trunk/Source/WebCore/ChangeLog 2014-01-29 17:36:06 UTC (rev 163023)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-01-29 Eric Carlson <eric.carlson@apple.com>
+
+ [iOS] cleanup MediaPlayer.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=127821
+
+ Reviewed by Jer Noble.
+
+ Don't register MediaPlayerPrivateIOS unless the runtime setting for media player proxy is set.
+
+ * platform/graphics/MediaPlayer.cpp: Don't define PlatformMediaEngineClassName on iOS
+ (WebCore::installedMediaEngines): Drive by cleanup to return early if registration has
+ already happened.
+ (WebCore::MediaPlayer::MediaPlayer): Don't force-register the first media engine unless
+ isVideoPluginProxyEnabled returns true.
+
</ins><span class="cx"> 2014-01-29 Youenn Fablet <youennf@gmail.com>
</span><span class="cx">
</span><span class="cx"> Have XHR.getResponseHeader() return null and XHR.getAllResponseHeader() return the empty string in initial ready states
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (163022 => 163023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-01-29 17:03:59 UTC (rev 163022)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-01-29 17:36:06 UTC (rev 163023)
</span><span class="lines">@@ -56,7 +56,6 @@
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #include "MediaPlayerPrivateIOS.h"
</span><del>-#define PlatformMediaEngineClassName MediaPlayerPrivateIOS
</del><span class="cx"> #else
</span><span class="cx"> #include "MediaPlayerPrivateQTKit.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -204,38 +203,37 @@
</span><span class="cx"> return installedEngines;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!enginesQueried) {
- enginesQueried = true;
</del><ins>+ if (enginesQueried)
+ return installedEngines;
</ins><span class="cx">
</span><ins>+ enginesQueried = true;
+
</ins><span class="cx"> #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
</span><span class="cx"> if (Settings::isVideoPluginProxyEnabled())
</span><span class="cx"> MediaPlayerPrivateIOS::registerMediaEngine(addMediaEngine);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(AVFOUNDATION)
</span><del>- if (Settings::isAVFoundationEnabled()) {
</del><ins>+ if (Settings::isAVFoundationEnabled()) {
</ins><span class="cx"> #if PLATFORM(MAC)
</span><del>- MediaPlayerPrivateAVFoundationObjC::registerMediaEngine(addMediaEngine);
</del><ins>+ MediaPlayerPrivateAVFoundationObjC::registerMediaEngine(addMediaEngine);
</ins><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><del>- MediaPlayerPrivateMediaSourceAVFObjC::registerMediaEngine(addMediaEngine);
</del><ins>+ MediaPlayerPrivateMediaSourceAVFObjC::registerMediaEngine(addMediaEngine);
</ins><span class="cx"> #endif
</span><span class="cx"> #elif PLATFORM(WIN)
</span><del>- MediaPlayerPrivateAVFoundationCF::registerMediaEngine(addMediaEngine);
</del><ins>+ MediaPlayerPrivateAVFoundationCF::registerMediaEngine(addMediaEngine);
</ins><span class="cx"> #endif
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
-#if PLATFORM(MAC)
- if (Settings::isQTKitEnabled())
- MediaPlayerPrivateQTKit::registerMediaEngine(addMediaEngine);
</del><ins>+#if PLATFORM(MAC) && !PLATFORM(IOS)
+ if (Settings::isQTKitEnabled())
+ MediaPlayerPrivateQTKit::registerMediaEngine(addMediaEngine);
</ins><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if defined(PlatformMediaEngineClassName)
</span><del>- PlatformMediaEngineClassName::registerMediaEngine(addMediaEngine);
</del><ins>+ PlatformMediaEngineClassName::registerMediaEngine(addMediaEngine);
</ins><span class="cx"> #endif
</span><del>- }
</del><span class="cx">
</span><span class="cx"> return installedEngines;
</span><span class="cx"> }
</span><span class="lines">@@ -343,7 +341,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
</span><span class="cx"> Vector<MediaPlayerFactory*>& engines = installedMediaEngines();
</span><del>- if (!engines.isEmpty()) {
</del><ins>+ if (Settings::isVideoPluginProxyEnabled() && !engines.isEmpty()) {
</ins><span class="cx"> m_currentMediaEngine = engines[0];
</span><span class="cx"> m_private = engines[0]->constructor(this);
</span><span class="cx"> if (m_mediaPlayerClient)
</span></span></pre>
</div>
</div>
</body>
</html>