| 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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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* executionContext() const override; |
| 85 | 85 |
| 86 // URLRegistrable | 86 // URLRegistrable |
| 87 URLRegistry& registry() const override; | 87 URLRegistry& registry() const override; |
| 88 | 88 |
| 89 // Oilpan: need to eagerly unregister as m_descriptor client. | |
| 90 EAGERLY_FINALIZE(); | |
| 91 DECLARE_VIRTUAL_TRACE(); | 89 DECLARE_VIRTUAL_TRACE(); |
| 92 | 90 |
| 93 private: | 91 private: |
| 94 MediaStream(ExecutionContext*, MediaStreamDescriptor*); | 92 MediaStream(ExecutionContext*, MediaStreamDescriptor*); |
| 95 MediaStream(ExecutionContext*, const MediaStreamTrackVector& audioTracks, co
nst MediaStreamTrackVector& videoTracks); | 93 MediaStream(ExecutionContext*, const MediaStreamTrackVector& audioTracks, co
nst MediaStreamTrackVector& videoTracks); |
| 96 | 94 |
| 97 // ContextLifecycleObserver | 95 // ContextLifecycleObserver |
| 98 void contextDestroyed() override; | 96 void contextDestroyed() override; |
| 99 | 97 |
| 100 // MediaStreamDescriptorClient | 98 // MediaStreamDescriptorClient |
| (...skipping 13 matching lines...) Expand all Loading... |
| 114 | 112 |
| 115 Timer<MediaStream> m_scheduledEventTimer; | 113 Timer<MediaStream> m_scheduledEventTimer; |
| 116 WillBeHeapVector<RefPtrWillBeMember<Event>> m_scheduledEvents; | 114 WillBeHeapVector<RefPtrWillBeMember<Event>> m_scheduledEvents; |
| 117 }; | 115 }; |
| 118 | 116 |
| 119 typedef HeapVector<Member<MediaStream>> MediaStreamVector; | 117 typedef HeapVector<Member<MediaStream>> MediaStreamVector; |
| 120 | 118 |
| 121 } // namespace blink | 119 } // namespace blink |
| 122 | 120 |
| 123 #endif // MediaStream_h | 121 #endif // MediaStream_h |
| OLD | NEW |