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

Side by Side Diff: third_party/WebKit/Source/platform/exported/WebMediaStream.cpp

Issue 2700123003: DO NOT COMMIT: Results of running old (current) clang-format on Blink (Closed)
Patch Set: Created 3 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 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 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
14 * ANY 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 16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
17 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 17 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
18 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 18 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
19 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 19 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
20 * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 20 * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
21 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 21 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
22 * OF THIS 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 "public/platform/WebMediaStream.h" 25 #include "public/platform/WebMediaStream.h"
26 26
27 #include <memory>
27 #include "platform/UUID.h" 28 #include "platform/UUID.h"
28 #include "platform/mediastream/MediaStreamComponent.h" 29 #include "platform/mediastream/MediaStreamComponent.h"
29 #include "platform/mediastream/MediaStreamDescriptor.h" 30 #include "platform/mediastream/MediaStreamDescriptor.h"
30 #include "platform/mediastream/MediaStreamSource.h" 31 #include "platform/mediastream/MediaStreamSource.h"
31 #include "public/platform/WebMediaStreamSource.h" 32 #include "public/platform/WebMediaStreamSource.h"
32 #include "public/platform/WebMediaStreamTrack.h" 33 #include "public/platform/WebMediaStreamTrack.h"
33 #include "public/platform/WebString.h" 34 #include "public/platform/WebString.h"
34 #include "wtf/PtrUtil.h" 35 #include "wtf/PtrUtil.h"
35 #include "wtf/Vector.h" 36 #include "wtf/Vector.h"
36 #include <memory>
37 37
38 namespace blink { 38 namespace blink {
39 39
40 namespace { 40 namespace {
41 41
42 class ExtraDataContainer : public MediaStreamDescriptor::ExtraData { 42 class ExtraDataContainer : public MediaStreamDescriptor::ExtraData {
43 public: 43 public:
44 ExtraDataContainer(std::unique_ptr<WebMediaStream::ExtraData> extraData) 44 ExtraDataContainer(std::unique_ptr<WebMediaStream::ExtraData> extraData)
45 : m_extraData(std::move(extraData)) {} 45 : m_extraData(std::move(extraData)) {}
46 46
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 video.push_back(component); 133 video.push_back(component);
134 } 134 }
135 m_private = MediaStreamDescriptor::create(label, audio, video); 135 m_private = MediaStreamDescriptor::create(label, audio, video);
136 } 136 }
137 137
138 void WebMediaStream::assign(const WebMediaStream& other) { 138 void WebMediaStream::assign(const WebMediaStream& other) {
139 m_private = other.m_private; 139 m_private = other.m_private;
140 } 140 }
141 141
142 } // namespace blink 142 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698