| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012, Google Inc. All rights reserved. | 2 * Copyright (C) 2012, 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 21 matching lines...) Expand all Loading... |
| 32 #include "modules/webaudio/AudioNodeOutput.h" | 32 #include "modules/webaudio/AudioNodeOutput.h" |
| 33 #include <algorithm> | 33 #include <algorithm> |
| 34 | 34 |
| 35 namespace blink { | 35 namespace blink { |
| 36 | 36 |
| 37 AudioSummingJunction::AudioSummingJunction(AudioContext* context) | 37 AudioSummingJunction::AudioSummingJunction(AudioContext* context) |
| 38 : m_context(context) | 38 : m_context(context) |
| 39 , m_renderingStateNeedUpdating(false) | 39 , m_renderingStateNeedUpdating(false) |
| 40 { | 40 { |
| 41 ASSERT(context); | 41 ASSERT(context); |
| 42 #if ENABLE(OILPAN) | |
| 43 m_context->registerLiveAudioSummingJunction(*this); | 42 m_context->registerLiveAudioSummingJunction(*this); |
| 44 #endif | |
| 45 } | 43 } |
| 46 | 44 |
| 47 AudioSummingJunction::~AudioSummingJunction() | 45 AudioSummingJunction::~AudioSummingJunction() |
| 48 { | 46 { |
| 49 #if !ENABLE(OILPAN) | |
| 50 if (m_renderingStateNeedUpdating && m_context.get()) | |
| 51 m_context->removeMarkedSummingJunction(this); | |
| 52 #endif | |
| 53 } | 47 } |
| 54 | 48 |
| 55 void AudioSummingJunction::trace(Visitor* visitor) | 49 void AudioSummingJunction::trace(Visitor* visitor) |
| 56 { | 50 { |
| 57 visitor->trace(m_context); | 51 visitor->trace(m_context); |
| 58 } | 52 } |
| 59 | 53 |
| 60 void AudioSummingJunction::changedOutputs() | 54 void AudioSummingJunction::changedOutputs() |
| 61 { | 55 { |
| 62 ASSERT(context()->isGraphOwner()); | 56 ASSERT(context()->isGraphOwner()); |
| (...skipping 18 matching lines...) Expand all Loading... |
| 81 | 75 |
| 82 didUpdate(); | 76 didUpdate(); |
| 83 | 77 |
| 84 m_renderingStateNeedUpdating = false; | 78 m_renderingStateNeedUpdating = false; |
| 85 } | 79 } |
| 86 } | 80 } |
| 87 | 81 |
| 88 } // namespace blink | 82 } // namespace blink |
| 89 | 83 |
| 90 #endif // ENABLE(WEB_AUDIO) | 84 #endif // ENABLE(WEB_AUDIO) |
| OLD | NEW |