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

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

Issue 173363002: Move mediastream module to oilpan transition types (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: WIP Created 6 years, 10 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) 2014 Google Inc. All rights reserved. 2 * Copyright (C) 2014 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 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "modules/mediastream/MediaDeviceInfo.h" 27 #include "modules/mediastream/MediaDeviceInfo.h"
28 28
29 #include "wtf/text/WTFString.h" 29 #include "wtf/text/WTFString.h"
30 30
31 namespace WebCore { 31 namespace WebCore {
32 32
33 PassRefPtr<MediaDeviceInfo> MediaDeviceInfo::create(const blink::WebMediaDeviceI nfo& webMediaDeviceInfo) 33 DEFINE_GC_INFO(MediaDeviceInfo);
haraken 2014/02/26 13:58:37 You can drop DEFINE_GC_INFO. The same comment for
keishi 2014/02/27 07:33:34 Done.
34
35 PassRefPtrWillBeRawPtr<MediaDeviceInfo> MediaDeviceInfo::create(const blink::Web MediaDeviceInfo& webMediaDeviceInfo)
34 { 36 {
35 ASSERT(!webMediaDeviceInfo.isNull()); 37 ASSERT(!webMediaDeviceInfo.isNull());
36 return adoptRef(new MediaDeviceInfo(webMediaDeviceInfo)); 38 return adoptRefWillBeNoop(new MediaDeviceInfo(webMediaDeviceInfo));
37 } 39 }
38 40
39 MediaDeviceInfo::MediaDeviceInfo(const blink::WebMediaDeviceInfo& webMediaDevice Info) 41 MediaDeviceInfo::MediaDeviceInfo(const blink::WebMediaDeviceInfo& webMediaDevice Info)
40 : m_webMediaDeviceInfo(webMediaDeviceInfo) 42 : m_webMediaDeviceInfo(webMediaDeviceInfo)
41 { 43 {
42 } 44 }
43 45
44 String MediaDeviceInfo::deviceId() const 46 String MediaDeviceInfo::deviceId() const
45 { 47 {
46 return m_webMediaDeviceInfo.deviceId(); 48 return m_webMediaDeviceInfo.deviceId();
(...skipping 18 matching lines...) Expand all
65 { 67 {
66 return m_webMediaDeviceInfo.label(); 68 return m_webMediaDeviceInfo.label();
67 } 69 }
68 70
69 String MediaDeviceInfo::groupId() const 71 String MediaDeviceInfo::groupId() const
70 { 72 {
71 return m_webMediaDeviceInfo.groupId(); 73 return m_webMediaDeviceInfo.groupId();
72 } 74 }
73 75
74 } // namespace WebCore 76 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698