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

Side by Side Diff: Source/WebCore/Modules/mediasource/MediaSourceRegistry.cpp

Issue 13674022: Remove MEDIA_SOURCE feature define. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@blink-master
Patch Set: Rebase Created 7 years, 8 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 unified diff | Download patch
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 13 matching lines...) Expand all
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
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 "MediaSourceRegistry.h" 32 #include "MediaSourceRegistry.h"
33 33
34 #if ENABLE(MEDIA_SOURCE)
35
36 #include "KURL.h" 34 #include "KURL.h"
37 #include "MediaSource.h" 35 #include "MediaSource.h"
38 #include <wtf/MainThread.h> 36 #include <wtf/MainThread.h>
39 37
40 namespace WebCore { 38 namespace WebCore {
41 39
42 MediaSourceRegistry& MediaSourceRegistry::registry() 40 MediaSourceRegistry& MediaSourceRegistry::registry()
43 { 41 {
44 ASSERT(isMainThread()); 42 ASSERT(isMainThread());
45 DEFINE_STATIC_LOCAL(MediaSourceRegistry, instance, ()); 43 DEFINE_STATIC_LOCAL(MediaSourceRegistry, instance, ());
(...skipping 23 matching lines...) Expand all
69 source->unsetPendingActivity(source.get()); 67 source->unsetPendingActivity(source.get());
70 } 68 }
71 69
72 MediaSource* MediaSourceRegistry::lookupMediaSource(const String& url) 70 MediaSource* MediaSourceRegistry::lookupMediaSource(const String& url)
73 { 71 {
74 ASSERT(isMainThread()); 72 ASSERT(isMainThread());
75 return m_mediaSources.get(url).get(); 73 return m_mediaSources.get(url).get();
76 } 74 }
77 75
78 } // namespace WebCore 76 } // namespace WebCore
79
80 #endif
OLDNEW
« no previous file with comments | « Source/WebCore/Modules/mediasource/MediaSourceRegistry.h ('k') | Source/WebCore/Modules/mediasource/SourceBuffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698