| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 #include "wtf/Vector.h" | 40 #include "wtf/Vector.h" |
| 41 | 41 |
| 42 namespace blink { | 42 namespace blink { |
| 43 | 43 |
| 44 namespace { | 44 namespace { |
| 45 | 45 |
| 46 class ExtraDataContainer : public MediaStreamSource::ExtraData { | 46 class ExtraDataContainer : public MediaStreamSource::ExtraData { |
| 47 public: | 47 public: |
| 48 ExtraDataContainer(PassOwnPtr<WebMediaStreamSource::ExtraData> extraData) :
m_extraData(std::move(extraData)) { } | 48 ExtraDataContainer(PassOwnPtr<WebMediaStreamSource::ExtraData> extraData) :
m_extraData(std::move(extraData)) { } |
| 49 | 49 |
| 50 WebMediaStreamSource::ExtraData* extraData() { return m_extraData.get(); } | 50 WebMediaStreamSource::ExtraData* getExtraData() { return m_extraData.get();
} |
| 51 | 51 |
| 52 private: | 52 private: |
| 53 OwnPtr<WebMediaStreamSource::ExtraData> m_extraData; | 53 OwnPtr<WebMediaStreamSource::ExtraData> m_extraData; |
| 54 }; | 54 }; |
| 55 | 55 |
| 56 } // namespace | 56 } // namespace |
| 57 | 57 |
| 58 WebMediaStreamSource WebMediaStreamSource::ExtraData::owner() | 58 WebMediaStreamSource WebMediaStreamSource::ExtraData::owner() |
| 59 { | 59 { |
| 60 ASSERT(m_owner); | 60 ASSERT(m_owner); |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 | 135 |
| 136 WebMediaStreamSource::ReadyState WebMediaStreamSource::getReadyState() const | 136 WebMediaStreamSource::ReadyState WebMediaStreamSource::getReadyState() const |
| 137 { | 137 { |
| 138 ASSERT(!m_private.isNull()); | 138 ASSERT(!m_private.isNull()); |
| 139 return static_cast<ReadyState>(m_private->getReadyState()); | 139 return static_cast<ReadyState>(m_private->getReadyState()); |
| 140 } | 140 } |
| 141 | 141 |
| 142 WebMediaStreamSource::ExtraData* WebMediaStreamSource::getExtraData() const | 142 WebMediaStreamSource::ExtraData* WebMediaStreamSource::getExtraData() const |
| 143 { | 143 { |
| 144 ASSERT(!m_private.isNull()); | 144 ASSERT(!m_private.isNull()); |
| 145 MediaStreamSource::ExtraData* data = m_private->extraData(); | 145 MediaStreamSource::ExtraData* data = m_private->getExtraData(); |
| 146 if (!data) | 146 if (!data) |
| 147 return 0; | 147 return 0; |
| 148 return static_cast<ExtraDataContainer*>(data)->extraData(); | 148 return static_cast<ExtraDataContainer*>(data)->getExtraData(); |
| 149 } | 149 } |
| 150 | 150 |
| 151 void WebMediaStreamSource::setExtraData(ExtraData* extraData) | 151 void WebMediaStreamSource::setExtraData(ExtraData* extraData) |
| 152 { | 152 { |
| 153 ASSERT(!m_private.isNull()); | 153 ASSERT(!m_private.isNull()); |
| 154 | 154 |
| 155 if (extraData) | 155 if (extraData) |
| 156 extraData->setOwner(m_private.get()); | 156 extraData->setOwner(m_private.get()); |
| 157 | 157 |
| 158 m_private->setExtraData(adoptPtr(new ExtraDataContainer(adoptPtr(extraData))
)); | 158 m_private->setExtraData(adoptPtr(new ExtraDataContainer(adoptPtr(extraData))
)); |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 226 ConsumerWrapper* wrapper = static_cast<ConsumerWrapper*>(it->get()); | 226 ConsumerWrapper* wrapper = static_cast<ConsumerWrapper*>(it->get()); |
| 227 if (wrapper->consumer() == consumer) { | 227 if (wrapper->consumer() == consumer) { |
| 228 m_private->removeAudioConsumer(wrapper); | 228 m_private->removeAudioConsumer(wrapper); |
| 229 return true; | 229 return true; |
| 230 } | 230 } |
| 231 } | 231 } |
| 232 return false; | 232 return false; |
| 233 } | 233 } |
| 234 | 234 |
| 235 } // namespace blink | 235 } // namespace blink |
| OLD | NEW |