| 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 14 matching lines...) Expand all Loading... |
| 25 #include "config.h" | 25 #include "config.h" |
| 26 | 26 |
| 27 #include "public/platform/WebMediaStreamTrack.h" | 27 #include "public/platform/WebMediaStreamTrack.h" |
| 28 | 28 |
| 29 #include "platform/mediastream/MediaStreamComponent.h" | 29 #include "platform/mediastream/MediaStreamComponent.h" |
| 30 #include "platform/mediastream/MediaStreamSource.h" | 30 #include "platform/mediastream/MediaStreamSource.h" |
| 31 #include "public/platform/WebAudioSourceProvider.h" | 31 #include "public/platform/WebAudioSourceProvider.h" |
| 32 #include "public/platform/WebMediaStream.h" | 32 #include "public/platform/WebMediaStream.h" |
| 33 #include "public/platform/WebMediaStreamSource.h" | 33 #include "public/platform/WebMediaStreamSource.h" |
| 34 #include "public/platform/WebString.h" | 34 #include "public/platform/WebString.h" |
| 35 #include "wtf/Vector.h" | |
| 36 | 35 |
| 37 using namespace blink; | 36 using namespace blink; |
| 38 | 37 |
| 39 namespace blink { | 38 namespace blink { |
| 40 | 39 |
| 41 namespace { | 40 namespace { |
| 42 | 41 |
| 43 class ExtraDataContainer : public MediaStreamComponent::ExtraData { | 42 class ExtraDataContainer : public MediaStreamComponent::ExtraData { |
| 44 public: | 43 public: |
| 45 explicit ExtraDataContainer(PassOwnPtr<WebMediaStreamTrack::ExtraData> extra
Data) : m_extraData(extraData) { } | 44 explicit ExtraDataContainer(PassOwnPtr<WebMediaStreamTrack::ExtraData> extra
Data) : m_extraData(extraData) { } |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 148 m_private->setSourceProvider(provider); | 147 m_private->setSourceProvider(provider); |
| 149 #endif // ENABLE(WEB_AUDIO) | 148 #endif // ENABLE(WEB_AUDIO) |
| 150 } | 149 } |
| 151 | 150 |
| 152 void WebMediaStreamTrack::assign(const WebMediaStreamTrack& other) | 151 void WebMediaStreamTrack::assign(const WebMediaStreamTrack& other) |
| 153 { | 152 { |
| 154 m_private = other.m_private; | 153 m_private = other.m_private; |
| 155 } | 154 } |
| 156 | 155 |
| 157 } // namespace blink | 156 } // namespace blink |
| OLD | NEW |