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

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

Issue 2386213002: Reflow comments in modules/mediastream/. (Closed)
Patch Set: Created 4 years, 2 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) 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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN Y 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 14 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN Y 16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 17 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 18 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O N 19 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 20 * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 21 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 22 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 */ 23 */
24 24
25 #include "modules/mediastream/MediaStreamRegistry.h" 25 #include "modules/mediastream/MediaStreamRegistry.h"
26 26
27 #include "core/html/HTMLMediaElement.h" 27 #include "core/html/HTMLMediaElement.h"
28 #include "modules/mediastream/MediaStream.h" 28 #include "modules/mediastream/MediaStream.h"
29 #include "platform/weborigin/KURL.h" 29 #include "platform/weborigin/KURL.h"
30 30
31 namespace blink { 31 namespace blink {
32 32
33 MediaStreamRegistry& MediaStreamRegistry::registry() { 33 MediaStreamRegistry& MediaStreamRegistry::registry() {
34 // Since WebWorkers cannot obtain MediaStream objects, we should be on the mai n thread. 34 // Since WebWorkers cannot obtain MediaStream objects, we should be on the
35 // main thread.
35 DCHECK(isMainThread()); 36 DCHECK(isMainThread());
36 DEFINE_STATIC_LOCAL(MediaStreamRegistry, instance, ()); 37 DEFINE_STATIC_LOCAL(MediaStreamRegistry, instance, ());
37 return instance; 38 return instance;
38 } 39 }
39 40
40 void MediaStreamRegistry::registerURL(SecurityOrigin*, 41 void MediaStreamRegistry::registerURL(SecurityOrigin*,
41 const KURL& url, 42 const KURL& url,
42 URLRegistrable* stream) { 43 URLRegistrable* stream) {
43 DCHECK(&stream->registry() == this); 44 DCHECK(&stream->registry() == this);
44 DCHECK(isMainThread()); 45 DCHECK(isMainThread());
(...skipping 15 matching lines...) Expand all
60 const String& url) { 61 const String& url) {
61 DCHECK(isMainThread()); 62 DCHECK(isMainThread());
62 return m_streamDescriptors.get(url); 63 return m_streamDescriptors.get(url);
63 } 64 }
64 65
65 MediaStreamRegistry::MediaStreamRegistry() { 66 MediaStreamRegistry::MediaStreamRegistry() {
66 HTMLMediaElement::setMediaStreamRegistry(this); 67 HTMLMediaElement::setMediaStreamRegistry(this);
67 } 68 }
68 69
69 } // namespace blink 70 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698