| OLD | NEW |
| 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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 | 106 |
| 107 bool emptyOrOnlyEndedTracks(); | 107 bool emptyOrOnlyEndedTracks(); |
| 108 | 108 |
| 109 void scheduleDispatchEvent(Event*); | 109 void scheduleDispatchEvent(Event*); |
| 110 void scheduledEventTimerFired(TimerBase*); | 110 void scheduledEventTimerFired(TimerBase*); |
| 111 | 111 |
| 112 MediaStreamTrackVector m_audioTracks; | 112 MediaStreamTrackVector m_audioTracks; |
| 113 MediaStreamTrackVector m_videoTracks; | 113 MediaStreamTrackVector m_videoTracks; |
| 114 Member<MediaStreamDescriptor> m_descriptor; | 114 Member<MediaStreamDescriptor> m_descriptor; |
| 115 | 115 |
| 116 Timer<MediaStream> m_scheduledEventTimer; | 116 TaskRunnerTimer<MediaStream> m_scheduledEventTimer; |
| 117 HeapVector<Member<Event>> m_scheduledEvents; | 117 HeapVector<Member<Event>> m_scheduledEvents; |
| 118 }; | 118 }; |
| 119 | 119 |
| 120 using MediaStreamVector = HeapVector<Member<MediaStream>>; | 120 using MediaStreamVector = HeapVector<Member<MediaStream>>; |
| 121 | 121 |
| 122 MediaStream* toMediaStream(MediaStreamDescriptor*); | 122 MediaStream* toMediaStream(MediaStreamDescriptor*); |
| 123 | 123 |
| 124 } // namespace blink | 124 } // namespace blink |
| 125 | 125 |
| 126 #endif // MediaStream_h | 126 #endif // MediaStream_h |
| OLD | NEW |