| 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 | 84 |
| 85 MediaStreamDescriptor* descriptor() const { return m_descriptor.get(); } | 85 MediaStreamDescriptor* descriptor() const { return m_descriptor.get(); } |
| 86 | 86 |
| 87 // EventTarget | 87 // EventTarget |
| 88 virtual const AtomicString& interfaceName() const override; | 88 virtual const AtomicString& interfaceName() const override; |
| 89 virtual ExecutionContext* executionContext() const override; | 89 virtual ExecutionContext* executionContext() const override; |
| 90 | 90 |
| 91 // URLRegistrable | 91 // URLRegistrable |
| 92 virtual URLRegistry& registry() const override; | 92 virtual URLRegistry& registry() const override; |
| 93 | 93 |
| 94 // Oilpan: need to eagerly unregister as m_descriptor client. |
| 95 EAGERLY_FINALIZE(); |
| 94 DECLARE_VIRTUAL_TRACE(); | 96 DECLARE_VIRTUAL_TRACE(); |
| 95 | 97 |
| 96 private: | 98 private: |
| 97 MediaStream(ExecutionContext*, PassRefPtr<MediaStreamDescriptor>); | 99 MediaStream(ExecutionContext*, PassRefPtr<MediaStreamDescriptor>); |
| 98 MediaStream(ExecutionContext*, const MediaStreamTrackVector& audioTracks, co
nst MediaStreamTrackVector& videoTracks); | 100 MediaStream(ExecutionContext*, const MediaStreamTrackVector& audioTracks, co
nst MediaStreamTrackVector& videoTracks); |
| 99 | 101 |
| 100 // ContextLifecycleObserver | 102 // ContextLifecycleObserver |
| 101 virtual void contextDestroyed() override; | 103 virtual void contextDestroyed() override; |
| 102 | 104 |
| 103 // MediaStreamDescriptorClient | 105 // MediaStreamDescriptorClient |
| (...skipping 13 matching lines...) Expand all Loading... |
| 117 | 119 |
| 118 Timer<MediaStream> m_scheduledEventTimer; | 120 Timer<MediaStream> m_scheduledEventTimer; |
| 119 WillBeHeapVector<RefPtrWillBeMember<Event>> m_scheduledEvents; | 121 WillBeHeapVector<RefPtrWillBeMember<Event>> m_scheduledEvents; |
| 120 }; | 122 }; |
| 121 | 123 |
| 122 typedef HeapVector<Member<MediaStream>> MediaStreamVector; | 124 typedef HeapVector<Member<MediaStream>> MediaStreamVector; |
| 123 | 125 |
| 124 } // namespace blink | 126 } // namespace blink |
| 125 | 127 |
| 126 #endif // MediaStream_h | 128 #endif // MediaStream_h |
| OLD | NEW |