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

Side by Side Diff: Source/modules/mediastream/MediaStream.cpp

Issue 26890003: Remove ThreadLocalEventNames (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix build Created 7 years, 2 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 | Annotate | Revision Log
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, 2012 Ericsson AB. All rights reserved. 3 * Copyright (C) 2011, 2012 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 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 } 254 }
255 255
256 void MediaStream::contextDestroyed() 256 void MediaStream::contextDestroyed()
257 { 257 {
258 ContextLifecycleObserver::contextDestroyed(); 258 ContextLifecycleObserver::contextDestroyed();
259 m_stopped = true; 259 m_stopped = true;
260 } 260 }
261 261
262 const AtomicString& MediaStream::interfaceName() const 262 const AtomicString& MediaStream::interfaceName() const
263 { 263 {
264 return eventNames().interfaceForMediaStream; 264 return EventTargetNames::MediaStream;
265 } 265 }
266 266
267 ExecutionContext* MediaStream::executionContext() const 267 ExecutionContext* MediaStream::executionContext() const
268 { 268 {
269 return ContextLifecycleObserver::executionContext(); 269 return ContextLifecycleObserver::executionContext();
270 } 270 }
271 271
272 void MediaStream::addRemoteTrack(MediaStreamComponent* component) 272 void MediaStream::addRemoteTrack(MediaStreamComponent* component)
273 { 273 {
274 ASSERT(component && !component->stream()); 274 ASSERT(component && !component->stream());
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 345
346 events.clear(); 346 events.clear();
347 } 347 }
348 348
349 URLRegistry& MediaStream::registry() const 349 URLRegistry& MediaStream::registry() const
350 { 350 {
351 return MediaStreamRegistry::registry(); 351 return MediaStreamRegistry::registry();
352 } 352 }
353 353
354 } // namespace WebCore 354 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/modules/mediastream/MediaConstraintsImpl.cpp ('k') | Source/modules/mediastream/MediaStreamEvent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698