Title: [184830] branches/safari-601.1.32.2-branch/Source/WebCore
- Revision
- 184830
- Author
- [email protected]
- Date
- 2015-05-23 14:04:17 -0700 (Sat, 23 May 2015)
Log Message
Merge patch for rdar://problem/21084541.
Modified Paths
Diff
Modified: branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog (184829 => 184830)
--- branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog 2015-05-23 19:28:31 UTC (rev 184829)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog 2015-05-23 21:04:17 UTC (rev 184830)
@@ -1,3 +1,13 @@
+2015-05-23 Babak Shafiei <[email protected]>
+
+ Merge patch for rdar://problem/21084541.
+
+ 2015-05-22 Jer Noble <[email protected]>
+
+ Unreviewed build fix; Make sure to include the correct private header when building with internal SDKs.
+
+ * platform/spi/mac/AVFoundationSPI.h:
+
2015-05-22 Babak Shafiei <[email protected]>
Merge r184760.
Modified: branches/safari-601.1.32.2-branch/Source/WebCore/platform/spi/mac/AVFoundationSPI.h (184829 => 184830)
--- branches/safari-601.1.32.2-branch/Source/WebCore/platform/spi/mac/AVFoundationSPI.h 2015-05-23 19:28:31 UTC (rev 184829)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/platform/spi/mac/AVFoundationSPI.h 2015-05-23 21:04:17 UTC (rev 184830)
@@ -55,7 +55,8 @@
#if USE(APPLE_INTERNAL_SDK)
#import <AVKit/AVPlayerViewController_WebKitOnly.h>
-#endif
+#import <AVFoundation/AVPlayerLayer_Private.h>
+#else
#import <AVFoundation/AVPlayerLayer.h>
@@ -65,3 +66,5 @@
#endif
+#endif
+
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
