Title: [185001] tags/Safari-601.1.33.2/Source/WebCore
- Revision
- 185001
- Author
- [email protected]
- Date
- 2015-05-29 13:13:09 -0700 (Fri, 29 May 2015)
Log Message
Merged r184924. rdar://problem/21149548
Modified Paths
Diff
Modified: tags/Safari-601.1.33.2/Source/WebCore/ChangeLog (185000 => 185001)
--- tags/Safari-601.1.33.2/Source/WebCore/ChangeLog 2015-05-29 20:10:21 UTC (rev 185000)
+++ tags/Safari-601.1.33.2/Source/WebCore/ChangeLog 2015-05-29 20:13:09 UTC (rev 185001)
@@ -1,3 +1,16 @@
+2015-05-29 Babak Shafiei <[email protected]>
+
+ Merge r184924.
+
+ 2015-05-27 Daniel Bates <[email protected]>
+
+ Attempt to fix internal build following <http://trac.webkit.org/changeset/184760>
+ (https://bugs.webkit.org/show_bug.cgi?id=145289)
+
+ Reviewed by Jer Noble.
+
+ * platform/spi/mac/AVFoundationSPI.h:
+
2015-05-27 Babak Shafiei <[email protected]>
Roll out r184794.
Modified: tags/Safari-601.1.33.2/Source/WebCore/platform/spi/mac/AVFoundationSPI.h (185000 => 185001)
--- tags/Safari-601.1.33.2/Source/WebCore/platform/spi/mac/AVFoundationSPI.h 2015-05-29 20:10:21 UTC (rev 185000)
+++ tags/Safari-601.1.33.2/Source/WebCore/platform/spi/mac/AVFoundationSPI.h 2015-05-29 20:13:09 UTC (rev 185001)
@@ -53,7 +53,7 @@
#if PLATFORM(IOS)
-#if USE(APPLE_INTERNAL_SDK)
+#if HAVE(AVKIT) && USE(APPLE_INTERNAL_SDK)
#import <AVKit/AVPlayerViewController_WebKitOnly.h>
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
