<!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>[163816] 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/163816">163816</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2014-02-10 14:08:55 -0800 (Mon, 10 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[MSE] Fix layering violations in MediaSource
https://bugs.webkit.org/show_bug.cgi?id=128546
Reviewed by Eric Carlson.
Code in Modules should be considered part of html/ and should have the
same layering properties. Get rid of HTMLMediaSource (which was intended
to allow Modules/mediasource to be considered part of platform/) and add
a new client interface allowing communication from platform/ ->
Modules/mediasource.
Replace HTMLMediaSource -> MediaSourcePrivateClient:
* html/HTMLMediaSource.cpp: Removed.
* html/HTMLMediaSource.h: Removed.
* platform/graphics/MediaSourcePrivateClient.h: Added.
(WebCore::MediaSourcePrivateClient::~MediaSourcePrivateClient):
Move registry support from HTMLMediaSource -> MediaSource.
* Modules/mediasource/MediaSource.cpp:
(WebCore::MediaSource::setRegistry): Moved from HTMLMediaSource.cpp.
* Modules/mediasource/MediaSource.h:
(WebCore::MediaSource::lookup): Ditto.
Update references to HTMLMediaSource -> MediaSource:
* Modules/mediasource/MediaSourceRegistry.cpp:
(WebCore::MediaSourceRegistry::MediaSourceRegistry):
* WebCore.xcodeproj/project.pbxproj:
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::loadResource):
* html/HTMLMediaElement.h:
Update references to HTMLMediaSource -> MediaSourcePrivateClient:
* platform/graphics/MediaPlayer.cpp:
(WebCore::NullMediaPlayerPrivate::load):
(WebCore::MediaPlayer::load): Ditto.
(WebCore::MediaPlayer::loadWithNextMediaEngine):
* platform/graphics/MediaPlayer.h:
* platform/graphics/MediaPlayerPrivate.h:
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
(WebCore::MediaPlayerPrivateAVFoundation::load):
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::load):
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivateGStreamer::load):
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
* platform/graphics/gstreamer/MediaSourceGStreamer.cpp:
(WebCore::MediaSourceGStreamer::open):
* platform/graphics/gstreamer/MediaSourceGStreamer.h:
* platform/graphics/ios/MediaPlayerPrivateIOS.h:
* platform/graphics/mac/MediaPlayerPrivateQTKit.h:
* platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
(WebCore::MediaPlayerPrivateQTKit::load):
* platform/mock/mediasource/MockMediaPlayerMediaSource.cpp:
(WebCore::MockMediaPlayerMediaSource::load):
* platform/mock/mediasource/MockMediaPlayerMediaSource.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasourceMediaSourcecpp">trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasourceMediaSourceh">trunk/Source/WebCore/Modules/mediasource/MediaSource.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasourceMediaSourceRegistrycpp">trunk/Source/WebCore/Modules/mediasource/MediaSourceRegistry.cpp</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementh">trunk/Source/WebCore/html/HTMLMediaElement.h</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="#trunkSourceWebCoreplatformgraphicsMediaPlayerPrivateh">trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationcpp">trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationh">trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerh">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaSourceGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/MediaSourceGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaSourceGStreamerh">trunk/Source/WebCore/platform/graphics/gstreamer/MediaSourceGStreamer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsiosMediaPlayerPrivateIOSh">trunk/Source/WebCore/platform/graphics/ios/MediaPlayerPrivateIOS.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKith">trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm">trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmockmediasourceMockMediaPlayerMediaSourcecpp">trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmockmediasourceMockMediaPlayerMediaSourceh">trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaSourcePrivateClienth">trunk/Source/WebCore/platform/graphics/MediaSourcePrivateClient.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaSourcecpp">trunk/Source/WebCore/html/HTMLMediaSource.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaSourceh">trunk/Source/WebCore/html/HTMLMediaSource.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163815 => 163816)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-10 22:04:23 UTC (rev 163815)
+++ trunk/Source/WebCore/ChangeLog 2014-02-10 22:08:55 UTC (rev 163816)
</span><span class="lines">@@ -1,3 +1,63 @@
</span><ins>+2014-02-10 Jer Noble <jer.noble@apple.com>
+
+ [MSE] Fix layering violations in MediaSource
+ https://bugs.webkit.org/show_bug.cgi?id=128546
+
+ Reviewed by Eric Carlson.
+
+ Code in Modules should be considered part of html/ and should have the
+ same layering properties. Get rid of HTMLMediaSource (which was intended
+ to allow Modules/mediasource to be considered part of platform/) and add
+ a new client interface allowing communication from platform/ ->
+ Modules/mediasource.
+
+ Replace HTMLMediaSource -> MediaSourcePrivateClient:
+ * html/HTMLMediaSource.cpp: Removed.
+ * html/HTMLMediaSource.h: Removed.
+ * platform/graphics/MediaSourcePrivateClient.h: Added.
+ (WebCore::MediaSourcePrivateClient::~MediaSourcePrivateClient):
+
+ Move registry support from HTMLMediaSource -> MediaSource.
+ * Modules/mediasource/MediaSource.cpp:
+ (WebCore::MediaSource::setRegistry): Moved from HTMLMediaSource.cpp.
+ * Modules/mediasource/MediaSource.h:
+ (WebCore::MediaSource::lookup): Ditto.
+
+ Update references to HTMLMediaSource -> MediaSource:
+ * Modules/mediasource/MediaSourceRegistry.cpp:
+ (WebCore::MediaSourceRegistry::MediaSourceRegistry):
+ * WebCore.xcodeproj/project.pbxproj:
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::loadResource):
+ * html/HTMLMediaElement.h:
+
+ Update references to HTMLMediaSource -> MediaSourcePrivateClient:
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::NullMediaPlayerPrivate::load):
+ (WebCore::MediaPlayer::load): Ditto.
+ (WebCore::MediaPlayer::loadWithNextMediaEngine):
+ * platform/graphics/MediaPlayer.h:
+ * platform/graphics/MediaPlayerPrivate.h:
+ * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
+ (WebCore::MediaPlayerPrivateAVFoundation::load):
+ * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::load):
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::MediaPlayerPrivateGStreamer::load):
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
+ * platform/graphics/gstreamer/MediaSourceGStreamer.cpp:
+ (WebCore::MediaSourceGStreamer::open):
+ * platform/graphics/gstreamer/MediaSourceGStreamer.h:
+ * platform/graphics/ios/MediaPlayerPrivateIOS.h:
+ * platform/graphics/mac/MediaPlayerPrivateQTKit.h:
+ * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+ (WebCore::MediaPlayerPrivateQTKit::load):
+ * platform/mock/mediasource/MockMediaPlayerMediaSource.cpp:
+ (WebCore::MockMediaPlayerMediaSource::load):
+ * platform/mock/mediasource/MockMediaPlayerMediaSource.h:
+
</ins><span class="cx"> 2014-02-10 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove some unused functions from SerializedScriptValue
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasourceMediaSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp (163815 => 163816)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp 2014-02-10 22:04:23 UTC (rev 163815)
+++ trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp 2014-02-10 22:08:55 UTC (rev 163816)
</span><span class="lines">@@ -58,6 +58,14 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+URLRegistry* MediaSource::s_registry = 0;
+
+void MediaSource::setRegistry(URLRegistry* registry)
+{
+ ASSERT(!s_registry);
+ s_registry = registry;
+}
+
</ins><span class="cx"> PassRefPtr<MediaSource> MediaSource::create(ScriptExecutionContext& context)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<MediaSource> mediaSource(adoptRef(new MediaSource(context)));
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasourceMediaSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasource/MediaSource.h (163815 => 163816)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasource/MediaSource.h 2014-02-10 22:04:23 UTC (rev 163815)
+++ trunk/Source/WebCore/Modules/mediasource/MediaSource.h 2014-02-10 22:08:55 UTC (rev 163816)
</span><span class="lines">@@ -36,8 +36,8 @@
</span><span class="cx"> #include "ActiveDOMObject.h"
</span><span class="cx"> #include "EventTarget.h"
</span><span class="cx"> #include "GenericEventQueue.h"
</span><del>-#include "HTMLMediaSource.h"
</del><span class="cx"> #include "MediaSourcePrivate.h"
</span><ins>+#include "MediaSourcePrivateClient.h"
</ins><span class="cx"> #include "ScriptWrappable.h"
</span><span class="cx"> #include "SourceBuffer.h"
</span><span class="cx"> #include "SourceBufferList.h"
</span><span class="lines">@@ -50,8 +50,11 @@
</span><span class="cx">
</span><span class="cx"> class GenericEventQueue;
</span><span class="cx">
</span><del>-class MediaSource : public RefCounted<MediaSource>, public HTMLMediaSource, public ActiveDOMObject, public EventTargetWithInlineData, public ScriptWrappable {
</del><ins>+class MediaSource : public MediaSourcePrivateClient, public ActiveDOMObject, public EventTargetWithInlineData, public ScriptWrappable, public URLRegistrable {
</ins><span class="cx"> public:
</span><ins>+ static void setRegistry(URLRegistry*);
+ static MediaSource* lookup(const String& url) { return s_registry ? static_cast<MediaSource*>(s_registry->lookup(url)) : 0; }
+
</ins><span class="cx"> static const AtomicString& openKeyword();
</span><span class="cx"> static const AtomicString& closedKeyword();
</span><span class="cx"> static const AtomicString& endedKeyword();
</span><span class="lines">@@ -66,17 +69,16 @@
</span><span class="cx"> void sourceBufferDidChangeAcitveState(SourceBuffer*, bool);
</span><span class="cx"> void streamEndedWithError(const AtomicString& error, ExceptionCode&);
</span><span class="cx">
</span><del>- // HTMLMediaSource
- virtual bool attachToElement(HTMLMediaElement*) override;
</del><ins>+ // MediaSourcePrivateClient
</ins><span class="cx"> virtual void setPrivateAndOpen(PassRef<MediaSourcePrivate>) override;
</span><del>- virtual void close() override;
- virtual bool isClosed() const override;
</del><span class="cx"> virtual double duration() const override;
</span><span class="cx"> virtual PassRefPtr<TimeRanges> buffered() const override;
</span><del>- virtual void refHTMLMediaSource() override { ref(); }
- virtual void derefHTMLMediaSource() override { deref(); }
- virtual void monitorSourceBuffers() override;
</del><span class="cx">
</span><ins>+ bool attachToElement(HTMLMediaElement*);
+ void close();
+ bool isClosed() const;
+ void monitorSourceBuffers();
+
</ins><span class="cx"> void setDuration(double, ExceptionCode&);
</span><span class="cx"> const AtomicString& readyState() const { return m_readyState; }
</span><span class="cx"> void setReadyState(const AtomicString&);
</span><span class="lines">@@ -104,8 +106,8 @@
</span><span class="cx"> // URLRegistrable interface
</span><span class="cx"> virtual URLRegistry& registry() const override;
</span><span class="cx">
</span><del>- using RefCounted<MediaSource>::ref;
- using RefCounted<MediaSource>::deref;
</del><ins>+ using RefCounted<MediaSourcePrivateClient>::ref;
+ using RefCounted<MediaSourcePrivateClient>::deref;
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> explicit MediaSource(ScriptExecutionContext&);
</span><span class="lines">@@ -117,6 +119,8 @@
</span><span class="cx"> void scheduleEvent(const AtomicString& eventName);
</span><span class="cx"> GenericEventQueue& asyncEventQueue() { return m_asyncEventQueue; }
</span><span class="cx">
</span><ins>+ static URLRegistry* s_registry;
+
</ins><span class="cx"> RefPtr<MediaSourcePrivate> m_private;
</span><span class="cx"> RefPtr<SourceBufferList> m_sourceBuffers;
</span><span class="cx"> RefPtr<SourceBufferList> m_activeSourceBuffers;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasourceMediaSourceRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasource/MediaSourceRegistry.cpp (163815 => 163816)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasource/MediaSourceRegistry.cpp 2014-02-10 22:04:23 UTC (rev 163815)
+++ trunk/Source/WebCore/Modules/mediasource/MediaSourceRegistry.cpp 2014-02-10 22:08:55 UTC (rev 163816)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">
</span><span class="cx"> MediaSourceRegistry::MediaSourceRegistry()
</span><span class="cx"> {
</span><del>- HTMLMediaSource::setRegistry(this);
</del><ins>+ MediaSource::setRegistry(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (163815 => 163816)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-02-10 22:04:23 UTC (rev 163815)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-02-10 22:08:55 UTC (rev 163816)
</span><span class="lines">@@ -5493,8 +5493,6 @@
</span><span class="cx"> CD9DE17D17AAC75B00EA386D /* JSSourceBufferList.h in Headers */ = {isa = PBXBuildFile; fileRef = CD9DE17917AAC75B00EA386D /* JSSourceBufferList.h */; };
</span><span class="cx"> CD9DE18117AAD6A400EA386D /* DOMURLMediaSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD9DE17E17AAD64E00EA386D /* DOMURLMediaSource.cpp */; };
</span><span class="cx"> CD9DE18217AAD6A400EA386D /* DOMURLMediaSource.h in Headers */ = {isa = PBXBuildFile; fileRef = CD9DE17F17AAD64E00EA386D /* DOMURLMediaSource.h */; };
</span><del>- CD9DE18517AB0CF300EA386D /* HTMLMediaSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD9DE18317AB0CF300EA386D /* HTMLMediaSource.cpp */; };
- CD9DE18617AB0CF300EA386D /* HTMLMediaSource.h in Headers */ = {isa = PBXBuildFile; fileRef = CD9DE18417AB0CF300EA386D /* HTMLMediaSource.h */; };
</del><span class="cx"> CDA79824170A258300D45C55 /* AudioSession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDA79823170A258300D45C55 /* AudioSession.cpp */; };
</span><span class="cx"> CDA79827170A279100D45C55 /* AudioSessionIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDA79825170A279000D45C55 /* AudioSessionIOS.mm */; };
</span><span class="cx"> CDA7982A170A3D0000D45C55 /* AudioSession.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA79821170A22DC00D45C55 /* AudioSession.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -5535,6 +5533,7 @@
</span><span class="cx"> CDD525D7145B6DD0008D204D /* JSHTMLMediaElementCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDF65CCC145B6AFE00C4C7AA /* JSHTMLMediaElementCustom.cpp */; };
</span><span class="cx"> CDD7089618359F6F002B3DC6 /* SampleMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDD7089418359F6E002B3DC6 /* SampleMap.cpp */; };
</span><span class="cx"> CDD7089718359F6F002B3DC6 /* SampleMap.h in Headers */ = {isa = PBXBuildFile; fileRef = CDD7089518359F6F002B3DC6 /* SampleMap.h */; };
</span><ins>+ CDDC1E7A18A952F30027A9D4 /* MediaSourcePrivateClient.h in Headers */ = {isa = PBXBuildFile; fileRef = CDDC1E7918A952F30027A9D4 /* MediaSourcePrivateClient.h */; };
</ins><span class="cx"> CDE3A85417F5FCE600C5BE20 /* AudioTrackPrivateAVF.h in Headers */ = {isa = PBXBuildFile; fileRef = CDE3A85217F5FCE600C5BE20 /* AudioTrackPrivateAVF.h */; };
</span><span class="cx"> CDE3A85717F6020400C5BE20 /* AudioTrackPrivateAVFObjC.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDE3A85517F6020400C5BE20 /* AudioTrackPrivateAVFObjC.mm */; };
</span><span class="cx"> CDE3A85817F6020400C5BE20 /* AudioTrackPrivateAVFObjC.h in Headers */ = {isa = PBXBuildFile; fileRef = CDE3A85617F6020400C5BE20 /* AudioTrackPrivateAVFObjC.h */; };
</span><span class="lines">@@ -12728,8 +12727,6 @@
</span><span class="cx"> CD9DE17E17AAD64E00EA386D /* DOMURLMediaSource.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = DOMURLMediaSource.cpp; sourceTree = "<group>"; };
</span><span class="cx"> CD9DE17F17AAD64E00EA386D /* DOMURLMediaSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DOMURLMediaSource.h; sourceTree = "<group>"; };
</span><span class="cx"> CD9DE18017AAD64E00EA386D /* DOMURLMediaSource.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = DOMURLMediaSource.idl; sourceTree = "<group>"; };
</span><del>- CD9DE18317AB0CF300EA386D /* HTMLMediaSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLMediaSource.cpp; sourceTree = "<group>"; };
- CD9DE18417AB0CF300EA386D /* HTMLMediaSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLMediaSource.h; sourceTree = "<group>"; };
</del><span class="cx"> CDA79821170A22DC00D45C55 /* AudioSession.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AudioSession.h; sourceTree = "<group>"; };
</span><span class="cx"> CDA79822170A24F400D45C55 /* AudioSessionListener.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AudioSessionListener.h; sourceTree = "<group>"; };
</span><span class="cx"> CDA79823170A258300D45C55 /* AudioSession.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioSession.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -12798,6 +12795,7 @@
</span><span class="cx"> CDD1E525167BA56400CE820B /* TextTrackRepresentation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextTrackRepresentation.h; sourceTree = "<group>"; };
</span><span class="cx"> CDD7089418359F6E002B3DC6 /* SampleMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SampleMap.cpp; sourceTree = "<group>"; };
</span><span class="cx"> CDD7089518359F6F002B3DC6 /* SampleMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SampleMap.h; sourceTree = "<group>"; };
</span><ins>+ CDDC1E7918A952F30027A9D4 /* MediaSourcePrivateClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaSourcePrivateClient.h; sourceTree = "<group>"; };
</ins><span class="cx"> CDE3A85217F5FCE600C5BE20 /* AudioTrackPrivateAVF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioTrackPrivateAVF.h; sourceTree = "<group>"; };
</span><span class="cx"> CDE3A85517F6020400C5BE20 /* AudioTrackPrivateAVFObjC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AudioTrackPrivateAVFObjC.mm; path = objc/AudioTrackPrivateAVFObjC.mm; sourceTree = "<group>"; };
</span><span class="cx"> CDE3A85617F6020400C5BE20 /* AudioTrackPrivateAVFObjC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AudioTrackPrivateAVFObjC.h; path = objc/AudioTrackPrivateAVFObjC.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -17235,8 +17233,6 @@
</span><span class="cx"> E44613920CD6331000FADA75 /* HTMLMediaElement.cpp */,
</span><span class="cx"> E44613930CD6331000FADA75 /* HTMLMediaElement.h */,
</span><span class="cx"> E44613940CD6331000FADA75 /* HTMLMediaElement.idl */,
</span><del>- CD9DE18317AB0CF300EA386D /* HTMLMediaSource.cpp */,
- CD9DE18417AB0CF300EA386D /* HTMLMediaSource.h */,
</del><span class="cx"> A8EA79EC0A1916DF00A8EF5F /* HTMLMenuElement.cpp */,
</span><span class="cx"> A8EA79E80A1916DF00A8EF5F /* HTMLMenuElement.h */,
</span><span class="cx"> 1AE2AE430A1D269E00B42B25 /* HTMLMenuElement.idl */,
</span><span class="lines">@@ -19876,6 +19872,7 @@
</span><span class="cx"> E4B41E0D0CBF90BD00AF2ECE /* MediaPlayer.h */,
</span><span class="cx"> 079F5E4B0F3BEBEA005E0782 /* MediaPlayerPrivate.h */,
</span><span class="cx"> CD641EB11818F5ED00EE4C41 /* MediaSourcePrivate.h */,
</span><ins>+ CDDC1E7918A952F30027A9D4 /* MediaSourcePrivateClient.h */,
</ins><span class="cx"> 6B3480920EEF50D400AC1B41 /* NativeImagePtr.h */,
</span><span class="cx"> B27535520B053814002CE64F /* Path.cpp */,
</span><span class="cx"> B27535530B053814002CE64F /* Path.h */,
</span><span class="lines">@@ -24743,7 +24740,6 @@
</span><span class="cx"> FDA3E95C134A49EF008D4B5A /* OfflineAudioDestinationNode.h in Headers */,
</span><span class="cx"> 0014628B103CD1DE000B20DB /* OriginAccessEntry.h in Headers */,
</span><span class="cx"> FE9E89FC16E2DC0500A908F8 /* OriginLock.h in Headers */,
</span><del>- CD9DE18617AB0CF300EA386D /* HTMLMediaSource.h in Headers */,
</del><span class="cx"> FD581FAF1520F91F003A7A75 /* OscillatorNode.h in Headers */,
</span><span class="cx"> 078E091B17D14D1C00420AA1 /* NavigatorUserMediaError.h in Headers */,
</span><span class="cx"> BC5EB5DD0E81B8DD00B25965 /* OutlineValue.h in Headers */,
</span><span class="lines">@@ -25425,6 +25421,7 @@
</span><span class="cx"> 845E72FC0FD2623900A87D79 /* SVGFilter.h in Headers */,
</span><span class="cx"> 081EBF3B0FD34F4100DA7559 /* SVGFilterBuilder.h in Headers */,
</span><span class="cx"> B2227A0C0D00BF220071B782 /* SVGFilterElement.h in Headers */,
</span><ins>+ CDDC1E7A18A952F30027A9D4 /* MediaSourcePrivateClient.h in Headers */,
</ins><span class="cx"> B2227A0F0D00BF220071B782 /* SVGFilterPrimitiveStandardAttributes.h in Headers */,
</span><span class="cx"> B2227A120D00BF220071B782 /* SVGFitToViewBox.h in Headers */,
</span><span class="cx"> B237C8A80D344D110013F707 /* SVGFontData.h in Headers */,
</span><span class="lines">@@ -28554,7 +28551,6 @@
</span><span class="cx"> 93F19AE608245E59001E9ABC /* SSLKeyGeneratorMac.cpp in Sources */,
</span><span class="cx"> BC7FA62E0D1F0EFF00DB22A9 /* StaticNodeList.cpp in Sources */,
</span><span class="cx"> A5AFB34F115151A700B045CB /* StepRange.cpp in Sources */,
</span><del>- CD9DE18517AB0CF300EA386D /* HTMLMediaSource.cpp in Sources */,
</del><span class="cx"> 51E3F9C70DA059DC00250911 /* Storage.cpp in Sources */,
</span><span class="cx"> C5160EEA1004543A00A7CEE2 /* StorageAreaImpl.cpp in Sources */,
</span><span class="cx"> C5102ED00FD9EF8C00FAFF04 /* StorageAreaSync.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (163815 => 163816)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-02-10 22:04:23 UTC (rev 163815)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-02-10 22:08:55 UTC (rev 163816)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><span class="cx"> #include "DOMWindow.h"
</span><del>-#include "HTMLMediaSource.h"
</del><ins>+#include "MediaSource.h"
</ins><span class="cx"> #include "Performance.h"
</span><span class="cx"> #include "VideoPlaybackQuality.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -1230,11 +1230,11 @@
</span><span class="cx"> ASSERT(!m_mediaSource);
</span><span class="cx">
</span><span class="cx"> if (url.protocolIs(mediaSourceBlobProtocol))
</span><del>- m_mediaSource = HTMLMediaSource::lookup(url.string());
</del><ins>+ m_mediaSource = MediaSource::lookup(url.string());
</ins><span class="cx">
</span><span class="cx"> if (m_mediaSource) {
</span><span class="cx"> if (m_mediaSource->attachToElement(this))
</span><del>- m_player->load(url, contentType, m_mediaSource);
</del><ins>+ m_player->load(url, contentType, m_mediaSource.get());
</ins><span class="cx"> else {
</span><span class="cx"> // Forget our reference to the MediaSource, so we leave it alone
</span><span class="cx"> // while processing remainder of load failure.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (163815 => 163816)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2014-02-10 22:04:23 UTC (rev 163815)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2014-02-10 22:08:55 UTC (rev 163816)
</span><span class="lines">@@ -82,6 +82,7 @@
</span><span class="cx"> class MediaKeys;
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><ins>+class MediaSource;
</ins><span class="cx"> class VideoPlaybackQuality;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -722,7 +723,7 @@
</span><span class="cx"> int m_processingMediaPlayerCallback;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><del>- RefPtr<HTMLMediaSource> m_mediaSource;
</del><ins>+ RefPtr<MediaSource> m_mediaSource;
</ins><span class="cx"> unsigned long m_droppedVideoFrames;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaSourcecpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/html/HTMLMediaSource.cpp (163815 => 163816)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaSource.cpp 2014-02-10 22:04:23 UTC (rev 163815)
+++ trunk/Source/WebCore/html/HTMLMediaSource.cpp 2014-02-10 22:08:55 UTC (rev 163816)
</span><span class="lines">@@ -1,44 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "HTMLMediaSource.h"
-
-namespace WebCore {
-
-URLRegistry* HTMLMediaSource::s_registry = 0;
-
-void HTMLMediaSource::setRegistry(URLRegistry* registry)
-{
- ASSERT(!s_registry);
- s_registry = registry;
-}
-
-}
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaSourceh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/html/HTMLMediaSource.h (163815 => 163816)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaSource.h 2014-02-10 22:04:23 UTC (rev 163815)
+++ trunk/Source/WebCore/html/HTMLMediaSource.h 2014-02-10 22:08:55 UTC (rev 163816)
</span><span class="lines">@@ -1,76 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef HTMLMediaSource_h
-#define HTMLMediaSource_h
-
-#include "URLRegistry.h"
-#include <wtf/Forward.h>
-#include <wtf/MediaTime.h>
-
-namespace WebCore {
-
-class HTMLMediaElement;
-class MediaSourcePrivate;
-class TimeRanges;
-
-class HTMLMediaSource : public URLRegistrable {
-public:
- static void setRegistry(URLRegistry*);
- static HTMLMediaSource* lookup(const String& url) { return s_registry ? static_cast<HTMLMediaSource*>(s_registry->lookup(url)) : 0; }
-
- void ref() { refHTMLMediaSource(); }
- void deref() { derefHTMLMediaSource(); }
-
- // Called when an HTMLMediaElement is attempting to attach to this object,
- // and helps enforce attachment to at most one element at a time.
- // If already attached, returns false. Otherwise, must be in
- // 'closed' state, and returns true to indicate attachment success.
- // Reattachment allowed by first calling close() (even if already in 'closed').
- virtual bool attachToElement(HTMLMediaElement*) = 0;
- virtual void setPrivateAndOpen(PassRef<MediaSourcePrivate>) = 0;
- virtual void close() = 0;
- virtual bool isClosed() const = 0;
- virtual double duration() const = 0;
- virtual PassRefPtr<TimeRanges> buffered() const = 0;
- virtual void refHTMLMediaSource() = 0;
- virtual void derefHTMLMediaSource() = 0;
- virtual void monitorSourceBuffers() = 0;
-
- // URLRegistrable
- virtual URLRegistry& registry() const override { return *s_registry; }
-
-private:
- static URLRegistry* s_registry;
-};
-
-}
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (163815 => 163816)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-02-10 22:04:23 UTC (rev 163815)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-02-10 22:08:55 UTC (rev 163816)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><del>-#include "HTMLMediaSource.h"
</del><ins>+#include "MediaSourcePrivateClient.h"
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(GSTREAMER)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void load(const String&) { }
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><del>- virtual void load(const String&, PassRefPtr<HTMLMediaSource>) { }
</del><ins>+ virtual void load(const String&, MediaSourcePrivateClient*) { }
</ins><span class="cx"> #endif
</span><span class="cx"> virtual void cancelLoad() { }
</span><span class="cx">
</span><span class="lines">@@ -388,8 +388,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><del>-bool MediaPlayer::load(const URL& url, const ContentType& contentType, PassRefPtr<HTMLMediaSource> mediaSource)
</del><ins>+bool MediaPlayer::load(const URL& url, const ContentType& contentType, MediaSourcePrivateClient* mediaSource)
</ins><span class="cx"> {
</span><ins>+ ASSERT(mediaSource);
</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">@@ -451,7 +452,7 @@
</span><span class="cx"> if (m_private) {
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><span class="cx"> if (m_mediaSource)
</span><del>- m_private->load(m_url.string(), m_mediaSource);
</del><ins>+ m_private->load(m_url.string(), m_mediaSource.get());
</ins><span class="cx"> else
</span><span class="cx"> #endif
</span><span class="cx"> m_private->load(m_url.string());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (163815 => 163816)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2014-02-10 22:04:23 UTC (rev 163815)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2014-02-10 22:08:55 UTC (rev 163816)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> class AuthenticationChallenge;
</span><span class="cx"> class Document;
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><del>-class HTMLMediaSource;
</del><ins>+class MediaSourcePrivateClient;
</ins><span class="cx"> #endif
</span><span class="cx"> class MediaPlayerPrivateInterface;
</span><span class="cx"> class TextTrackRepresentation;
</span><span class="lines">@@ -304,7 +304,7 @@
</span><span class="cx">
</span><span class="cx"> bool load(const URL&, const ContentType&, const String& keySystem);
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><del>- bool load(const URL&, const ContentType&, PassRefPtr<HTMLMediaSource>);
</del><ins>+ bool load(const URL&, const ContentType&, MediaSourcePrivateClient*);
</ins><span class="cx"> #endif
</span><span class="cx"> void cancelLoad();
</span><span class="cx">
</span><span class="lines">@@ -574,7 +574,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><del>- RefPtr<HTMLMediaSource> m_mediaSource;
</del><ins>+ RefPtr<MediaSourcePrivateClient> m_mediaSource;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h (163815 => 163816)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2014-02-10 22:04:23 UTC (rev 163815)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2014-02-10 22:08:55 UTC (rev 163816)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void load(const String& url) = 0;
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><del>- virtual void load(const String& url, PassRefPtr<HTMLMediaSource>) = 0;
</del><ins>+ virtual void load(const String& url, MediaSourcePrivateClient*) = 0;
</ins><span class="cx"> #endif
</span><span class="cx"> virtual void cancelLoad() = 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaSourcePrivateClienth"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/graphics/MediaSourcePrivateClient.h (0 => 163816)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaSourcePrivateClient.h (rev 0)
+++ trunk/Source/WebCore/platform/graphics/MediaSourcePrivateClient.h 2014-02-10 22:08:55 UTC (rev 163816)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+/*
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef MediaSourcePrivateClient_h
+#define MediaSourcePrivateClient_h
+
+#if ENABLE(MEDIA_SOURCE)
+
+#include "TimeRanges.h"
+#include <wtf/RefCounted.h>
+
+namespace WebCore {
+
+class MediaSourcePrivate;
+
+class MediaSourcePrivateClient : public RefCounted<MediaSourcePrivateClient> {
+public:
+ virtual ~MediaSourcePrivateClient() { }
+
+ virtual void setPrivateAndOpen(PassRef<MediaSourcePrivate>) = 0;
+ virtual double duration() const = 0;
+ virtual PassRefPtr<TimeRanges> buffered() const = 0;
+};
+
+}
+
+#endif // ENABLE(MEDIA_SOURCE)
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp (163815 => 163816)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2014-02-10 22:04:23 UTC (rev 163815)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2014-02-10 22:08:55 UTC (rev 163816)
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><del>-void MediaPlayerPrivateAVFoundation::load(const String&, PassRefPtr<HTMLMediaSource>)
</del><ins>+void MediaPlayerPrivateAVFoundation::load(const String&, MediaSourcePrivateClient*)
</ins><span class="cx"> {
</span><span class="cx"> m_networkState = MediaPlayer::FormatError;
</span><span class="cx"> m_player->networkStateChanged();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h (163815 => 163816)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h 2014-02-10 22:04:23 UTC (rev 163815)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h 2014-02-10 22:08:55 UTC (rev 163816)
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> // MediaPlayerPrivatePrivateInterface overrides.
</span><span class="cx"> virtual void load(const String& url) override;
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><del>- virtual void load(const String&, PassRefPtr<HTMLMediaSource>);
</del><ins>+ virtual void load(const String&, MediaSourcePrivateClient*);
</ins><span class="cx"> #endif
</span><span class="cx"> virtual void cancelLoad() = 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h (163815 => 163816)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h 2014-02-10 22:04:23 UTC (rev 163815)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h 2014-02-10 22:08:55 UTC (rev 163816)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> private:
</span><span class="cx"> // MediaPlayerPrivateInterface
</span><span class="cx"> virtual void load(const String& url) override;
</span><del>- virtual void load(const String& url, PassRefPtr<HTMLMediaSource>) override;
</del><ins>+ virtual void load(const String& url, MediaSourcePrivateClient*) override;
</ins><span class="cx"> virtual void cancelLoad() override;
</span><span class="cx">
</span><span class="cx"> virtual void prepareToPlay() override;
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx">
</span><span class="cx"> MediaPlayer* m_player;
</span><span class="cx"> WeakPtrFactory<MediaPlayerPrivateMediaSourceAVFObjC> m_weakPtrFactory;
</span><del>- RefPtr<HTMLMediaSource> m_mediaSource;
</del><ins>+ RefPtr<MediaSourcePrivateClient> m_mediaSource;
</ins><span class="cx"> RefPtr<MediaSourcePrivateAVFObjC> m_mediaSourcePrivate;
</span><span class="cx"> RetainPtr<AVAsset> m_asset;
</span><span class="cx"> RetainPtr<AVSampleBufferDisplayLayer> m_sampleBufferDisplayLayer;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (163815 => 163816)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2014-02-10 22:04:23 UTC (rev 163815)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2014-02-10 22:08:55 UTC (rev 163816)
</span><span class="lines">@@ -28,8 +28,8 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE) && USE(AVFOUNDATION)
</span><span class="cx">
</span><del>-#import "HTMLMediaSource.h"
</del><span class="cx"> #import "MediaSourcePrivateAVFObjC.h"
</span><ins>+#import "MediaSourcePrivateClient.h"
</ins><span class="cx"> #import "MediaTimeMac.h"
</span><span class="cx"> #import "PlatformClockCM.h"
</span><span class="cx"> #import "SoftLinking.h"
</span><span class="lines">@@ -232,7 +232,7 @@
</span><span class="cx"> m_player->networkStateChanged();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayerPrivateMediaSourceAVFObjC::load(const String& url, PassRefPtr<HTMLMediaSource> source)
</del><ins>+void MediaPlayerPrivateMediaSourceAVFObjC::load(const String& url, MediaSourcePrivateClient* source)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(url);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (163815 => 163816)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2014-02-10 22:04:23 UTC (rev 163815)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2014-02-10 22:08:55 UTC (rev 163816)
</span><span class="lines">@@ -377,7 +377,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><del>-void MediaPlayerPrivateGStreamer::load(const String& url, PassRefPtr<HTMLMediaSource> mediaSource)
</del><ins>+void MediaPlayerPrivateGStreamer::load(const String& url, MediaSourcePrivateClient* mediaSource)
</ins><span class="cx"> {
</span><span class="cx"> String mediasourceUri = String::format("mediasource%s", url.utf8().data());
</span><span class="cx"> m_mediaSource = mediaSource;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h (163815 => 163816)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2014-02-10 22:04:23 UTC (rev 163815)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2014-02-10 22:08:55 UTC (rev 163816)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx">
</span><span class="cx"> void load(const String &url);
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><del>- void load(const String& url, PassRefPtr<HTMLMediaSource>);
</del><ins>+ void load(const String& url, MediaSourcePrivateClient*);
</ins><span class="cx"> #endif
</span><span class="cx"> void commitLoad();
</span><span class="cx"> void cancelLoad();
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx"> RefPtr<InbandTextTrackPrivate> m_chaptersTrack;
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><del>- RefPtr<HTMLMediaSource> m_mediaSource;
</del><ins>+ RefPtr<MediaSourcePrivateClient> m_mediaSource;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaSourceGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaSourceGStreamer.cpp (163815 => 163816)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaSourceGStreamer.cpp 2014-02-10 22:04:23 UTC (rev 163815)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaSourceGStreamer.cpp 2014-02-10 22:08:55 UTC (rev 163816)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void MediaSourceGStreamer::open(PassRefPtr<HTMLMediaSource> mediaSource, WebKitMediaSrc* src)
</del><ins>+void MediaSourceGStreamer::open(MediaSourcePrivateClient* mediaSource, WebKitMediaSrc* src)
</ins><span class="cx"> {
</span><span class="cx"> mediaSource->setPrivateAndOpen(adoptRef(*new MediaSourceGStreamer(src)));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaSourceGStreamerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaSourceGStreamer.h (163815 => 163816)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaSourceGStreamer.h 2014-02-10 22:04:23 UTC (rev 163815)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaSourceGStreamer.h 2014-02-10 22:08:55 UTC (rev 163816)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">
</span><span class="cx"> class MediaSourceGStreamer final : public MediaSourcePrivate {
</span><span class="cx"> public:
</span><del>- static void open(PassRefPtr<HTMLMediaSource>, WebKitMediaSrc*);
</del><ins>+ static void open(MediaSourcePrivateClient*, WebKitMediaSrc*);
</ins><span class="cx"> ~MediaSourceGStreamer();
</span><span class="cx"> AddStatus addSourceBuffer(const ContentType&, RefPtr<SourceBufferPrivate>&);
</span><span class="cx"> double duration() { return m_duration; }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsiosMediaPlayerPrivateIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ios/MediaPlayerPrivateIOS.h (163815 => 163816)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ios/MediaPlayerPrivateIOS.h 2014-02-10 22:04:23 UTC (rev 163815)
+++ trunk/Source/WebCore/platform/graphics/ios/MediaPlayerPrivateIOS.h 2014-02-10 22:08:55 UTC (rev 163816)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void load(const String& url) override;
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><del>- virtual void load(const String&, PassRefPtr<HTMLMediaSource>) override { }
</del><ins>+ virtual void load(const String&, MediaSourcePrivateClient*) override { }
</ins><span class="cx"> #endif
</span><span class="cx"> virtual void cancelLoad() override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKith"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h (163815 => 163816)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h 2014-02-10 22:04:23 UTC (rev 163815)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h 2014-02-10 22:08:55 UTC (rev 163816)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx">
</span><span class="cx"> void load(const String& url);
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><del>- virtual void load(const String&, PassRefPtr<HTMLMediaSource>);
</del><ins>+ virtual void load(const String&, MediaSourcePrivateClient*);
</ins><span class="cx"> #endif
</span><span class="cx"> void cancelLoad();
</span><span class="cx"> void loadInternal(const String& url);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm (163815 => 163816)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2014-02-10 22:04:23 UTC (rev 163815)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2014-02-10 22:08:55 UTC (rev 163816)
</span><span class="lines">@@ -658,7 +658,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><del>-void MediaPlayerPrivateQTKit::load(const String&, PassRefPtr<HTMLMediaSource>)
</del><ins>+void MediaPlayerPrivateQTKit::load(const String&, MediaSourcePrivateClient*)
</ins><span class="cx"> {
</span><span class="cx"> m_networkState = MediaPlayer::FormatError;
</span><span class="cx"> m_player->networkStateChanged();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockmediasourceMockMediaPlayerMediaSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.cpp (163815 => 163816)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.cpp 2014-02-10 22:04:23 UTC (rev 163815)
+++ trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.cpp 2014-02-10 22:08:55 UTC (rev 163816)
</span><span class="lines">@@ -29,8 +29,8 @@
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><span class="cx">
</span><span class="cx"> #include "ExceptionCodePlaceholder.h"
</span><del>-#include "HTMLMediaSource.h"
</del><span class="cx"> #include "MediaPlayer.h"
</span><ins>+#include "MediaSourcePrivateClient.h"
</ins><span class="cx"> #include "MockMediaSourcePrivate.h"
</span><span class="cx"> #include <wtf/Functional.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MockMediaPlayerMediaSource::load(const String&, PassRefPtr<HTMLMediaSource> source)
</del><ins>+void MockMediaPlayerMediaSource::load(const String&, MediaSourcePrivateClient* source)
</ins><span class="cx"> {
</span><span class="cx"> m_mediaSource = source;
</span><span class="cx"> m_mediaSourcePrivate = MockMediaSourcePrivate::create(this);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockmediasourceMockMediaPlayerMediaSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.h (163815 => 163816)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.h 2014-02-10 22:04:23 UTC (rev 163815)
+++ trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.h 2014-02-10 22:08:55 UTC (rev 163816)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx">
</span><span class="cx"> // MediaPlayerPrivate Overrides
</span><span class="cx"> virtual void load(const String& url) override;
</span><del>- virtual void load(const String& url, PassRefPtr<HTMLMediaSource>) override;
</del><ins>+ virtual void load(const String& url, MediaSourcePrivateClient*) override;
</ins><span class="cx"> virtual void cancelLoad() override;
</span><span class="cx"> virtual void play() override;
</span><span class="cx"> virtual void pause() override;
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> virtual double totalFrameDelay() override;
</span><span class="cx">
</span><span class="cx"> MediaPlayer* m_player;
</span><del>- RefPtr<HTMLMediaSource> m_mediaSource;
</del><ins>+ RefPtr<MediaSourcePrivateClient> m_mediaSource;
</ins><span class="cx"> RefPtr<MockMediaSourcePrivate> m_mediaSourcePrivate;
</span><span class="cx">
</span><span class="cx"> MediaTime m_currentTime;
</span></span></pre>
</div>
</div>
</body>
</html>