| OLD | NEW |
| 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 Loading... |
| 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 PassRefPtrWillBeRawPtr<MediaDeviceInfo> MediaDeviceInfo::create(const blink::Web
MediaDeviceInfo& webMediaDeviceInfo) |
| 34 { | 34 { |
| 35 ASSERT(!webMediaDeviceInfo.isNull()); | 35 ASSERT(!webMediaDeviceInfo.isNull()); |
| 36 return adoptRef(new MediaDeviceInfo(webMediaDeviceInfo)); | 36 return adoptRefWillBeNoop(new MediaDeviceInfo(webMediaDeviceInfo)); |
| 37 } | 37 } |
| 38 | 38 |
| 39 MediaDeviceInfo::MediaDeviceInfo(const blink::WebMediaDeviceInfo& webMediaDevice
Info) | 39 MediaDeviceInfo::MediaDeviceInfo(const blink::WebMediaDeviceInfo& webMediaDevice
Info) |
| 40 : m_webMediaDeviceInfo(webMediaDeviceInfo) | 40 : m_webMediaDeviceInfo(webMediaDeviceInfo) |
| 41 { | 41 { |
| 42 } | 42 } |
| 43 | 43 |
| 44 String MediaDeviceInfo::deviceId() const | 44 String MediaDeviceInfo::deviceId() const |
| 45 { | 45 { |
| 46 return m_webMediaDeviceInfo.deviceId(); | 46 return m_webMediaDeviceInfo.deviceId(); |
| (...skipping 18 matching lines...) Expand all Loading... |
| 65 { | 65 { |
| 66 return m_webMediaDeviceInfo.label(); | 66 return m_webMediaDeviceInfo.label(); |
| 67 } | 67 } |
| 68 | 68 |
| 69 String MediaDeviceInfo::groupId() const | 69 String MediaDeviceInfo::groupId() const |
| 70 { | 70 { |
| 71 return m_webMediaDeviceInfo.groupId(); | 71 return m_webMediaDeviceInfo.groupId(); |
| 72 } | 72 } |
| 73 | 73 |
| 74 } // namespace WebCore | 74 } // namespace WebCore |
| OLD | NEW |