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

Side by Side Diff: third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * Copyright (C) 2011 Ericsson AB. All rights reserved. 3 * Copyright (C) 2011 Ericsson AB. 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 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
13 * 13 *
14 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND 14 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
15 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 15 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
17 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR 17 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
18 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 18 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
20 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 20 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
21 * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 21 * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
22 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
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 "modules/mediastream/MediaStreamTrack.h" 26 #include "modules/mediastream/MediaStreamTrack.h"
27 27
28 #include <memory>
28 #include "bindings/core/v8/ExceptionMessages.h" 29 #include "bindings/core/v8/ExceptionMessages.h"
29 #include "core/dom/Document.h" 30 #include "core/dom/Document.h"
30 #include "core/dom/ExceptionCode.h" 31 #include "core/dom/ExceptionCode.h"
31 #include "core/dom/ExecutionContext.h" 32 #include "core/dom/ExecutionContext.h"
32 #include "core/events/Event.h" 33 #include "core/events/Event.h"
33 #include "core/frame/Deprecation.h" 34 #include "core/frame/Deprecation.h"
34 #include "modules/mediastream/MediaConstraintsImpl.h" 35 #include "modules/mediastream/MediaConstraintsImpl.h"
35 #include "modules/mediastream/MediaStream.h" 36 #include "modules/mediastream/MediaStream.h"
36 #include "modules/mediastream/MediaTrackSettings.h" 37 #include "modules/mediastream/MediaTrackSettings.h"
37 #include "modules/mediastream/UserMediaController.h" 38 #include "modules/mediastream/UserMediaController.h"
38 #include "platform/mediastream/MediaStreamCenter.h" 39 #include "platform/mediastream/MediaStreamCenter.h"
39 #include "platform/mediastream/MediaStreamComponent.h" 40 #include "platform/mediastream/MediaStreamComponent.h"
40 #include "public/platform/WebMediaStreamTrack.h" 41 #include "public/platform/WebMediaStreamTrack.h"
41 #include "wtf/Assertions.h" 42 #include "wtf/Assertions.h"
42 #include <memory>
43 43
44 namespace blink { 44 namespace blink {
45 45
46 namespace { 46 namespace {
47 static const char kContentHintStringNone[] = ""; 47 static const char kContentHintStringNone[] = "";
48 static const char kContentHintStringAudioSpeech[] = "speech"; 48 static const char kContentHintStringAudioSpeech[] = "speech";
49 static const char kContentHintStringAudioMusic[] = "music"; 49 static const char kContentHintStringAudioMusic[] = "music";
50 static const char kContentHintStringVideoMotion[] = "motion"; 50 static const char kContentHintStringVideoMotion[] = "motion";
51 static const char kContentHintStringVideoDetail[] = "detail"; 51 static const char kContentHintStringVideoDetail[] = "detail";
52 } // namespace 52 } // namespace
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 } 346 }
347 347
348 DEFINE_TRACE(MediaStreamTrack) { 348 DEFINE_TRACE(MediaStreamTrack) {
349 visitor->trace(m_registeredMediaStreams); 349 visitor->trace(m_registeredMediaStreams);
350 visitor->trace(m_component); 350 visitor->trace(m_component);
351 EventTargetWithInlineData::trace(visitor); 351 EventTargetWithInlineData::trace(visitor);
352 ContextLifecycleObserver::trace(visitor); 352 ContextLifecycleObserver::trace(visitor);
353 } 353 }
354 354
355 } // namespace blink 355 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698