2011-05-10 Ilya Tikhonovsky <loislo@chromium.org>
authorloislo@chromium.org <loislo@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 11 May 2011 06:07:37 +0000 (06:07 +0000)
committerloislo@chromium.org <loislo@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 11 May 2011 06:07:37 +0000 (06:07 +0000)
        Unreviewed buildfix for strict OwnPtr patch.

        * src/PlatformBridge.cpp:
        (WebCore::PlatformBridge::loadPlatformAudioResource):
        (WebCore::PlatformBridge::decodeAudioFileData):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@86218 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/src/PlatformBridge.cpp

index 1d8482b8a2be0fa9339dcbb1f2410fc1318fe9c4..302aff8cae3fcca4038c46ab034aac21e84f7105 100644 (file)
@@ -1,3 +1,11 @@
+2011-05-10  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Unreviewed buildfix for strict OwnPtr patch.
+
+        * src/PlatformBridge.cpp:
+        (WebCore::PlatformBridge::loadPlatformAudioResource):
+        (WebCore::PlatformBridge::decodeAudioFileData):
+
 2011-05-06  Brett Wilson  <brettw@chromium.org>
 
         Reviewed by Adam Barth.
index a997b64080c81072ab36181cb5dfb493bf9f6498..b07bf43c536bd52601afeb404b67439baacca606 100644 (file)
@@ -620,7 +620,7 @@ PassOwnPtr<AudioBus> PlatformBridge::loadPlatformAudioResource(const char* name,
 {
     const WebData& resource = webKitClient()->loadResource(name);
     if (resource.isEmpty())
-        return 0;
+        return nullptr;
     
     return decodeAudioFileData(resource.data(), resource.size(), sampleRate);
 }
@@ -630,7 +630,7 @@ PassOwnPtr<AudioBus> PlatformBridge::decodeAudioFileData(const char* data, size_
     WebAudioBus webAudioBus;
     if (webKitClient()->loadAudioResource(&webAudioBus, data, size, sampleRate))
         return webAudioBus.release();
-    return 0;
+    return nullptr;
 }
 
 #endif // ENABLE(WEB_AUDIO)