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

Side by Side Diff: third_party/WebKit/Source/platform/mediastream/MediaStreamComponent.h

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) 2011 Ericsson AB. All rights reserved. 2 * Copyright (C) 2011 Ericsson AB. All rights reserved.
3 * Copyright (C) 2013 Google Inc. All rights reserved. 3 * Copyright (C) 2013 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 14 matching lines...) Expand all
25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32 #ifndef MediaStreamComponent_h 32 #ifndef MediaStreamComponent_h
33 #define MediaStreamComponent_h 33 #define MediaStreamComponent_h
34 34
35 #include <memory>
35 #include "platform/audio/AudioSourceProvider.h" 36 #include "platform/audio/AudioSourceProvider.h"
36 #include "platform/heap/Handle.h" 37 #include "platform/heap/Handle.h"
37 #include "public/platform/WebMediaStreamTrack.h" 38 #include "public/platform/WebMediaStreamTrack.h"
38 #include "wtf/Forward.h" 39 #include "wtf/Forward.h"
39 #include "wtf/ThreadingPrimitives.h" 40 #include "wtf/ThreadingPrimitives.h"
40 #include "wtf/text/WTFString.h" 41 #include "wtf/text/WTFString.h"
41 #include <memory>
42 42
43 namespace blink { 43 namespace blink {
44 44
45 class MediaStreamSource; 45 class MediaStreamSource;
46 class WebAudioSourceProvider; 46 class WebAudioSourceProvider;
47 47
48 // A MediaStreamComponent is a MediaStreamTrack. 48 // A MediaStreamComponent is a MediaStreamTrack.
49 // TODO(hta): Consider merging the two classes. 49 // TODO(hta): Consider merging the two classes.
50 50
51 class PLATFORM_EXPORT MediaStreamComponent final 51 class PLATFORM_EXPORT MediaStreamComponent final
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 bool m_muted; 132 bool m_muted;
133 WebMediaStreamTrack::ContentHintType m_contentHint; 133 WebMediaStreamTrack::ContentHintType m_contentHint;
134 std::unique_ptr<TrackData> m_trackData; 134 std::unique_ptr<TrackData> m_trackData;
135 }; 135 };
136 136
137 typedef HeapVector<Member<MediaStreamComponent>> MediaStreamComponentVector; 137 typedef HeapVector<Member<MediaStreamComponent>> MediaStreamComponentVector;
138 138
139 } // namespace blink 139 } // namespace blink
140 140
141 #endif // MediaStreamComponent_h 141 #endif // MediaStreamComponent_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698