[webkit-changes] [106996] trunk/Source/WebCore

Tue, 07 Feb 2012 15:12:40 -0800

Title: [106996] trunk/Source/WebCore
Revision
106996
Author
jer.no...@apple.com
Date
2012-02-07 15:12:27 -0800 (Tue, 07 Feb 2012)

Log Message

Unreviewed build fix; make OSStatus the explicit return type for CMTimebase functions.

* platform/mac/PlatformClockCM.mm:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (106995 => 106996)


--- trunk/Source/WebCore/ChangeLog	2012-02-07 23:07:47 UTC (rev 106995)
+++ trunk/Source/WebCore/ChangeLog	2012-02-07 23:12:27 UTC (rev 106996)
@@ -1,3 +1,9 @@
+2012-02-07  Jer Noble  <jer.no...@apple.com>
+
+        Unreviewed build fix; make OSStatus the explicit return type for CMTimebase functions.
+
+        * platform/mac/PlatformClockCM.mm:
+
 2012-02-07  James Robinson  <jam...@chromium.org>
 
         [chromium] Allow retaining texture across frames in composited video playback and correctly handle lost context

Modified: trunk/Source/WebCore/platform/mac/PlatformClockCM.mm (106995 => 106996)


--- trunk/Source/WebCore/platform/mac/PlatformClockCM.mm	2012-02-07 23:07:47 UTC (rev 106995)
+++ trunk/Source/WebCore/platform/mac/PlatformClockCM.mm	2012-02-07 23:12:27 UTC (rev 106996)
@@ -35,11 +35,11 @@
 
 SOFT_LINK_FRAMEWORK_OPTIONAL(CoreMedia)
 
-SOFT_LINK(CoreMedia, CMAudioDeviceClockCreate, int32_t, (CFAllocatorRef allocator, CFStringRef deviceUID, CMClockRef *clockOut), (allocator, deviceUID, clockOut))
-SOFT_LINK(CoreMedia, CMTimebaseCreateWithMasterClock, int32_t, (CFAllocatorRef allocator, CMClockRef masterClock, CMTimebaseRef *timebaseOut), (allocator, masterClock, timebaseOut))
-SOFT_LINK(CoreMedia, CMTimebaseSetTime, int32_t, (CMTimebaseRef timebase, CMTime time), (timebase, time))
+SOFT_LINK(CoreMedia, CMAudioDeviceClockCreate, OSStatus, (CFAllocatorRef allocator, CFStringRef deviceUID, CMClockRef *clockOut), (allocator, deviceUID, clockOut))
+SOFT_LINK(CoreMedia, CMTimebaseCreateWithMasterClock, OSStatus, (CFAllocatorRef allocator, CMClockRef masterClock, CMTimebaseRef *timebaseOut), (allocator, masterClock, timebaseOut))
+SOFT_LINK(CoreMedia, CMTimebaseSetTime, OSStatus, (CMTimebaseRef timebase, CMTime time), (timebase, time))
 SOFT_LINK(CoreMedia, CMTimebaseGetTime, CMTime, (CMTimebaseRef timebase), (timebase))
-SOFT_LINK(CoreMedia, CMTimebaseSetRate, int32_t, (CMTimebaseRef timebase, Float64 rate), (timebase, rate))
+SOFT_LINK(CoreMedia, CMTimebaseSetRate, OSStatus, (CMTimebaseRef timebase, Float64 rate), (timebase, rate))
 SOFT_LINK(CoreMedia, CMTimeMakeWithSeconds, CMTime, (Float64 seconds, int32_t preferredTimeScale), (seconds, preferredTimeScale))
 SOFT_LINK(CoreMedia, CMTimeGetSeconds, Float64, (CMTime time), (time))
 

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to