| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "modules/mediasource/MediaSourceRegistry.h" | 32 #include "modules/mediasource/MediaSourceRegistry.h" |
| 33 | 33 |
| 34 #include "core/platform/KURL.h" | 34 #include "core/platform/KURL.h" |
| 35 #include "modules/mediasource/MediaSource.h" | 35 #include "modules/mediasource/WebKitMediaSource.h" |
| 36 #include "wtf/MainThread.h" | 36 #include "wtf/MainThread.h" |
| 37 | 37 |
| 38 namespace WebCore { | 38 namespace WebCore { |
| 39 | 39 |
| 40 MediaSourceRegistry& MediaSourceRegistry::registry() | 40 MediaSourceRegistry& MediaSourceRegistry::registry() |
| 41 { | 41 { |
| 42 ASSERT(isMainThread()); | 42 ASSERT(isMainThread()); |
| 43 DEFINE_STATIC_LOCAL(MediaSourceRegistry, instance, ()); | 43 DEFINE_STATIC_LOCAL(MediaSourceRegistry, instance, ()); |
| 44 return instance; | 44 return instance; |
| 45 } | 45 } |
| 46 | 46 |
| 47 void MediaSourceRegistry::registerMediaSourceURL(const KURL& url, PassRefPtr<Med
iaSource> source) | 47 void MediaSourceRegistry::registerMediaSourceURL(const KURL& url, PassRefPtr<Web
KitMediaSource> source) |
| 48 { | 48 { |
| 49 ASSERT(isMainThread()); | 49 ASSERT(isMainThread()); |
| 50 | 50 |
| 51 source->setPendingActivity(source.get()); | 51 source->setPendingActivity(source.get()); |
| 52 | |
| 53 m_mediaSources.set(url.string(), source); | 52 m_mediaSources.set(url.string(), source); |
| 54 } | 53 } |
| 55 | 54 |
| 56 void MediaSourceRegistry::unregisterMediaSourceURL(const KURL& url) | 55 void MediaSourceRegistry::unregisterMediaSourceURL(const KURL& url) |
| 57 { | 56 { |
| 58 ASSERT(isMainThread()); | 57 ASSERT(isMainThread()); |
| 59 HashMap<String, RefPtr<MediaSource> >::iterator iter = m_mediaSources.find(u
rl.string()); | 58 HashMap<String, RefPtr<WebKitMediaSource> >::iterator iter = m_mediaSources.
find(url.string()); |
| 60 if (iter == m_mediaSources.end()) | 59 if (iter == m_mediaSources.end()) |
| 61 return; | 60 return; |
| 62 | 61 |
| 63 RefPtr<MediaSource> source = iter->value; | 62 RefPtr<WebKitMediaSource> source = iter->value; |
| 64 m_mediaSources.remove(iter); | 63 m_mediaSources.remove(iter); |
| 65 | 64 |
| 66 // Remove the pending activity added in registerMediaSourceURL(). | 65 // Remove the pending activity added in registerMediaSourceURL(). |
| 67 source->unsetPendingActivity(source.get()); | 66 source->unsetPendingActivity(source.get()); |
| 68 } | 67 } |
| 69 | 68 |
| 70 MediaSource* MediaSourceRegistry::lookupMediaSource(const String& url) | 69 WebKitMediaSource* MediaSourceRegistry::lookupMediaSource(const String& url) |
| 71 { | 70 { |
| 72 ASSERT(isMainThread()); | 71 ASSERT(isMainThread()); |
| 73 return m_mediaSources.get(url); | 72 return m_mediaSources.get(url); |
| 74 } | 73 } |
| 75 | 74 |
| 76 } // namespace WebCore | 75 } // namespace WebCore |
| OLD | NEW |