Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 17 matching lines...) Expand all Loading... | |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #ifndef WebMediaStreamSource_h | 31 #ifndef WebMediaStreamSource_h |
| 32 #define WebMediaStreamSource_h | 32 #define WebMediaStreamSource_h |
| 33 | 33 |
| 34 #include "WebCommon.h" | 34 #include "WebCommon.h" |
| 35 #include "WebNonCopyable.h" | 35 #include "WebNonCopyable.h" |
| 36 #include "WebPrivatePtr.h" | 36 #include "WebPrivatePtr.h" |
| 37 #include "WebVector.h" | 37 #include "WebVector.h" |
| 38 #if INSIDE_BLINK | |
| 39 #include "platform/heap/Handle.h" | |
| 40 #endif | |
| 38 | 41 |
| 39 namespace blink { | 42 namespace blink { |
| 40 | 43 |
| 41 class MediaStreamSource; | 44 class MediaStreamSource; |
| 42 class WebAudioDestinationConsumer; | 45 class WebAudioDestinationConsumer; |
| 43 class WebMediaConstraints; | 46 class WebMediaConstraints; |
| 44 class WebString; | 47 class WebString; |
| 45 | 48 |
| 46 class WebMediaStreamSource { | 49 class WebMediaStreamSource { |
| 47 public: | 50 public: |
| 48 class ExtraData { | 51 class ExtraData { |
| 49 public: | 52 public: |
| 50 ExtraData() : m_owner(0) { } | 53 ExtraData() : m_owner(0) { } |
| 51 virtual ~ExtraData() { } | 54 virtual ~ExtraData() { } |
| 52 | 55 |
| 53 BLINK_PLATFORM_EXPORT WebMediaStreamSource owner(); | 56 BLINK_PLATFORM_EXPORT WebMediaStreamSource owner(); |
| 54 | 57 |
| 55 #if INSIDE_BLINK | 58 #if INSIDE_BLINK |
| 56 BLINK_PLATFORM_EXPORT void setOwner(MediaStreamSource*); | 59 BLINK_PLATFORM_EXPORT void setOwner(MediaStreamSource*); |
| 57 #endif | 60 #endif |
| 58 | 61 |
| 59 private: | 62 private: |
| 63 #if INSIDE_BLINK | |
| 64 GC_PLUGIN_IGNORE("") | |
| 65 #endif | |
| 60 MediaStreamSource* m_owner; | 66 MediaStreamSource* m_owner; |
|
haraken
2014/08/27 12:33:56
I'm not sure if I'm doing a right thing here.
- B
zerny-chromium
2014/08/27 13:21:53
This raw pointer looks very unsafe, but is no more
tkent
2014/09/01 06:59:46
Resolving this raw pointer needs a lot of work, an
haraken
2014/09/01 07:10:44
Thanks, I filed a bug and added the bug number to
| |
| 61 }; | 67 }; |
| 62 | 68 |
| 63 enum Type { | 69 enum Type { |
| 64 TypeAudio, | 70 TypeAudio, |
| 65 TypeVideo | 71 TypeVideo |
| 66 }; | 72 }; |
| 67 | 73 |
| 68 enum ReadyState { | 74 enum ReadyState { |
| 69 ReadyStateLive = 0, | 75 ReadyStateLive = 0, |
| 70 ReadyStateMuted = 1, | 76 ReadyStateMuted = 1, |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 104 BLINK_PLATFORM_EXPORT WebMediaConstraints constraints(); | 110 BLINK_PLATFORM_EXPORT WebMediaConstraints constraints(); |
| 105 | 111 |
| 106 // Only used if if this is a WebAudio source. | 112 // Only used if if this is a WebAudio source. |
| 107 // The WebAudioDestinationConsumer is not owned, and has to be disposed of s eparately | 113 // The WebAudioDestinationConsumer is not owned, and has to be disposed of s eparately |
| 108 // after calling removeAudioConsumer. | 114 // after calling removeAudioConsumer. |
| 109 BLINK_PLATFORM_EXPORT bool requiresAudioConsumer() const; | 115 BLINK_PLATFORM_EXPORT bool requiresAudioConsumer() const; |
| 110 BLINK_PLATFORM_EXPORT void addAudioConsumer(WebAudioDestinationConsumer*); | 116 BLINK_PLATFORM_EXPORT void addAudioConsumer(WebAudioDestinationConsumer*); |
| 111 BLINK_PLATFORM_EXPORT bool removeAudioConsumer(WebAudioDestinationConsumer*) ; | 117 BLINK_PLATFORM_EXPORT bool removeAudioConsumer(WebAudioDestinationConsumer*) ; |
| 112 | 118 |
| 113 #if INSIDE_BLINK | 119 #if INSIDE_BLINK |
| 114 BLINK_PLATFORM_EXPORT WebMediaStreamSource(const WTF::PassRefPtr<MediaStream Source>&); | 120 BLINK_PLATFORM_EXPORT WebMediaStreamSource(MediaStreamSource*); |
| 115 BLINK_PLATFORM_EXPORT WebMediaStreamSource& operator=(MediaStreamSource*); | 121 BLINK_PLATFORM_EXPORT WebMediaStreamSource& operator=(MediaStreamSource*); |
| 116 BLINK_PLATFORM_EXPORT operator WTF::PassRefPtr<MediaStreamSource>() const; | |
| 117 BLINK_PLATFORM_EXPORT operator MediaStreamSource*() const; | 122 BLINK_PLATFORM_EXPORT operator MediaStreamSource*() const; |
| 118 #endif | 123 #endif |
| 119 | 124 |
| 120 private: | 125 private: |
| 121 WebPrivatePtr<MediaStreamSource> m_private; | 126 WebPrivatePtr<MediaStreamSource> m_private; |
| 122 }; | 127 }; |
| 123 | 128 |
| 124 } // namespace blink | 129 } // namespace blink |
| 125 | 130 |
| 126 #endif // WebMediaStreamSource_h | 131 #endif // WebMediaStreamSource_h |
| OLD | NEW |