| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 */ | 23 */ |
| 24 | 24 |
| 25 #ifndef WebMediaStream_h | 25 #ifndef WebMediaStream_h |
| 26 #define WebMediaStream_h | 26 #define WebMediaStream_h |
| 27 | 27 |
| 28 #include "WebCommon.h" | 28 #include "WebCommon.h" |
| 29 #include "WebNonCopyable.h" | 29 #include "WebNonCopyable.h" |
| 30 #include "WebPrivatePtr.h" | 30 #include "WebPrivatePtr.h" |
| 31 #include "WebVector.h" | 31 #include "WebVector.h" |
| 32 | 32 |
| 33 namespace WebCore { | 33 namespace blink { |
| 34 class MediaStreamDescriptor; | 34 class MediaStreamDescriptor; |
| 35 } | 35 } |
| 36 | 36 |
| 37 namespace blink { | 37 namespace blink { |
| 38 | 38 |
| 39 class WebMediaStreamSource; | 39 class WebMediaStreamSource; |
| 40 class WebMediaStreamTrack; | 40 class WebMediaStreamTrack; |
| 41 class WebString; | 41 class WebString; |
| 42 | 42 |
| 43 class WebMediaStream { | 43 class WebMediaStream { |
| (...skipping 30 matching lines...) Expand all Loading... |
| 74 BLINK_PLATFORM_EXPORT void removeTrack(const WebMediaStreamTrack&); | 74 BLINK_PLATFORM_EXPORT void removeTrack(const WebMediaStreamTrack&); |
| 75 | 75 |
| 76 // Extra data associated with this WebMediaStream. | 76 // Extra data associated with this WebMediaStream. |
| 77 // If non-null, the extra data pointer will be deleted when the object is de
stroyed. | 77 // If non-null, the extra data pointer will be deleted when the object is de
stroyed. |
| 78 // Setting the extra data pointer will cause any existing non-null | 78 // Setting the extra data pointer will cause any existing non-null |
| 79 // extra data pointer to be deleted. | 79 // extra data pointer to be deleted. |
| 80 BLINK_PLATFORM_EXPORT ExtraData* extraData() const; | 80 BLINK_PLATFORM_EXPORT ExtraData* extraData() const; |
| 81 BLINK_PLATFORM_EXPORT void setExtraData(ExtraData*); | 81 BLINK_PLATFORM_EXPORT void setExtraData(ExtraData*); |
| 82 | 82 |
| 83 #if INSIDE_BLINK | 83 #if INSIDE_BLINK |
| 84 BLINK_PLATFORM_EXPORT WebMediaStream(WebCore::MediaStreamDescriptor*); | 84 BLINK_PLATFORM_EXPORT WebMediaStream(blink::MediaStreamDescriptor*); |
| 85 BLINK_PLATFORM_EXPORT WebMediaStream(const WTF::PassRefPtr<WebCore::MediaStr
eamDescriptor>&); | 85 BLINK_PLATFORM_EXPORT WebMediaStream(const WTF::PassRefPtr<blink::MediaStrea
mDescriptor>&); |
| 86 BLINK_PLATFORM_EXPORT operator WTF::PassRefPtr<WebCore::MediaStreamDescripto
r>() const; | 86 BLINK_PLATFORM_EXPORT operator WTF::PassRefPtr<blink::MediaStreamDescriptor>
() const; |
| 87 BLINK_PLATFORM_EXPORT operator WebCore::MediaStreamDescriptor*() const; | 87 BLINK_PLATFORM_EXPORT operator blink::MediaStreamDescriptor*() const; |
| 88 BLINK_PLATFORM_EXPORT WebMediaStream& operator=(const WTF::PassRefPtr<WebCor
e::MediaStreamDescriptor>&); | 88 BLINK_PLATFORM_EXPORT WebMediaStream& operator=(const WTF::PassRefPtr<blink:
:MediaStreamDescriptor>&); |
| 89 #endif | 89 #endif |
| 90 | 90 |
| 91 private: | 91 private: |
| 92 WebPrivatePtr<WebCore::MediaStreamDescriptor> m_private; | 92 WebPrivatePtr<blink::MediaStreamDescriptor> m_private; |
| 93 }; | 93 }; |
| 94 | 94 |
| 95 } // namespace blink | 95 } // namespace blink |
| 96 | 96 |
| 97 #endif // WebMediaStream_h | 97 #endif // WebMediaStream_h |
| OLD | NEW |