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

Unified Diff: Source/modules/mediasource/MediaSourceRegistry.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/modules/mediasource/MediaSourceRegistry.h ('k') | Source/modules/mediasource/SourceBuffer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/mediasource/MediaSourceRegistry.cpp
diff --git a/Source/modules/mediasource/MediaSourceRegistry.cpp b/Source/modules/mediasource/MediaSourceRegistry.cpp
index 9950900ee8e4d74d6f11f1de3b6edcf40e0e7e1f..d043be4d125072625cf62491b64ce0960ccc56ff 100644
--- a/Source/modules/mediasource/MediaSourceRegistry.cpp
+++ b/Source/modules/mediasource/MediaSourceRegistry.cpp
@@ -32,7 +32,7 @@
#include "modules/mediasource/MediaSourceRegistry.h"
#include "core/platform/KURL.h"
-#include "modules/mediasource/MediaSource.h"
+#include "modules/mediasource/WebKitMediaSource.h"
#include "wtf/MainThread.h"
namespace WebCore {
@@ -44,30 +44,29 @@ MediaSourceRegistry& MediaSourceRegistry::registry()
return instance;
}
-void MediaSourceRegistry::registerMediaSourceURL(const KURL& url, PassRefPtr<MediaSource> source)
+void MediaSourceRegistry::registerMediaSourceURL(const KURL& url, PassRefPtr<WebKitMediaSource> source)
{
ASSERT(isMainThread());
source->setPendingActivity(source.get());
-
m_mediaSources.set(url.string(), source);
}
void MediaSourceRegistry::unregisterMediaSourceURL(const KURL& url)
{
ASSERT(isMainThread());
- HashMap<String, RefPtr<MediaSource> >::iterator iter = m_mediaSources.find(url.string());
+ HashMap<String, RefPtr<WebKitMediaSource> >::iterator iter = m_mediaSources.find(url.string());
if (iter == m_mediaSources.end())
return;
- RefPtr<MediaSource> source = iter->value;
+ RefPtr<WebKitMediaSource> source = iter->value;
m_mediaSources.remove(iter);
// Remove the pending activity added in registerMediaSourceURL().
source->unsetPendingActivity(source.get());
}
-MediaSource* MediaSourceRegistry::lookupMediaSource(const String& url)
+WebKitMediaSource* MediaSourceRegistry::lookupMediaSource(const String& url)
{
ASSERT(isMainThread());
return m_mediaSources.get(url);
« no previous file with comments | « Source/modules/mediasource/MediaSourceRegistry.h ('k') | Source/modules/mediasource/SourceBuffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698