| 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 26 matching lines...) Expand all Loading... |
| 37 | 37 |
| 38 class ExceptionState; | 38 class ExceptionState; |
| 39 | 39 |
| 40 class MediaStream FINAL | 40 class MediaStream FINAL |
| 41 : public RefCountedGarbageCollectedWillBeGarbageCollectedFinalized<MediaStre
am> | 41 : public RefCountedGarbageCollectedWillBeGarbageCollectedFinalized<MediaStre
am> |
| 42 , public URLRegistrable | 42 , public URLRegistrable |
| 43 , public MediaStreamDescriptorClient | 43 , public MediaStreamDescriptorClient |
| 44 , public EventTargetWithInlineData | 44 , public EventTargetWithInlineData |
| 45 , public ContextLifecycleObserver { | 45 , public ContextLifecycleObserver { |
| 46 DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollectedWi
llBeGarbageCollectedFinalized<MediaStream>); | 46 DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollectedWi
llBeGarbageCollectedFinalized<MediaStream>); |
| 47 DEFINE_WRAPPERTYPEINFO(); |
| 47 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaStream); | 48 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaStream); |
| 48 public: | 49 public: |
| 49 static MediaStream* create(ExecutionContext*); | 50 static MediaStream* create(ExecutionContext*); |
| 50 static MediaStream* create(ExecutionContext*, MediaStream*); | 51 static MediaStream* create(ExecutionContext*, MediaStream*); |
| 51 static MediaStream* create(ExecutionContext*, const MediaStreamTrackVector&)
; | 52 static MediaStream* create(ExecutionContext*, const MediaStreamTrackVector&)
; |
| 52 static MediaStream* create(ExecutionContext*, PassRefPtr<MediaStreamDescript
or>); | 53 static MediaStream* create(ExecutionContext*, PassRefPtr<MediaStreamDescript
or>); |
| 53 virtual ~MediaStream(); | 54 virtual ~MediaStream(); |
| 54 | 55 |
| 55 // DEPRECATED | 56 // DEPRECATED |
| 56 String label() const { return m_descriptor->id(); } | 57 String label() const { return m_descriptor->id(); } |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 | 112 |
| 112 Timer<MediaStream> m_scheduledEventTimer; | 113 Timer<MediaStream> m_scheduledEventTimer; |
| 113 WillBeHeapVector<RefPtrWillBeMember<Event> > m_scheduledEvents; | 114 WillBeHeapVector<RefPtrWillBeMember<Event> > m_scheduledEvents; |
| 114 }; | 115 }; |
| 115 | 116 |
| 116 typedef HeapVector<Member<MediaStream> > MediaStreamVector; | 117 typedef HeapVector<Member<MediaStream> > MediaStreamVector; |
| 117 | 118 |
| 118 } // namespace blink | 119 } // namespace blink |
| 119 | 120 |
| 120 #endif // MediaStream_h | 121 #endif // MediaStream_h |
| OLD | NEW |