| 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 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 MediaStreamComponent::TrackData* data = m_private->getTrackData(); | 105 MediaStreamComponent::TrackData* data = m_private->getTrackData(); |
| 106 if (!data) | 106 if (!data) |
| 107 return 0; | 107 return 0; |
| 108 return static_cast<TrackDataContainer*>(data)->getTrackData(); | 108 return static_cast<TrackDataContainer*>(data)->getTrackData(); |
| 109 } | 109 } |
| 110 | 110 |
| 111 void WebMediaStreamTrack::setTrackData(TrackData* extraData) { | 111 void WebMediaStreamTrack::setTrackData(TrackData* extraData) { |
| 112 ASSERT(!m_private.isNull()); | 112 ASSERT(!m_private.isNull()); |
| 113 | 113 |
| 114 m_private->setTrackData( | 114 m_private->setTrackData( |
| 115 wrapUnique(new TrackDataContainer(wrapUnique(extraData)))); | 115 WTF::wrapUnique(new TrackDataContainer(WTF::wrapUnique(extraData)))); |
| 116 } | 116 } |
| 117 | 117 |
| 118 void WebMediaStreamTrack::setSourceProvider(WebAudioSourceProvider* provider) { | 118 void WebMediaStreamTrack::setSourceProvider(WebAudioSourceProvider* provider) { |
| 119 ASSERT(!m_private.isNull()); | 119 ASSERT(!m_private.isNull()); |
| 120 m_private->setSourceProvider(provider); | 120 m_private->setSourceProvider(provider); |
| 121 } | 121 } |
| 122 | 122 |
| 123 void WebMediaStreamTrack::assign(const WebMediaStreamTrack& other) { | 123 void WebMediaStreamTrack::assign(const WebMediaStreamTrack& other) { |
| 124 m_private = other.m_private; | 124 m_private = other.m_private; |
| 125 } | 125 } |
| 126 | 126 |
| 127 } // namespace blink | 127 } // namespace blink |
| OLD | NEW |