Changeset 86633 in webkit


Ignore:
Timestamp:
May 16, 2011 4:36:22 PM (13 years ago)
Author:
crogers@google.com
Message:

2011-05-16 Chris Rogers <crogers@google.com>

Unreviewed build fix.

Just return "nullptr" to fix compile errors
https://bugs.webkit.org/show_bug.cgi?id=60932

  • platform/audio/mac/AudioBusMac.mm: (WebCore::AudioBus::loadPlatformResource):
  • platform/audio/mac/AudioFileReaderMac.cpp: (WebCore::AudioFileReader::createBus):
Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r86632 r86633  
     12011-05-16  Chris Rogers  <crogers@google.com>
     2
     3        Unreviewed build fix.
     4
     5        Just return "nullptr" to fix compile errors
     6        https://bugs.webkit.org/show_bug.cgi?id=60932
     7
     8        * platform/audio/mac/AudioBusMac.mm:
     9        (WebCore::AudioBus::loadPlatformResource):
     10        * platform/audio/mac/AudioFileReaderMac.cpp:
     11        (WebCore::AudioFileReader::createBus):
     12
    1132011-05-16  Emil A Eklund  <eae@chromium.org>
    214
  • trunk/Source/WebCore/platform/audio/mac/AudioBusMac.mm

    r86630 r86633  
    5959    ASSERT_NOT_REACHED();
    6060    [pool release];
    61     return adoptPtr(static_cast<AudioBus*>(0));
     61    return nullptr;
    6262}
    6363
  • trunk/Source/WebCore/platform/audio/mac/AudioFileReaderMac.cpp

    r86630 r86633  
    139139{
    140140    if (!m_extAudioFileRef)
    141         return adoptPtr(static_cast<AudioBus*>(0));
     141        return nullptr;
    142142
    143143    // Get file's data format
     
    145145    OSStatus result = ExtAudioFileGetProperty(m_extAudioFileRef, kExtAudioFileProperty_FileDataFormat, &size, &m_fileDataFormat);
    146146    if (result != noErr)
    147         return adoptPtr(static_cast<AudioBus*>(0));
     147        return nullptr;
    148148
    149149    // Number of channels
     
    155155    result = ExtAudioFileGetProperty(m_extAudioFileRef, kExtAudioFileProperty_FileLengthFrames, &size, &numberOfFrames64);
    156156    if (result != noErr)
    157         return adoptPtr(static_cast<AudioBus*>(0));
     157        return nullptr;
    158158
    159159    // Sample-rate
     
    178178    result = ExtAudioFileSetProperty(m_extAudioFileRef, kExtAudioFileProperty_ClientDataFormat, sizeof(AudioStreamBasicDescription), &m_clientDataFormat);
    179179    if (result != noErr)
    180         return adoptPtr(static_cast<AudioBus*>(0));
     180        return nullptr;
    181181
    182182    // Change numberOfFrames64 to destination sample-rate
     
    227227    result = ExtAudioFileRead(m_extAudioFileRef, &framesToRead, bufferList);
    228228    if (result != noErr)
    229         return adoptPtr(static_cast<AudioBus*>(0));
     229        return nullptr;
    230230
    231231    if (mixToMono && numberOfChannels == 2) {
Note: See TracChangeset for help on using the changeset viewer.