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

Side by Side Diff: third_party/WebKit/Source/modules/mediastream/MediaStream.h

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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 74
75 void trackEnded(); 75 void trackEnded();
76 76
77 // MediaStreamDescriptorClient 77 // MediaStreamDescriptorClient
78 void streamEnded() override; 78 void streamEnded() override;
79 79
80 MediaStreamDescriptor* descriptor() const { return m_descriptor; } 80 MediaStreamDescriptor* descriptor() const { return m_descriptor; }
81 81
82 // EventTarget 82 // EventTarget
83 const AtomicString& interfaceName() const override; 83 const AtomicString& interfaceName() const override;
84 ExecutionContext* executionContext() const override; 84 ExecutionContext* getExecutionContext() const override;
85 85
86 // URLRegistrable 86 // URLRegistrable
87 URLRegistry& registry() const override; 87 URLRegistry& registry() const override;
88 88
89 DECLARE_VIRTUAL_TRACE(); 89 DECLARE_VIRTUAL_TRACE();
90 90
91 private: 91 private:
92 MediaStream(ExecutionContext*, MediaStreamDescriptor*); 92 MediaStream(ExecutionContext*, MediaStreamDescriptor*);
93 MediaStream(ExecutionContext*, const MediaStreamTrackVector& audioTracks, co nst MediaStreamTrackVector& videoTracks); 93 MediaStream(ExecutionContext*, const MediaStreamTrackVector& audioTracks, co nst MediaStreamTrackVector& videoTracks);
94 94
(...skipping 17 matching lines...) Expand all
112 112
113 Timer<MediaStream> m_scheduledEventTimer; 113 Timer<MediaStream> m_scheduledEventTimer;
114 WillBeHeapVector<RefPtrWillBeMember<Event>> m_scheduledEvents; 114 WillBeHeapVector<RefPtrWillBeMember<Event>> m_scheduledEvents;
115 }; 115 };
116 116
117 typedef HeapVector<Member<MediaStream>> MediaStreamVector; 117 typedef HeapVector<Member<MediaStream>> MediaStreamVector;
118 118
119 } // namespace blink 119 } // namespace blink
120 120
121 #endif // MediaStream_h 121 #endif // MediaStream_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698