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

Side by Side Diff: Source/modules/mediastream/MediaStreamRegistry.cpp

Issue 403013002: Rename WebCore to blink in Modules (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 5 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 12 matching lines...) Expand all
23 */ 23 */
24 24
25 #include "config.h" 25 #include "config.h"
26 #include "modules/mediastream/MediaStreamRegistry.h" 26 #include "modules/mediastream/MediaStreamRegistry.h"
27 27
28 #include "core/html/HTMLMediaElement.h" 28 #include "core/html/HTMLMediaElement.h"
29 #include "modules/mediastream/MediaStream.h" 29 #include "modules/mediastream/MediaStream.h"
30 #include "platform/weborigin/KURL.h" 30 #include "platform/weborigin/KURL.h"
31 #include "wtf/MainThread.h" 31 #include "wtf/MainThread.h"
32 32
33 namespace WebCore { 33 namespace blink {
34 34
35 MediaStreamRegistry& MediaStreamRegistry::registry() 35 MediaStreamRegistry& MediaStreamRegistry::registry()
36 { 36 {
37 // Since WebWorkers cannot obtain MediaStream objects, we should be on the m ain thread. 37 // Since WebWorkers cannot obtain MediaStream objects, we should be on the m ain thread.
38 ASSERT(isMainThread()); 38 ASSERT(isMainThread());
39 DEFINE_STATIC_LOCAL(MediaStreamRegistry, instance, ()); 39 DEFINE_STATIC_LOCAL(MediaStreamRegistry, instance, ());
40 return instance; 40 return instance;
41 } 41 }
42 42
43 void MediaStreamRegistry::registerURL(SecurityOrigin*, const KURL& url, URLRegis trable* stream) 43 void MediaStreamRegistry::registerURL(SecurityOrigin*, const KURL& url, URLRegis trable* stream)
(...skipping 19 matching lines...) Expand all
63 { 63 {
64 ASSERT(isMainThread()); 64 ASSERT(isMainThread());
65 return m_streamDescriptors.get(url); 65 return m_streamDescriptors.get(url);
66 } 66 }
67 67
68 MediaStreamRegistry::MediaStreamRegistry() 68 MediaStreamRegistry::MediaStreamRegistry()
69 { 69 {
70 HTMLMediaElement::setMediaStreamRegistry(this); 70 HTMLMediaElement::setMediaStreamRegistry(this);
71 } 71 }
72 72
73 } // namespace WebCore 73 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/mediastream/MediaStreamRegistry.h ('k') | Source/modules/mediastream/MediaStreamTrack.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698