<!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>[179246] 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/179246">179246</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2015-01-28 01:22:02 -0800 (Wed, 28 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix MediaPlayerEngine leaks
https://bugs.webkit.org/show_bug.cgi?id=140992
Reviewed by Jer Noble.
* platform/graphics/MediaPlayer.cpp:
(WebCore::mutableInstalledMediaEnginesVector): Added.
(WebCore::buildMediaEnginesVector): Added.
(WebCore::installedMediaEngines): Changed this to be a vector of factories
instead of a vector of heap-allocated factories. The old code would leak
all the factories when this was called with the ResetEngines option.
(WebCore::addMediaEngine): Updated for above change.
(WebCore::bestMediaEngineForSupportParameters): Ditto.
(WebCore::nextMediaEngine): Ditto.
(WebCore::MediaPlayer::nextBestMediaEngine): Ditto.
(WebCore::MediaPlayer::loadWithNextMediaEngine): Ditto.
(WebCore::MediaPlayer::supportsType): Ditto.
(WebCore::MediaPlayer::getSupportedTypes): Ditto.
(WebCore::MediaPlayer::getSitesInMediaCache): Ditto.
(WebCore::MediaPlayer::clearMediaCache): Ditto.
(WebCore::MediaPlayer::clearMediaCacheForSite): Ditto.
(WebCore::MediaPlayer::supportsKeySystem): Ditto.
(WebCore::MediaPlayer::resetMediaEngines): Ditto.
* platform/graphics/MediaPlayer.h: Ditto.</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>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayerh">trunk/Source/WebCore/platform/graphics/MediaPlayer.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (179245 => 179246)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-28 08:44:28 UTC (rev 179245)
+++ trunk/Source/WebCore/ChangeLog 2015-01-28 09:22:02 UTC (rev 179246)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-01-28 Darin Adler <darin@apple.com>
+
+ Fix MediaPlayerEngine leaks
+ https://bugs.webkit.org/show_bug.cgi?id=140992
+
+ Reviewed by Jer Noble.
+
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::mutableInstalledMediaEnginesVector): Added.
+ (WebCore::buildMediaEnginesVector): Added.
+ (WebCore::installedMediaEngines): Changed this to be a vector of factories
+ instead of a vector of heap-allocated factories. The old code would leak
+ all the factories when this was called with the ResetEngines option.
+ (WebCore::addMediaEngine): Updated for above change.
+ (WebCore::bestMediaEngineForSupportParameters): Ditto.
+ (WebCore::nextMediaEngine): Ditto.
+ (WebCore::MediaPlayer::nextBestMediaEngine): Ditto.
+ (WebCore::MediaPlayer::loadWithNextMediaEngine): Ditto.
+ (WebCore::MediaPlayer::supportsType): Ditto.
+ (WebCore::MediaPlayer::getSupportedTypes): Ditto.
+ (WebCore::MediaPlayer::getSitesInMediaCache): Ditto.
+ (WebCore::MediaPlayer::clearMediaCache): Ditto.
+ (WebCore::MediaPlayer::clearMediaCacheForSite): Ditto.
+ (WebCore::MediaPlayer::supportsKeySystem): Ditto.
+ (WebCore::MediaPlayer::resetMediaEngines): Ditto.
+ * platform/graphics/MediaPlayer.h: Ditto.
+
</ins><span class="cx"> 2015-01-28 Jeongmin Kim <jm86.kim@lge.com>
</span><span class="cx">
</span><span class="cx"> Rename descendentxxx to descendantxxxx in RenderLayerBacking
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (179245 => 179246)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2015-01-28 08:44:28 UTC (rev 179245)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2015-01-28 09:22:02 UTC (rev 179246)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #include "MediaPlayerPrivate.h"
</span><span class="cx"> #include "PlatformTimeRanges.h"
</span><span class="cx"> #include "Settings.h"
</span><ins>+#include <wtf/NeverDestroyed.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="lines">@@ -153,20 +154,6 @@
</span><span class="cx"> // engine support
</span><span class="cx">
</span><span class="cx"> struct MediaPlayerFactory {
</span><del>- WTF_MAKE_NONCOPYABLE(MediaPlayerFactory); WTF_MAKE_FAST_ALLOCATED;
-public:
- MediaPlayerFactory(CreateMediaEnginePlayer constructor, MediaEngineSupportedTypes getSupportedTypes, MediaEngineSupportsType supportsTypeAndCodecs,
- MediaEngineGetSitesInMediaCache getSitesInMediaCache, MediaEngineClearMediaCache clearMediaCache, MediaEngineClearMediaCacheForSite clearMediaCacheForSite, MediaEngineSupportsKeySystem supportsKeySystem)
- : constructor(constructor)
- , getSupportedTypes(getSupportedTypes)
- , supportsTypeAndCodecs(supportsTypeAndCodecs)
- , getSitesInMediaCache(getSitesInMediaCache)
- , clearMediaCache(clearMediaCache)
- , clearMediaCacheForSite(clearMediaCacheForSite)
- , supportsKeySystem(supportsKeySystem)
- {
- }
-
</del><span class="cx"> CreateMediaEnginePlayer constructor;
</span><span class="cx"> MediaEngineSupportedTypes getSupportedTypes;
</span><span class="cx"> MediaEngineSupportsType supportsTypeAndCodecs;
</span><span class="lines">@@ -178,26 +165,16 @@
</span><span class="cx">
</span><span class="cx"> static void addMediaEngine(CreateMediaEnginePlayer, MediaEngineSupportedTypes, MediaEngineSupportsType, MediaEngineGetSitesInMediaCache, MediaEngineClearMediaCache, MediaEngineClearMediaCacheForSite, MediaEngineSupportsKeySystem);
</span><span class="cx">
</span><del>-static MediaPlayerFactory* bestMediaEngineForSupportParameters(const MediaEngineSupportParameters&, MediaPlayerFactory* current = 0);
-static MediaPlayerFactory* nextMediaEngine(MediaPlayerFactory* current);
</del><ins>+static bool haveMediaEnginesVector;
</ins><span class="cx">
</span><del>-enum RequeryEngineOptions { DoNotResetEngines, ResetEngines };
-static Vector<MediaPlayerFactory*>& installedMediaEngines(RequeryEngineOptions requeryFlags = DoNotResetEngines )
</del><ins>+static Vector<MediaPlayerFactory>& mutableInstalledMediaEnginesVector()
</ins><span class="cx"> {
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(Vector<MediaPlayerFactory*>, installedEngines, ());
- static bool enginesQueried = false;
</del><ins>+ static NeverDestroyed<Vector<MediaPlayerFactory>> installedEngines;
+ return installedEngines;
+}
</ins><span class="cx">
</span><del>- if (requeryFlags == ResetEngines) {
- installedEngines.clear();
- enginesQueried = false;
- return installedEngines;
- }
-
- if (enginesQueried)
- return installedEngines;
-
- enginesQueried = true;
-
</del><ins>+static void buildMediaEnginesVector()
+{
</ins><span class="cx"> #if USE(AVFOUNDATION)
</span><span class="cx"> if (Settings::isAVFoundationEnabled()) {
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="lines">@@ -220,9 +197,16 @@
</span><span class="cx"> PlatformMediaEngineClassName::registerMediaEngine(addMediaEngine);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- return installedEngines;
</del><ins>+ haveMediaEnginesVector = true;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+static const Vector<MediaPlayerFactory>& installedMediaEngines()
+{
+ if (!haveMediaEnginesVector)
+ buildMediaEnginesVector();
+ return mutableInstalledMediaEnginesVector();
+}
+
</ins><span class="cx"> static void addMediaEngine(CreateMediaEnginePlayer constructor, MediaEngineSupportedTypes getSupportedTypes, MediaEngineSupportsType supportsType,
</span><span class="cx"> MediaEngineGetSitesInMediaCache getSitesInMediaCache, MediaEngineClearMediaCache clearMediaCache, MediaEngineClearMediaCacheForSite clearMediaCacheForSite, MediaEngineSupportsKeySystem supportsKeySystem)
</span><span class="cx"> {
</span><span class="lines">@@ -230,7 +214,7 @@
</span><span class="cx"> ASSERT(getSupportedTypes);
</span><span class="cx"> ASSERT(supportsType);
</span><span class="cx">
</span><del>- installedMediaEngines().append(new MediaPlayerFactory(constructor, getSupportedTypes, supportsType, getSitesInMediaCache, clearMediaCache, clearMediaCacheForSite, supportsKeySystem));
</del><ins>+ mutableInstalledMediaEnginesVector().append(MediaPlayerFactory { constructor, getSupportedTypes, supportsType, getSitesInMediaCache, clearMediaCache, clearMediaCacheForSite, supportsKeySystem });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static const AtomicString& applicationOctetStream()
</span><span class="lines">@@ -251,56 +235,51 @@
</span><span class="cx"> return codecs;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static MediaPlayerFactory* bestMediaEngineForSupportParameters(const MediaEngineSupportParameters& parameters, MediaPlayerFactory* current)
</del><ins>+static const MediaPlayerFactory* bestMediaEngineForSupportParameters(const MediaEngineSupportParameters& parameters, const MediaPlayerFactory* current = nullptr)
</ins><span class="cx"> {
</span><span class="cx"> if (parameters.type.isEmpty())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><del>- Vector<MediaPlayerFactory*>& engines = installedMediaEngines();
- if (engines.isEmpty())
- return 0;
-
- // 4.8.10.3 MIME types - In the absence of a specification to the contrary, the MIME type "application/octet-stream"
</del><ins>+ // 4.8.10.3 MIME types - In the absence of a specification to the contrary, the MIME type "application/octet-stream"
</ins><span class="cx"> // when used with parameters, e.g. "application/octet-stream;codecs=theora", is a type that the user agent knows
</span><span class="cx"> // it cannot render.
</span><span class="cx"> if (parameters.type == applicationOctetStream()) {
</span><span class="cx"> if (!parameters.codecs.isEmpty())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- MediaPlayerFactory* engine = 0;
</del><ins>+ const MediaPlayerFactory* foundEngine = nullptr;
</ins><span class="cx"> MediaPlayer::SupportsType supported = MediaPlayer::IsNotSupported;
</span><del>- unsigned count = engines.size();
- for (unsigned ndx = 0; ndx < count; ndx++) {
</del><ins>+ for (auto& engine : installedMediaEngines()) {
</ins><span class="cx"> if (current) {
</span><del>- if (current == engines[ndx])
- current = 0;
</del><ins>+ if (current == &engine)
+ current = nullptr;
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><del>- MediaPlayer::SupportsType engineSupport = engines[ndx]->supportsTypeAndCodecs(parameters);
</del><ins>+ MediaPlayer::SupportsType engineSupport = engine.supportsTypeAndCodecs(parameters);
</ins><span class="cx"> if (engineSupport > supported) {
</span><span class="cx"> supported = engineSupport;
</span><del>- engine = engines[ndx];
</del><ins>+ foundEngine = &engine;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return engine;
</del><ins>+ return foundEngine;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static MediaPlayerFactory* nextMediaEngine(MediaPlayerFactory* current)
</del><ins>+static const MediaPlayerFactory* nextMediaEngine(const MediaPlayerFactory* current)
</ins><span class="cx"> {
</span><del>- Vector<MediaPlayerFactory*>& engines = installedMediaEngines();
</del><ins>+ auto& engines = installedMediaEngines();
</ins><span class="cx"> if (engines.isEmpty())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> if (!current)
</span><del>- return engines.first();
</del><ins>+ return &engines.first();
</ins><span class="cx">
</span><del>- size_t currentIndex = engines.find(current);
- if (currentIndex == WTF::notFound || currentIndex + 1 >= engines.size())
- return 0;
</del><ins>+ size_t currentIndex = current - &engines.first();
+ if (currentIndex + 1 >= engines.size())
+ return nullptr;
</ins><span class="cx">
</span><del>- return engines[currentIndex + 1];
</del><ins>+ return &engines[currentIndex + 1];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // media player
</span><span class="lines">@@ -374,7 +353,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-MediaPlayerFactory* MediaPlayer::nextBestMediaEngine(MediaPlayerFactory* current) const
</del><ins>+const MediaPlayerFactory* MediaPlayer::nextBestMediaEngine(const MediaPlayerFactory* current) const
</ins><span class="cx"> {
</span><span class="cx"> MediaEngineSupportParameters parameters;
</span><span class="cx"> parameters.type = m_contentMIMEType;
</span><span class="lines">@@ -390,9 +369,9 @@
</span><span class="cx"> return bestMediaEngineForSupportParameters(parameters, current);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayer::loadWithNextMediaEngine(MediaPlayerFactory* current)
</del><ins>+void MediaPlayer::loadWithNextMediaEngine(const MediaPlayerFactory* current)
</ins><span class="cx"> {
</span><del>- MediaPlayerFactory* engine = 0;
</del><ins>+ const MediaPlayerFactory* engine = nullptr;
</ins><span class="cx">
</span><span class="cx"> if (!m_contentMIMEType.isEmpty())
</span><span class="cx"> engine = nextBestMediaEngine(current);
</span><span class="lines">@@ -782,7 +761,7 @@
</span><span class="cx"> if (parameters.type == applicationOctetStream())
</span><span class="cx"> return IsNotSupported;
</span><span class="cx">
</span><del>- MediaPlayerFactory* engine = bestMediaEngineForSupportParameters(parameters);
</del><ins>+ const MediaPlayerFactory* engine = bestMediaEngineForSupportParameters(parameters);
</ins><span class="cx"> if (!engine)
</span><span class="cx"> return IsNotSupported;
</span><span class="cx">
</span><span class="lines">@@ -808,13 +787,8 @@
</span><span class="cx">
</span><span class="cx"> void MediaPlayer::getSupportedTypes(HashSet<String>& types)
</span><span class="cx"> {
</span><del>- Vector<MediaPlayerFactory*>& engines = installedMediaEngines();
- if (engines.isEmpty())
- return;
-
- unsigned count = engines.size();
- for (unsigned ndx = 0; ndx < count; ndx++)
- engines[ndx]->getSupportedTypes(types);
</del><ins>+ for (auto& engine : installedMediaEngines())
+ engine.getSupportedTypes(types);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool MediaPlayer::isAvailable()
</span><span class="lines">@@ -966,41 +940,35 @@
</span><span class="cx">
</span><span class="cx"> void MediaPlayer::getSitesInMediaCache(Vector<String>& sites)
</span><span class="cx"> {
</span><del>- Vector<MediaPlayerFactory*>& engines = installedMediaEngines();
- unsigned size = engines.size();
- for (unsigned i = 0; i < size; i++) {
- if (!engines[i]->getSitesInMediaCache)
</del><ins>+ for (auto& engine : installedMediaEngines()) {
+ if (!engine.getSitesInMediaCache)
</ins><span class="cx"> continue;
</span><span class="cx"> Vector<String> engineSites;
</span><del>- engines[i]->getSitesInMediaCache(engineSites);
</del><ins>+ engine.getSitesInMediaCache(engineSites);
</ins><span class="cx"> sites.appendVector(engineSites);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayer::clearMediaCache()
</span><span class="cx"> {
</span><del>- Vector<MediaPlayerFactory*>& engines = installedMediaEngines();
- unsigned size = engines.size();
- for (unsigned i = 0; i < size; i++) {
- if (engines[i]->clearMediaCache)
- engines[i]->clearMediaCache();
</del><ins>+ for (auto& engine : installedMediaEngines()) {
+ if (engine.clearMediaCache)
+ engine.clearMediaCache();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayer::clearMediaCacheForSite(const String& site)
</span><span class="cx"> {
</span><del>- Vector<MediaPlayerFactory*>& engines = installedMediaEngines();
- unsigned size = engines.size();
- for (unsigned i = 0; i < size; i++) {
- if (engines[i]->clearMediaCacheForSite)
- engines[i]->clearMediaCacheForSite(site);
</del><ins>+ for (auto& engine : installedMediaEngines()) {
+ if (engine.clearMediaCacheForSite)
+ engine.clearMediaCacheForSite(site);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool MediaPlayer::supportsKeySystem(const String& keySystem, const String& mimeType)
</span><span class="cx"> {
</span><span class="cx"> for (auto& engine : installedMediaEngines()) {
</span><del>- if (engine->supportsKeySystem && engine->supportsKeySystem(keySystem, mimeType))
</del><ins>+ if (engine.supportsKeySystem && engine.supportsKeySystem(keySystem, mimeType))
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="lines">@@ -1248,7 +1216,8 @@
</span><span class="cx">
</span><span class="cx"> void MediaPlayer::resetMediaEngines()
</span><span class="cx"> {
</span><del>- installedMediaEngines(ResetEngines);
</del><ins>+ mutableInstalledMediaEnginesVector().clear();
+ haveMediaEnginesVector = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(GSTREAMER)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (179245 => 179246)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2015-01-28 08:44:28 UTC (rev 179245)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2015-01-28 09:22:02 UTC (rev 179246)
</span><span class="lines">@@ -131,9 +131,10 @@
</span><span class="cx"> class IntRect;
</span><span class="cx"> class IntSize;
</span><span class="cx"> class MediaPlayer;
</span><del>-struct MediaPlayerFactory;
</del><span class="cx"> class PlatformTimeRanges;
</span><span class="cx">
</span><ins>+struct MediaPlayerFactory;
+
</ins><span class="cx"> #if PLATFORM(WIN) && USE(AVFOUNDATION)
</span><span class="cx"> struct GraphicsDeviceAdapter;
</span><span class="cx"> #endif
</span><span class="lines">@@ -581,8 +582,8 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> MediaPlayer(MediaPlayerClient&);
</span><del>- MediaPlayerFactory* nextBestMediaEngine(MediaPlayerFactory*) const;
- void loadWithNextMediaEngine(MediaPlayerFactory*);
</del><ins>+ const MediaPlayerFactory* nextBestMediaEngine(const MediaPlayerFactory*) const;
+ void loadWithNextMediaEngine(const MediaPlayerFactory*);
</ins><span class="cx"> void reloadTimerFired();
</span><span class="cx">
</span><span class="cx"> static void initializeMediaEngines();
</span><span class="lines">@@ -590,7 +591,7 @@
</span><span class="cx"> MediaPlayerClient& m_client;
</span><span class="cx"> Timer m_reloadTimer;
</span><span class="cx"> OwnPtr<MediaPlayerPrivateInterface> m_private;
</span><del>- MediaPlayerFactory* m_currentMediaEngine;
</del><ins>+ const MediaPlayerFactory* m_currentMediaEngine;
</ins><span class="cx"> URL m_url;
</span><span class="cx"> String m_contentMIMEType;
</span><span class="cx"> String m_contentTypeCodecs;
</span></span></pre>
</div>
</div>
</body>
</html>