| 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 16 matching lines...) Expand all Loading... |
| 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" | 35 #include "wtf/Vector.h" |
| 36 | 36 |
| 37 using namespace WebCore; | 37 using namespace blink; |
| 38 | 38 |
| 39 namespace blink { | 39 namespace blink { |
| 40 | 40 |
| 41 namespace { | 41 namespace { |
| 42 | 42 |
| 43 class ExtraDataContainer : public MediaStreamComponent::ExtraData { | 43 class ExtraDataContainer : public MediaStreamComponent::ExtraData { |
| 44 public: | 44 public: |
| 45 explicit ExtraDataContainer(PassOwnPtr<WebMediaStreamTrack::ExtraData> extra
Data) : m_extraData(extraData) { } | 45 explicit ExtraDataContainer(PassOwnPtr<WebMediaStreamTrack::ExtraData> extra
Data) : m_extraData(extraData) { } |
| 46 | 46 |
| 47 WebMediaStreamTrack::ExtraData* extraData() { return m_extraData.get(); } | 47 WebMediaStreamTrack::ExtraData* extraData() { return m_extraData.get(); } |
| 48 | 48 |
| 49 private: | 49 private: |
| 50 OwnPtr<WebMediaStreamTrack::ExtraData> m_extraData; | 50 OwnPtr<WebMediaStreamTrack::ExtraData> m_extraData; |
| 51 }; | 51 }; |
| 52 | 52 |
| 53 } // namespace | 53 } // namespace |
| 54 | 54 |
| 55 WebMediaStreamTrack WebMediaStreamTrack::ExtraData::owner() | 55 WebMediaStreamTrack WebMediaStreamTrack::ExtraData::owner() |
| 56 { | 56 { |
| 57 ASSERT(m_owner); | 57 ASSERT(m_owner); |
| 58 return WebMediaStreamTrack(m_owner); | 58 return WebMediaStreamTrack(m_owner); |
| 59 } | 59 } |
| 60 | 60 |
| 61 void WebMediaStreamTrack::ExtraData::setOwner(WebCore::MediaStreamComponent* own
er) | 61 void WebMediaStreamTrack::ExtraData::setOwner(blink::MediaStreamComponent* owner
) |
| 62 { | 62 { |
| 63 ASSERT(!m_owner); | 63 ASSERT(!m_owner); |
| 64 m_owner = owner; | 64 m_owner = owner; |
| 65 } | 65 } |
| 66 | 66 |
| 67 WebMediaStreamTrack::WebMediaStreamTrack(PassRefPtr<WebCore::MediaStreamComponen
t> mediaStreamComponent) | 67 WebMediaStreamTrack::WebMediaStreamTrack(PassRefPtr<blink::MediaStreamComponent>
mediaStreamComponent) |
| 68 : m_private(mediaStreamComponent) | 68 : m_private(mediaStreamComponent) |
| 69 { | 69 { |
| 70 } | 70 } |
| 71 | 71 |
| 72 WebMediaStreamTrack::WebMediaStreamTrack(WebCore::MediaStreamComponent* mediaStr
eamComponent) | 72 WebMediaStreamTrack::WebMediaStreamTrack(blink::MediaStreamComponent* mediaStrea
mComponent) |
| 73 : m_private(mediaStreamComponent) | 73 : m_private(mediaStreamComponent) |
| 74 { | 74 { |
| 75 } | 75 } |
| 76 | 76 |
| 77 WebMediaStreamTrack& WebMediaStreamTrack::operator=(WebCore::MediaStreamComponen
t* mediaStreamComponent) | 77 WebMediaStreamTrack& WebMediaStreamTrack::operator=(blink::MediaStreamComponent*
mediaStreamComponent) |
| 78 { | 78 { |
| 79 m_private = mediaStreamComponent; | 79 m_private = mediaStreamComponent; |
| 80 return *this; | 80 return *this; |
| 81 } | 81 } |
| 82 | 82 |
| 83 void WebMediaStreamTrack::initialize(const WebMediaStreamSource& source) | 83 void WebMediaStreamTrack::initialize(const WebMediaStreamSource& source) |
| 84 { | 84 { |
| 85 m_private = MediaStreamComponent::create(source); | 85 m_private = MediaStreamComponent::create(source); |
| 86 } | 86 } |
| 87 | 87 |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 148 m_private->setSourceProvider(provider); | 148 m_private->setSourceProvider(provider); |
| 149 #endif // ENABLE(WEB_AUDIO) | 149 #endif // ENABLE(WEB_AUDIO) |
| 150 } | 150 } |
| 151 | 151 |
| 152 void WebMediaStreamTrack::assign(const WebMediaStreamTrack& other) | 152 void WebMediaStreamTrack::assign(const WebMediaStreamTrack& other) |
| 153 { | 153 { |
| 154 m_private = other.m_private; | 154 m_private = other.m_private; |
| 155 } | 155 } |
| 156 | 156 |
| 157 } // namespace blink | 157 } // namespace blink |
| OLD | NEW |