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

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

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes Created 4 years, 9 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 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 HeapHashSet<Member<MediaStream>>::iterator iter = m_registeredMediaStreams.f ind(mediaStream); 245 HeapHashSet<Member<MediaStream>>::iterator iter = m_registeredMediaStreams.f ind(mediaStream);
246 RELEASE_ASSERT(iter != m_registeredMediaStreams.end()); 246 RELEASE_ASSERT(iter != m_registeredMediaStreams.end());
247 m_registeredMediaStreams.remove(iter); 247 m_registeredMediaStreams.remove(iter);
248 } 248 }
249 249
250 const AtomicString& MediaStreamTrack::interfaceName() const 250 const AtomicString& MediaStreamTrack::interfaceName() const
251 { 251 {
252 return EventTargetNames::MediaStreamTrack; 252 return EventTargetNames::MediaStreamTrack;
253 } 253 }
254 254
255 ExecutionContext* MediaStreamTrack::executionContext() const 255 ExecutionContext* MediaStreamTrack::getExecutionContext() const
256 { 256 {
257 return ActiveDOMObject::executionContext(); 257 return ActiveDOMObject::getExecutionContext();
258 } 258 }
259 259
260 DEFINE_TRACE(MediaStreamTrack) 260 DEFINE_TRACE(MediaStreamTrack)
261 { 261 {
262 visitor->trace(m_registeredMediaStreams); 262 visitor->trace(m_registeredMediaStreams);
263 visitor->trace(m_component); 263 visitor->trace(m_component);
264 RefCountedGarbageCollectedEventTargetWithInlineData<MediaStreamTrack>::trace (visitor); 264 RefCountedGarbageCollectedEventTargetWithInlineData<MediaStreamTrack>::trace (visitor);
265 ActiveDOMObject::trace(visitor); 265 ActiveDOMObject::trace(visitor);
266 } 266 }
267 267
268 } // namespace blink 268 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698