| 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);
|
|
|