Diff
Modified: trunk/Source/WebCore/ChangeLog (159441 => 159442)
--- trunk/Source/WebCore/ChangeLog 2013-11-18 19:44:31 UTC (rev 159441)
+++ trunk/Source/WebCore/ChangeLog 2013-11-18 19:53:06 UTC (rev 159442)
@@ -1,3 +1,22 @@
+2013-11-18 Nick Diego Yamane <[email protected]>
+
+ Change webaudio to use nullptr for null pointers
+ https://bugs.webkit.org/show_bug.cgi?id=124526
+
+ Reviewed by Anders Carlsson.
+
+ No new tests needed, no behavior change.
+
+ * Modules/webaudio/AudioBuffer.cpp:
+ * Modules/webaudio/AudioContext.cpp:
+ * Modules/webaudio/AudioNode.cpp:
+ * Modules/webaudio/ChannelMergerNode.cpp:
+ * Modules/webaudio/ChannelSplitterNode.cpp:
+ * Modules/webaudio/MediaStreamAudioSource.cpp:
+ * Modules/webaudio/OfflineAudioContext.cpp:
+ * Modules/webaudio/PeriodicWave.cpp:
+ * Modules/webaudio/ScriptProcessorNode.cpp:
+
2013-11-18 [email protected] <[email protected]>
[Curl] Basic authentication is not reused.
Modified: trunk/Source/WebCore/Modules/webaudio/AudioBuffer.cpp (159441 => 159442)
--- trunk/Source/WebCore/Modules/webaudio/AudioBuffer.cpp 2013-11-18 19:44:31 UTC (rev 159441)
+++ trunk/Source/WebCore/Modules/webaudio/AudioBuffer.cpp 2013-11-18 19:53:06 UTC (rev 159442)
@@ -43,7 +43,7 @@
PassRefPtr<AudioBuffer> AudioBuffer::create(unsigned numberOfChannels, size_t numberOfFrames, float sampleRate)
{
if (sampleRate < 22050 || sampleRate > 96000 || numberOfChannels > AudioContext::maxNumberOfChannels() || !numberOfFrames)
- return 0;
+ return nullptr;
return adoptRef(new AudioBuffer(numberOfChannels, numberOfFrames, sampleRate));
}
@@ -54,7 +54,7 @@
if (bus.get())
return adoptRef(new AudioBuffer(bus.get()));
- return 0;
+ return nullptr;
}
AudioBuffer::AudioBuffer(unsigned numberOfChannels, size_t numberOfFrames, float sampleRate)
@@ -96,7 +96,7 @@
{
if (channelIndex >= m_channels.size()) {
ec = SYNTAX_ERR;
- return 0;
+ return nullptr;
}
Float32Array* channelData = m_channels[channelIndex].get();
@@ -106,7 +106,7 @@
Float32Array* AudioBuffer::getChannelData(unsigned channelIndex)
{
if (channelIndex >= m_channels.size())
- return 0;
+ return nullptr;
return m_channels[channelIndex].get();
}
Modified: trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp (159441 => 159442)
--- trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp 2013-11-18 19:44:31 UTC (rev 159441)
+++ trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp 2013-11-18 19:53:06 UTC (rev 159442)
@@ -113,7 +113,7 @@
ASSERT(isMainThread());
if (s_hardwareContextCount >= MaxHardwareContexts)
- return 0;
+ return nullptr;
RefPtr<AudioContext> audioContext(adoptRef(new AudioContext(document)));
audioContext->suspendIfNeeded();
@@ -330,7 +330,7 @@
RefPtr<AudioBuffer> audioBuffer = AudioBuffer::create(numberOfChannels, numberOfFrames, sampleRate);
if (!audioBuffer.get()) {
ec = NOT_SUPPORTED_ERR;
- return 0;
+ return nullptr;
}
return audioBuffer;
@@ -341,13 +341,13 @@
ASSERT(arrayBuffer);
if (!arrayBuffer) {
ec = SYNTAX_ERR;
- return 0;
+ return nullptr;
}
RefPtr<AudioBuffer> audioBuffer = AudioBuffer::createFromAudioFileData(arrayBuffer->data(), arrayBuffer->byteLength(), mixToMono, sampleRate());
if (!audioBuffer.get()) {
ec = SYNTAX_ERR;
- return 0;
+ return nullptr;
}
return audioBuffer;
@@ -381,7 +381,7 @@
ASSERT(mediaElement);
if (!mediaElement) {
ec = INVALID_STATE_ERR;
- return 0;
+ return nullptr;
}
ASSERT(isMainThread());
@@ -390,7 +390,7 @@
// First check if this media element already has a source node.
if (mediaElement->audioSourceNode()) {
ec = INVALID_STATE_ERR;
- return 0;
+ return nullptr;
}
RefPtr<MediaElementAudioSourceNode> node = MediaElementAudioSourceNode::create(this, mediaElement);
@@ -408,7 +408,7 @@
ASSERT(mediaStream);
if (!mediaStream) {
ec = INVALID_STATE_ERR;
- return 0;
+ return nullptr;
}
ASSERT(isMainThread());
@@ -468,7 +468,7 @@
if (!node.get()) {
ec = INDEX_SIZE_ERR;
- return 0;
+ return nullptr;
}
refNode(node.get()); // context keeps reference until we stop making _javascript_ rendering callbacks
@@ -536,7 +536,7 @@
lazyInitialize();
RefPtr<DelayNode> node = DelayNode::create(this, m_destinationNode->sampleRate(), maxDelayTime, ec);
if (ec)
- return 0;
+ return nullptr;
return node;
}
@@ -555,7 +555,7 @@
if (!node.get()) {
ec = SYNTAX_ERR;
- return 0;
+ return nullptr;
}
return node;
@@ -576,7 +576,7 @@
if (!node.get()) {
ec = SYNTAX_ERR;
- return 0;
+ return nullptr;
}
return node;
@@ -602,7 +602,7 @@
if (!real || !imag || (real->length() != imag->length() || (real->length() > MaxPeriodicWaveLength) || (real->length() <= 0))) {
ec = SYNTAX_ERR;
- return 0;
+ return nullptr;
}
lazyInitialize();
Modified: trunk/Source/WebCore/Modules/webaudio/AudioNode.cpp (159441 => 159442)
--- trunk/Source/WebCore/Modules/webaudio/AudioNode.cpp 2013-11-18 19:44:31 UTC (rev 159441)
+++ trunk/Source/WebCore/Modules/webaudio/AudioNode.cpp 2013-11-18 19:53:06 UTC (rev 159442)
@@ -112,14 +112,14 @@
{
if (i < m_inputs.size())
return m_inputs[i].get();
- return 0;
+ return nullptr;
}
AudioNodeOutput* AudioNode::output(unsigned i)
{
if (i < m_outputs.size())
return m_outputs[i].get();
- return 0;
+ return nullptr;
}
void AudioNode::connect(AudioNode* destination, unsigned outputIndex, unsigned inputIndex, ExceptionCode& ec)
Modified: trunk/Source/WebCore/Modules/webaudio/ChannelMergerNode.cpp (159441 => 159442)
--- trunk/Source/WebCore/Modules/webaudio/ChannelMergerNode.cpp 2013-11-18 19:44:31 UTC (rev 159441)
+++ trunk/Source/WebCore/Modules/webaudio/ChannelMergerNode.cpp 2013-11-18 19:53:06 UTC (rev 159442)
@@ -43,7 +43,7 @@
PassRefPtr<ChannelMergerNode> ChannelMergerNode::create(AudioContext* context, float sampleRate, unsigned numberOfInputs)
{
if (!numberOfInputs || numberOfInputs > AudioContext::maxNumberOfChannels())
- return 0;
+ return nullptr;
return adoptRef(new ChannelMergerNode(context, sampleRate, numberOfInputs));
}
Modified: trunk/Source/WebCore/Modules/webaudio/ChannelSplitterNode.cpp (159441 => 159442)
--- trunk/Source/WebCore/Modules/webaudio/ChannelSplitterNode.cpp 2013-11-18 19:44:31 UTC (rev 159441)
+++ trunk/Source/WebCore/Modules/webaudio/ChannelSplitterNode.cpp 2013-11-18 19:53:06 UTC (rev 159442)
@@ -37,7 +37,7 @@
PassRefPtr<ChannelSplitterNode> ChannelSplitterNode::create(AudioContext* context, float sampleRate, unsigned numberOfOutputs)
{
if (!numberOfOutputs || numberOfOutputs > AudioContext::maxNumberOfChannels())
- return 0;
+ return nullptr;
return adoptRef(new ChannelSplitterNode(context, sampleRate, numberOfOutputs));
}
Modified: trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioSource.cpp (159441 => 159442)
--- trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioSource.cpp 2013-11-18 19:44:31 UTC (rev 159441)
+++ trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioSource.cpp 2013-11-18 19:53:06 UTC (rev 159442)
@@ -50,7 +50,7 @@
// FIXME: implement this.
// https://bugs.webkit.org/show_bug.cgi?id=122430
notImplemented();
- return 0;
+ return nullptr;
}
const MediaStreamSourceStates& MediaStreamAudioSource::states()
Modified: trunk/Source/WebCore/Modules/webaudio/OfflineAudioContext.cpp (159441 => 159442)
--- trunk/Source/WebCore/Modules/webaudio/OfflineAudioContext.cpp 2013-11-18 19:44:31 UTC (rev 159441)
+++ trunk/Source/WebCore/Modules/webaudio/OfflineAudioContext.cpp 2013-11-18 19:53:06 UTC (rev 159442)
@@ -39,14 +39,14 @@
// FIXME: add support for workers.
if (!context.isDocument()) {
ec = NOT_SUPPORTED_ERR;
- return 0;
+ return nullptr;
}
Document& document = toDocument(context);
if (numberOfChannels > 10 || !isSampleRateRangeGood(sampleRate)) {
ec = SYNTAX_ERR;
- return 0;
+ return nullptr;
}
RefPtr<OfflineAudioContext> audioContext(adoptRef(new OfflineAudioContext(document, numberOfChannels, numberOfFrames, sampleRate)));
Modified: trunk/Source/WebCore/Modules/webaudio/PeriodicWave.cpp (159441 => 159442)
--- trunk/Source/WebCore/Modules/webaudio/PeriodicWave.cpp 2013-11-18 19:44:31 UTC (rev 159441)
+++ trunk/Source/WebCore/Modules/webaudio/PeriodicWave.cpp 2013-11-18 19:53:06 UTC (rev 159442)
@@ -56,7 +56,7 @@
waveTable->createBandLimitedTables(real->data(), imag->data(), numberOfComponents);
return waveTable;
}
- return 0;
+ return nullptr;
}
PassRefPtr<PeriodicWave> PeriodicWave::createSine(float sampleRate)
Modified: trunk/Source/WebCore/Modules/webaudio/ScriptProcessorNode.cpp (159441 => 159442)
--- trunk/Source/WebCore/Modules/webaudio/ScriptProcessorNode.cpp 2013-11-18 19:44:31 UTC (rev 159441)
+++ trunk/Source/WebCore/Modules/webaudio/ScriptProcessorNode.cpp 2013-11-18 19:53:06 UTC (rev 159442)
@@ -53,17 +53,17 @@
case 16384:
break;
default:
- return 0;
+ return nullptr;
}
if (!numberOfInputChannels && !numberOfOutputChannels)
- return 0;
+ return nullptr;
if (numberOfInputChannels > AudioContext::maxNumberOfChannels())
- return 0;
+ return nullptr;
if (numberOfOutputChannels > AudioContext::maxNumberOfChannels())
- return 0;
+ return nullptr;
return adoptRef(new ScriptProcessorNode(context, sampleRate, bufferSize, numberOfInputChannels, numberOfOutputChannels));
}
