| 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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 // EventTarget | 81 // EventTarget |
| 82 const AtomicString& interfaceName() const override; | 82 const AtomicString& interfaceName() const override; |
| 83 ExecutionContext* getExecutionContext() const override; | 83 ExecutionContext* getExecutionContext() const override; |
| 84 | 84 |
| 85 // URLRegistrable | 85 // URLRegistrable |
| 86 URLRegistry& registry() const override; | 86 URLRegistry& registry() const override; |
| 87 | 87 |
| 88 DECLARE_VIRTUAL_TRACE(); | 88 DECLARE_VIRTUAL_TRACE(); |
| 89 | 89 |
| 90 protected: | 90 protected: |
| 91 bool addEventListenerInternal(const AtomicString& eventType, EventListener*,
const AddEventListenerOptions&) override; | 91 bool addEventListenerInternal(const AtomicString& eventType, EventListener*,
const AddEventListenerOptionsResolved&) override; |
| 92 | 92 |
| 93 private: | 93 private: |
| 94 MediaStream(ExecutionContext*, MediaStreamDescriptor*); | 94 MediaStream(ExecutionContext*, MediaStreamDescriptor*); |
| 95 MediaStream(ExecutionContext*, const MediaStreamTrackVector& audioTracks, co
nst MediaStreamTrackVector& videoTracks); | 95 MediaStream(ExecutionContext*, const MediaStreamTrackVector& audioTracks, co
nst MediaStreamTrackVector& videoTracks); |
| 96 | 96 |
| 97 // ContextLifecycleObserver | 97 // ContextLifecycleObserver |
| 98 void contextDestroyed() override; | 98 void contextDestroyed() override; |
| 99 | 99 |
| 100 // MediaStreamDescriptorClient | 100 // MediaStreamDescriptorClient |
| 101 void addRemoteTrack(MediaStreamComponent*) override; | 101 void addRemoteTrack(MediaStreamComponent*) override; |
| (...skipping 14 matching lines...) Expand all Loading... |
| 116 HeapVector<Member<Event>> m_scheduledEvents; | 116 HeapVector<Member<Event>> m_scheduledEvents; |
| 117 }; | 117 }; |
| 118 | 118 |
| 119 typedef HeapVector<Member<MediaStream>> MediaStreamVector; | 119 typedef HeapVector<Member<MediaStream>> MediaStreamVector; |
| 120 | 120 |
| 121 MediaStream* toMediaStream(MediaStreamDescriptor*); | 121 MediaStream* toMediaStream(MediaStreamDescriptor*); |
| 122 | 122 |
| 123 } // namespace blink | 123 } // namespace blink |
| 124 | 124 |
| 125 #endif // MediaStream_h | 125 #endif // MediaStream_h |
| OLD | NEW |