| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Ericsson AB. All rights reserved. | 2 * Copyright (C) 2011 Ericsson AB. All rights reserved. |
| 3 * Copyright (C) 2013 Google Inc. All rights reserved. | 3 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 return new MediaStreamComponent(id, source); | 49 return new MediaStreamComponent(id, source); |
| 50 } | 50 } |
| 51 | 51 |
| 52 MediaStreamComponent::MediaStreamComponent(const String& id, MediaStreamSource*
source) | 52 MediaStreamComponent::MediaStreamComponent(const String& id, MediaStreamSource*
source) |
| 53 : m_source(source) | 53 : m_source(source) |
| 54 , m_id(id) | 54 , m_id(id) |
| 55 , m_enabled(true) | 55 , m_enabled(true) |
| 56 , m_muted(false) | 56 , m_muted(false) |
| 57 { | 57 { |
| 58 ASSERT(m_id.length()); | 58 ASSERT(m_id.length()); |
| 59 ThreadState::current()->registerPreFinalizer(this); |
| 59 } | 60 } |
| 60 | 61 |
| 61 void MediaStreamComponent::dispose() | 62 void MediaStreamComponent::dispose() |
| 62 { | 63 { |
| 63 m_extraData.clear(); | 64 m_extraData.clear(); |
| 64 } | 65 } |
| 65 | 66 |
| 66 #if ENABLE(WEB_AUDIO) | 67 #if ENABLE(WEB_AUDIO) |
| 67 void MediaStreamComponent::AudioSourceProviderImpl::wrap(WebAudioSourceProvider*
provider) | 68 void MediaStreamComponent::AudioSourceProviderImpl::wrap(WebAudioSourceProvider*
provider) |
| 68 { | 69 { |
| (...skipping 22 matching lines...) Expand all Loading... |
| 91 m_webAudioSourceProvider->provideInput(webAudioData, framesToProcess); | 92 m_webAudioSourceProvider->provideInput(webAudioData, framesToProcess); |
| 92 } | 93 } |
| 93 #endif // #if ENABLE(WEB_AUDIO) | 94 #endif // #if ENABLE(WEB_AUDIO) |
| 94 | 95 |
| 95 DEFINE_TRACE(MediaStreamComponent) | 96 DEFINE_TRACE(MediaStreamComponent) |
| 96 { | 97 { |
| 97 visitor->trace(m_source); | 98 visitor->trace(m_source); |
| 98 } | 99 } |
| 99 | 100 |
| 100 } // namespace blink | 101 } // namespace blink |
| OLD | NEW |