Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(877)

Unified Diff: Source/core/platform/graphics/MediaPlayer.cpp

Issue 14619016: Add WebKit prefix to MediaSource,SourceBuffer, and SourceBufferList objects. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/platform/graphics/MediaPlayer.h ('k') | Source/core/platform/graphics/MediaPlayerPrivate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/platform/graphics/MediaPlayer.cpp
diff --git a/Source/core/platform/graphics/MediaPlayer.cpp b/Source/core/platform/graphics/MediaPlayer.cpp
index 09aef7708a7cc32b9983e0419bc02a81e42bca59..d7a986a2539e7c3a89ee14630852884b32fb7d33 100644
--- a/Source/core/platform/graphics/MediaPlayer.cpp
+++ b/Source/core/platform/graphics/MediaPlayer.cpp
@@ -38,7 +38,7 @@
#include "core/platform/MIMETypeRegistry.h"
#include "core/platform/graphics/IntRect.h"
#include "core/platform/graphics/MediaPlayerPrivate.h"
-#include "modules/mediasource/MediaSource.h"
+#include "modules/mediasource/WebKitMediaSource.h"
#include <wtf/text/CString.h>
#include "core/platform/graphics/InbandTextTrackPrivate.h"
@@ -56,7 +56,7 @@ public:
NullMediaPlayerPrivate(MediaPlayer*) { }
virtual void load(const String&) { }
- virtual void load(const String&, PassRefPtr<MediaSource>) { }
+ virtual void load(const String&, PassRefPtr<WebKitMediaSource>) { }
virtual void cancelLoad() { }
virtual void prepareToPlay() { }
@@ -263,7 +263,7 @@ bool MediaPlayer::load(const KURL& url, const ContentType& contentType, const St
return m_currentMediaEngine;
}
-bool MediaPlayer::load(const KURL& url, PassRefPtr<MediaSource> mediaSource)
+bool MediaPlayer::load(const KURL& url, PassRefPtr<WebKitMediaSource> mediaSource)
{
m_mediaSource = mediaSource;
m_contentMIMEType = "";
« no previous file with comments | « Source/core/platform/graphics/MediaPlayer.h ('k') | Source/core/platform/graphics/MediaPlayerPrivate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698