| 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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 void scheduleDispatchEvent(PassRefPtrWillBeRawPtr<Event>); | 103 void scheduleDispatchEvent(PassRefPtrWillBeRawPtr<Event>); |
| 104 void scheduledEventTimerFired(Timer<MediaStream>*); | 104 void scheduledEventTimerFired(Timer<MediaStream>*); |
| 105 | 105 |
| 106 bool m_stopped; | 106 bool m_stopped; |
| 107 | 107 |
| 108 MediaStreamTrackVector m_audioTracks; | 108 MediaStreamTrackVector m_audioTracks; |
| 109 MediaStreamTrackVector m_videoTracks; | 109 MediaStreamTrackVector m_videoTracks; |
| 110 RefPtr<MediaStreamDescriptor> m_descriptor; | 110 RefPtr<MediaStreamDescriptor> m_descriptor; |
| 111 | 111 |
| 112 Timer<MediaStream> m_scheduledEventTimer; | 112 Timer<MediaStream> m_scheduledEventTimer; |
| 113 WillBeHeapVector<RefPtrWillBeMember<Event> > m_scheduledEvents; | 113 WillBeHeapVector<RefPtrWillBeMember<Event>> m_scheduledEvents; |
| 114 }; | 114 }; |
| 115 | 115 |
| 116 typedef HeapVector<Member<MediaStream> > MediaStreamVector; | 116 typedef HeapVector<Member<MediaStream>> MediaStreamVector; |
| 117 | 117 |
| 118 } // namespace blink | 118 } // namespace blink |
| 119 | 119 |
| 120 #endif // MediaStream_h | 120 #endif // MediaStream_h |
| OLD | NEW |