Title: [104863] trunk/Source/WebCore
- Revision
- 104863
- Author
- jer.no...@apple.com
- Date
- 2012-01-12 14:54:55 -0800 (Thu, 12 Jan 2012)
Log Message
Unreviewed build fix after r104858.
NSDataReadingMappedIfSafe is not defined on <= 10.6. Use NSDataReadingMapped on that platform instead.
* platform/audio/mac/AudioBusMac.mm:
(WebCore::AudioBus::loadPlatformResource):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (104862 => 104863)
--- trunk/Source/WebCore/ChangeLog 2012-01-12 22:53:16 UTC (rev 104862)
+++ trunk/Source/WebCore/ChangeLog 2012-01-12 22:54:55 UTC (rev 104863)
@@ -1,3 +1,12 @@
+2012-01-12 Jer Noble <jer.no...@apple.com>
+
+ Unreviewed build fix after r104858.
+
+ NSDataReadingMappedIfSafe is not defined on <= 10.6. Use NSDataReadingMapped on that platform instead.
+
+ * platform/audio/mac/AudioBusMac.mm:
+ (WebCore::AudioBus::loadPlatformResource):
+
2012-01-12 Dana Jansens <dan...@chromium.org>
[skia] Track a simple opaque area when painting via PlatformContextSkia and save in LayerTextureUpdater
Modified: trunk/Source/WebCore/platform/audio/mac/AudioBusMac.mm (104862 => 104863)
--- trunk/Source/WebCore/platform/audio/mac/AudioBusMac.mm 2012-01-12 22:53:16 UTC (rev 104862)
+++ trunk/Source/WebCore/platform/audio/mac/AudioBusMac.mm 2012-01-12 22:54:55 UTC (rev 104863)
@@ -48,7 +48,12 @@
NSBundle *bundle = [NSBundle bundleForClass:[WebCoreAudioBundleClass class]];
NSURL *audioFileURL = [bundle URLForResource:[NSString stringWithUTF8String:name] withExtension:@"wav" subdirectory:@"audio"];
- NSData *audioData = [NSData dataWithContentsOfURL:audioFileURL options:NSDataReadingMappedIfSafe error:nil];
+#if defined(BUILDING_ON_SNOW_LEOPARD)
+ NSDataReadingOptions options = NSDataReadingMapped;
+#else
+ NSDataReadingOptions options = NSDataReadingMappedIfSafe;
+#endif
+ NSData *audioData = [NSData dataWithContentsOfURL:audioFileURL options:options error:nil];
if (audioData) {
OwnPtr<AudioBus> bus(createBusFromInMemoryAudioFile([audioData bytes], [audioData length], false, sampleRate));
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
