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 17 matching lines...) Expand all Loading... |
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 "modules/mediasource/MediaSource.h" | 34 #include "modules/mediasource/MediaSource.h" |
35 #include "platform/weborigin/KURL.h" | 35 #include "platform/weborigin/KURL.h" |
36 #include "wtf/MainThread.h" | 36 #include "wtf/MainThread.h" |
37 | 37 |
38 namespace WebCore { | 38 namespace blink { |
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::registerURL(SecurityOrigin*, const KURL& url, URLRegis
trable* registrable) | 47 void MediaSourceRegistry::registerURL(SecurityOrigin*, const KURL& url, URLRegis
trable* registrable) |
48 { | 48 { |
(...skipping 21 matching lines...) Expand all Loading... |
70 { | 70 { |
71 ASSERT(isMainThread()); | 71 ASSERT(isMainThread()); |
72 return m_mediaSources.get(url); | 72 return m_mediaSources.get(url); |
73 } | 73 } |
74 | 74 |
75 MediaSourceRegistry::MediaSourceRegistry() | 75 MediaSourceRegistry::MediaSourceRegistry() |
76 { | 76 { |
77 HTMLMediaSource::setRegistry(this); | 77 HTMLMediaSource::setRegistry(this); |
78 } | 78 } |
79 | 79 |
80 } // namespace WebCore | 80 } // namespace blink |
OLD | NEW |