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

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

Issue 2703833002: Migrate WTF::HashSet::remove() to ::erase() [part 2] (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
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 CHECK(!m_isIteratingRegisteredMediaStreams); 327 CHECK(!m_isIteratingRegisteredMediaStreams);
328 CHECK(!m_registeredMediaStreams.contains(mediaStream)); 328 CHECK(!m_registeredMediaStreams.contains(mediaStream));
329 m_registeredMediaStreams.insert(mediaStream); 329 m_registeredMediaStreams.insert(mediaStream);
330 } 330 }
331 331
332 void MediaStreamTrack::unregisterMediaStream(MediaStream* mediaStream) { 332 void MediaStreamTrack::unregisterMediaStream(MediaStream* mediaStream) {
333 CHECK(!m_isIteratingRegisteredMediaStreams); 333 CHECK(!m_isIteratingRegisteredMediaStreams);
334 HeapHashSet<Member<MediaStream>>::iterator iter = 334 HeapHashSet<Member<MediaStream>>::iterator iter =
335 m_registeredMediaStreams.find(mediaStream); 335 m_registeredMediaStreams.find(mediaStream);
336 CHECK(iter != m_registeredMediaStreams.end()); 336 CHECK(iter != m_registeredMediaStreams.end());
337 m_registeredMediaStreams.remove(iter); 337 m_registeredMediaStreams.erase(iter);
338 } 338 }
339 339
340 const AtomicString& MediaStreamTrack::interfaceName() const { 340 const AtomicString& MediaStreamTrack::interfaceName() const {
341 return EventTargetNames::MediaStreamTrack; 341 return EventTargetNames::MediaStreamTrack;
342 } 342 }
343 343
344 ExecutionContext* MediaStreamTrack::getExecutionContext() const { 344 ExecutionContext* MediaStreamTrack::getExecutionContext() const {
345 return ContextLifecycleObserver::getExecutionContext(); 345 return ContextLifecycleObserver::getExecutionContext();
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