Title: [210264] tags/Safari-604.1.1.2/Source/WebCore
- Revision
- 210264
- Author
- [email protected]
- Date
- 2017-01-03 18:10:55 -0800 (Tue, 03 Jan 2017)
Log Message
Merged r210248. rdar://problem/29782862
Modified Paths
Diff
Modified: tags/Safari-604.1.1.2/Source/WebCore/ChangeLog (210263 => 210264)
--- tags/Safari-604.1.1.2/Source/WebCore/ChangeLog 2017-01-04 02:09:58 UTC (rev 210263)
+++ tags/Safari-604.1.1.2/Source/WebCore/ChangeLog 2017-01-04 02:10:55 UTC (rev 210264)
@@ -1,3 +1,19 @@
+2017-01-03 Babak Shafiei <[email protected]>
+
+ Merge r210248.
+
+ 2017-01-03 Jer Noble <[email protected]>
+
+ Check for the existence of AVSampleBufferAudioRenderer.h before redeclaring AVSampleBufferAudioRenderer
+ https://bugs.webkit.org/show_bug.cgi?id=166421
+ <rdar://problem/29782862>
+
+ Reviewed by Dan Bernstein.
+
+ Follow up after r210099; fix the __has_include directive to include the framework and fix the #import inside #if.
+
+ * platform/spi/mac/AVFoundationSPI.h:
+
2016-12-22 Babak Shafiei <[email protected]>
Merge r210099.
Modified: tags/Safari-604.1.1.2/Source/WebCore/platform/spi/mac/AVFoundationSPI.h (210263 => 210264)
--- tags/Safari-604.1.1.2/Source/WebCore/platform/spi/mac/AVFoundationSPI.h 2017-01-04 02:09:58 UTC (rev 210263)
+++ tags/Safari-604.1.1.2/Source/WebCore/platform/spi/mac/AVFoundationSPI.h 2017-01-04 02:10:55 UTC (rev 210264)
@@ -180,8 +180,8 @@
NS_ASSUME_NONNULL_END
-#if __has_include("AVSampleBufferAudioRenderer.h")
-#import ("AVSampleBufferAudioRenderer")
+#if __has_include(<AVFoundation/AVSampleBufferAudioRenderer.h>)
+#import <AVFoundation/AVSampleBufferAudioRenderer.h>
#else
NS_ASSUME_NONNULL_BEGIN
@@ -199,6 +199,6 @@
@property (nonatomic, copy) NSString *audioTimePitchAlgorithm;
@end
-#endif // __has_include("AVSampleBufferAudioRenderer.h")
+NS_ASSUME_NONNULL_END
-NS_ASSUME_NONNULL_END
+#endif // __has_include(<AVFoundation/AVSampleBufferAudioRenderer.h>)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
