| 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 61 matching lines...) Loading... |
| 72 | 72 |
| 73 // Extra data associated with this WebMediaStream. | 73 // Extra data associated with this WebMediaStream. |
| 74 // If non-null, the extra data pointer will be deleted when the object is de
stroyed. | 74 // If non-null, the extra data pointer will be deleted when the object is de
stroyed. |
| 75 // Setting the extra data pointer will cause any existing non-null | 75 // Setting the extra data pointer will cause any existing non-null |
| 76 // extra data pointer to be deleted. | 76 // extra data pointer to be deleted. |
| 77 BLINK_PLATFORM_EXPORT ExtraData* extraData() const; | 77 BLINK_PLATFORM_EXPORT ExtraData* extraData() const; |
| 78 BLINK_PLATFORM_EXPORT void setExtraData(ExtraData*); | 78 BLINK_PLATFORM_EXPORT void setExtraData(ExtraData*); |
| 79 | 79 |
| 80 #if INSIDE_BLINK | 80 #if INSIDE_BLINK |
| 81 BLINK_PLATFORM_EXPORT WebMediaStream(MediaStreamDescriptor*); | 81 BLINK_PLATFORM_EXPORT WebMediaStream(MediaStreamDescriptor*); |
| 82 BLINK_PLATFORM_EXPORT WebMediaStream(const WTF::PassRefPtr<MediaStreamDescri
ptor>&); | |
| 83 BLINK_PLATFORM_EXPORT operator WTF::PassRefPtr<MediaStreamDescriptor>() cons
t; | |
| 84 BLINK_PLATFORM_EXPORT operator MediaStreamDescriptor*() const; | 82 BLINK_PLATFORM_EXPORT operator MediaStreamDescriptor*() const; |
| 85 BLINK_PLATFORM_EXPORT WebMediaStream& operator=(const WTF::PassRefPtr<MediaS
treamDescriptor>&); | 83 BLINK_PLATFORM_EXPORT WebMediaStream& operator=(MediaStreamDescriptor*); |
| 86 #endif | 84 #endif |
| 87 | 85 |
| 88 private: | 86 private: |
| 89 WebPrivatePtr<MediaStreamDescriptor> m_private; | 87 WebPrivatePtr<MediaStreamDescriptor> m_private; |
| 90 }; | 88 }; |
| 91 | 89 |
| 92 } // namespace blink | 90 } // namespace blink |
| 93 | 91 |
| 94 #endif // WebMediaStream_h | 92 #endif // WebMediaStream_h |
| OLD | NEW |
|---|
Chromium Code Reviews