| 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 19 matching lines...) Expand all Loading... |
| 30 #include "core/dom/ExceptionCode.h" | 30 #include "core/dom/ExceptionCode.h" |
| 31 #include "core/dom/ExecutionContext.h" | 31 #include "core/dom/ExecutionContext.h" |
| 32 #include "core/events/Event.h" | 32 #include "core/events/Event.h" |
| 33 #include "modules/mediastream/MediaStream.h" | 33 #include "modules/mediastream/MediaStream.h" |
| 34 #include "modules/mediastream/MediaStreamTrackSourcesCallback.h" | 34 #include "modules/mediastream/MediaStreamTrackSourcesCallback.h" |
| 35 #include "modules/mediastream/MediaStreamTrackSourcesRequestImpl.h" | 35 #include "modules/mediastream/MediaStreamTrackSourcesRequestImpl.h" |
| 36 #include "platform/mediastream/MediaStreamCenter.h" | 36 #include "platform/mediastream/MediaStreamCenter.h" |
| 37 #include "platform/mediastream/MediaStreamComponent.h" | 37 #include "platform/mediastream/MediaStreamComponent.h" |
| 38 #include "public/platform/WebSourceInfo.h" | 38 #include "public/platform/WebSourceInfo.h" |
| 39 | 39 |
| 40 namespace WebCore { | 40 namespace blink { |
| 41 | 41 |
| 42 MediaStreamTrack* MediaStreamTrack::create(ExecutionContext* context, MediaStrea
mComponent* component) | 42 MediaStreamTrack* MediaStreamTrack::create(ExecutionContext* context, MediaStrea
mComponent* component) |
| 43 { | 43 { |
| 44 MediaStreamTrack* track = adoptRefCountedGarbageCollectedWillBeNoop(new Medi
aStreamTrack(context, component)); | 44 MediaStreamTrack* track = adoptRefCountedGarbageCollectedWillBeNoop(new Medi
aStreamTrack(context, component)); |
| 45 track->suspendIfNeeded(); | 45 track->suspendIfNeeded(); |
| 46 return track; | 46 return track; |
| 47 } | 47 } |
| 48 | 48 |
| 49 MediaStreamTrack::MediaStreamTrack(ExecutionContext* context, MediaStreamCompone
nt* component) | 49 MediaStreamTrack::MediaStreamTrack(ExecutionContext* context, MediaStreamCompone
nt* component) |
| 50 : ActiveDOMObject(context) | 50 : ActiveDOMObject(context) |
| (...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 226 { | 226 { |
| 227 return ActiveDOMObject::executionContext(); | 227 return ActiveDOMObject::executionContext(); |
| 228 } | 228 } |
| 229 | 229 |
| 230 void MediaStreamTrack::trace(Visitor* visitor) | 230 void MediaStreamTrack::trace(Visitor* visitor) |
| 231 { | 231 { |
| 232 visitor->trace(m_registeredMediaStreams); | 232 visitor->trace(m_registeredMediaStreams); |
| 233 EventTargetWithInlineData::trace(visitor); | 233 EventTargetWithInlineData::trace(visitor); |
| 234 } | 234 } |
| 235 | 235 |
| 236 } // namespace WebCore | 236 } // namespace blink |
| OLD | NEW |