| 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 25 matching lines...) Expand all Loading... |
| 36 namespace blink { | 36 namespace blink { |
| 37 class WebAudioSourceProvider; | 37 class WebAudioSourceProvider; |
| 38 class WebMediaStream; | 38 class WebMediaStream; |
| 39 class WebMediaStreamSource; | 39 class WebMediaStreamSource; |
| 40 class WebString; | 40 class WebString; |
| 41 | 41 |
| 42 class WebMediaStreamTrack { | 42 class WebMediaStreamTrack { |
| 43 public: | 43 public: |
| 44 class ExtraData { | 44 class ExtraData { |
| 45 public: | 45 public: |
| 46 ExtraData() : m_owner(0) { } |
| 46 virtual ~ExtraData() { } | 47 virtual ~ExtraData() { } |
| 48 |
| 47 BLINK_EXPORT WebMediaStreamTrack owner(); | 49 BLINK_EXPORT WebMediaStreamTrack owner(); |
| 48 | 50 |
| 49 #if INSIDE_BLINK | 51 #if INSIDE_BLINK |
| 50 BLINK_EXPORT void setOwner(WebCore::MediaStreamComponent*); | 52 BLINK_EXPORT void setOwner(WebCore::MediaStreamComponent*); |
| 51 #endif | 53 #endif |
| 52 | 54 |
| 53 private: | 55 private: |
| 54 WebCore::MediaStreamComponent* m_owner; | 56 WebCore::MediaStreamComponent* m_owner; |
| 55 }; | 57 }; |
| 56 | 58 |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 operator WebCore::MediaStreamComponent*() const; | 99 operator WebCore::MediaStreamComponent*() const; |
| 98 #endif | 100 #endif |
| 99 | 101 |
| 100 private: | 102 private: |
| 101 WebPrivatePtr<WebCore::MediaStreamComponent> m_private; | 103 WebPrivatePtr<WebCore::MediaStreamComponent> m_private; |
| 102 }; | 104 }; |
| 103 | 105 |
| 104 } // namespace blink | 106 } // namespace blink |
| 105 | 107 |
| 106 #endif // WebMediaStreamTrack_h | 108 #endif // WebMediaStreamTrack_h |
| OLD | NEW |