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

Side by Side Diff: Source/modules/mediasource/MediaSourceRegistry.cpp

Issue 54053006: Move weborigin/ under platform/ so that it may someday call platform APIs (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Stale refernence to weboriginexport in .gpyi Created 7 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/modules/indexeddb/IDBFactory.cpp ('k') | Source/modules/mediasource/SourceBuffer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 "modules/mediasource/MediaSourceBase.h" 34 #include "modules/mediasource/MediaSourceBase.h"
35 #include "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 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 }
(...skipping 25 matching lines...) Expand all
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 WebCore
OLDNEW
« no previous file with comments | « Source/modules/indexeddb/IDBFactory.cpp ('k') | Source/modules/mediasource/SourceBuffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698