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

Side by Side Diff: third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.cpp

Issue 2567913002: Rename ActiveDOMObject to SuspendableObject (Closed)
Patch Set: Created 4 years 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
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 MediaStreamTrack* MediaStreamTrack::create(ExecutionContext* context, 46 MediaStreamTrack* MediaStreamTrack::create(ExecutionContext* context,
47 MediaStreamComponent* component) { 47 MediaStreamComponent* component) {
48 MediaStreamTrack* track = new MediaStreamTrack(context, component); 48 MediaStreamTrack* track = new MediaStreamTrack(context, component);
49 track->suspendIfNeeded(); 49 track->suspendIfNeeded();
50 return track; 50 return track;
51 } 51 }
52 52
53 MediaStreamTrack::MediaStreamTrack(ExecutionContext* context, 53 MediaStreamTrack::MediaStreamTrack(ExecutionContext* context,
54 MediaStreamComponent* component) 54 MediaStreamComponent* component)
55 : ActiveScriptWrappable(this), 55 : ActiveScriptWrappable(this),
56 ActiveDOMObject(context), 56 SuspendableObject(context),
57 m_readyState(MediaStreamSource::ReadyStateLive), 57 m_readyState(MediaStreamSource::ReadyStateLive),
58 m_isIteratingRegisteredMediaStreams(false), 58 m_isIteratingRegisteredMediaStreams(false),
59 m_stopped(false), 59 m_stopped(false),
60 m_component(component), 60 m_component(component),
61 // The source's constraints aren't yet initialized at creation time. 61 // The source's constraints aren't yet initialized at creation time.
62 m_constraints() { 62 m_constraints() {
63 m_component->source()->addObserver(this); 63 m_component->source()->addObserver(this);
64 } 64 }
65 65
66 MediaStreamTrack::~MediaStreamTrack() {} 66 MediaStreamTrack::~MediaStreamTrack() {}
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 m_registeredMediaStreams.find(mediaStream); 243 m_registeredMediaStreams.find(mediaStream);
244 CHECK(iter != m_registeredMediaStreams.end()); 244 CHECK(iter != m_registeredMediaStreams.end());
245 m_registeredMediaStreams.remove(iter); 245 m_registeredMediaStreams.remove(iter);
246 } 246 }
247 247
248 const AtomicString& MediaStreamTrack::interfaceName() const { 248 const AtomicString& MediaStreamTrack::interfaceName() const {
249 return EventTargetNames::MediaStreamTrack; 249 return EventTargetNames::MediaStreamTrack;
250 } 250 }
251 251
252 ExecutionContext* MediaStreamTrack::getExecutionContext() const { 252 ExecutionContext* MediaStreamTrack::getExecutionContext() const {
253 return ActiveDOMObject::getExecutionContext(); 253 return SuspendableObject::getExecutionContext();
254 } 254 }
255 255
256 DEFINE_TRACE(MediaStreamTrack) { 256 DEFINE_TRACE(MediaStreamTrack) {
257 visitor->trace(m_registeredMediaStreams); 257 visitor->trace(m_registeredMediaStreams);
258 visitor->trace(m_component); 258 visitor->trace(m_component);
259 EventTargetWithInlineData::trace(visitor); 259 EventTargetWithInlineData::trace(visitor);
260 ActiveDOMObject::trace(visitor); 260 SuspendableObject::trace(visitor);
261 } 261 }
262 262
263 } // namespace blink 263 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698