| OLD | NEW |
| 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 |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 #include "core/frame/Deprecation.h" | 36 #include "core/frame/Deprecation.h" |
| 37 #include "modules/imagecapture/ImageCapture.h" | 37 #include "modules/imagecapture/ImageCapture.h" |
| 38 #include "modules/mediastream/MediaConstraintsImpl.h" | 38 #include "modules/mediastream/MediaConstraintsImpl.h" |
| 39 #include "modules/mediastream/MediaStream.h" | 39 #include "modules/mediastream/MediaStream.h" |
| 40 #include "modules/mediastream/MediaTrackCapabilities.h" | 40 #include "modules/mediastream/MediaTrackCapabilities.h" |
| 41 #include "modules/mediastream/MediaTrackConstraints.h" | 41 #include "modules/mediastream/MediaTrackConstraints.h" |
| 42 #include "modules/mediastream/MediaTrackSettings.h" | 42 #include "modules/mediastream/MediaTrackSettings.h" |
| 43 #include "modules/mediastream/UserMediaController.h" | 43 #include "modules/mediastream/UserMediaController.h" |
| 44 #include "platform/mediastream/MediaStreamCenter.h" | 44 #include "platform/mediastream/MediaStreamCenter.h" |
| 45 #include "platform/mediastream/MediaStreamComponent.h" | 45 #include "platform/mediastream/MediaStreamComponent.h" |
| 46 #include "platform/wtf/Assertions.h" |
| 46 #include "public/platform/WebMediaStreamTrack.h" | 47 #include "public/platform/WebMediaStreamTrack.h" |
| 47 #include "wtf/Assertions.h" | |
| 48 | 48 |
| 49 namespace blink { | 49 namespace blink { |
| 50 | 50 |
| 51 namespace { | 51 namespace { |
| 52 static const char kContentHintStringNone[] = ""; | 52 static const char kContentHintStringNone[] = ""; |
| 53 static const char kContentHintStringAudioSpeech[] = "speech"; | 53 static const char kContentHintStringAudioSpeech[] = "speech"; |
| 54 static const char kContentHintStringAudioMusic[] = "music"; | 54 static const char kContentHintStringAudioMusic[] = "music"; |
| 55 static const char kContentHintStringVideoMotion[] = "motion"; | 55 static const char kContentHintStringVideoMotion[] = "motion"; |
| 56 static const char kContentHintStringVideoDetail[] = "detail"; | 56 static const char kContentHintStringVideoDetail[] = "detail"; |
| 57 } // namespace | 57 } // namespace |
| (...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 409 | 409 |
| 410 DEFINE_TRACE(MediaStreamTrack) { | 410 DEFINE_TRACE(MediaStreamTrack) { |
| 411 visitor->Trace(registered_media_streams_); | 411 visitor->Trace(registered_media_streams_); |
| 412 visitor->Trace(component_); | 412 visitor->Trace(component_); |
| 413 visitor->Trace(image_capture_); | 413 visitor->Trace(image_capture_); |
| 414 EventTargetWithInlineData::Trace(visitor); | 414 EventTargetWithInlineData::Trace(visitor); |
| 415 ContextLifecycleObserver::Trace(visitor); | 415 ContextLifecycleObserver::Trace(visitor); |
| 416 } | 416 } |
| 417 | 417 |
| 418 } // namespace blink | 418 } // namespace blink |
| OLD | NEW |