Title: [208243] branches/safari-602-branch/Source/WebCore
- Revision
- 208243
- Author
- matthew_han...@apple.com
- Date
- 2016-11-01 14:46:37 -0700 (Tue, 01 Nov 2016)
Log Message
Merge r208161. rdar://problem/29032335
Modified Paths
Diff
Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (208242 => 208243)
--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-11-01 21:43:55 UTC (rev 208242)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-11-01 21:46:37 UTC (rev 208243)
@@ -1,5 +1,18 @@
2016-11-01 Matthew Hanson <matthew_han...@apple.com>
+ Merge r208161. rdar://problem/29032335
+
+ 2016-10-31 Jer Noble <jer.no...@apple.com>
+
+ Unreviewed build fix after r208151; _setPreventsSleepDuringVideoPlayback: only defined in non-simulator SDKs.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayer):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::setShouldDisableSleep):
+ * platform/spi/mac/AVFoundationSPI.h:
+
+2016-11-01 Matthew Hanson <matthew_han...@apple.com>
+
Merge r206637. rdar://problem/28718754
2016-09-30 Said Abou-Hallawa <sabouhall...@apple.com>
Modified: branches/safari-602-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (208242 => 208243)
--- branches/safari-602-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2016-11-01 21:43:55 UTC (rev 208242)
+++ branches/safari-602-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2016-11-01 21:46:37 UTC (rev 208243)
@@ -1050,7 +1050,7 @@
}
#endif
-#if PLATFORM(IOS)
+#if PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR)
setShouldDisableSleep(player()->shouldDisableSleep());
#endif
@@ -3268,7 +3268,7 @@
void MediaPlayerPrivateAVFoundationObjC::setShouldDisableSleep(bool flag)
{
-#if PLATFORM(IOS)
+#if PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR)
if (m_avPlayer && [m_avPlayer respondsToSelector:@selector(_setPreventsSleepDuringVideoPlayback:)])
[m_avPlayer _setPreventsSleepDuringVideoPlayback:flag];
#else
Modified: branches/safari-602-branch/Source/WebCore/platform/spi/mac/AVFoundationSPI.h (208242 => 208243)
--- branches/safari-602-branch/Source/WebCore/platform/spi/mac/AVFoundationSPI.h 2016-11-01 21:43:55 UTC (rev 208242)
+++ branches/safari-602-branch/Source/WebCore/platform/spi/mac/AVFoundationSPI.h 2016-11-01 21:46:37 UTC (rev 208243)
@@ -82,12 +82,12 @@
@end
NS_ASSUME_NONNULL_END
-#if PLATFORM(IOS)
+#if PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR)
@interface AVPlayer (AVPlayerVideoSleepPrevention)
@property (nonatomic, getter=_preventsSleepDuringVideoPlayback, setter=_setPreventsSleepDuringVideoPlayback:) BOOL preventsSleepDuringVideoPlayback;
@end
-#endif // PLATFORM(IOS)
+#endif // PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR)
#if !PLATFORM(IOS)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
