Title: [249144] branches/safari-608-branch/Source/WebCore
- Revision
- 249144
- Author
- [email protected]
- Date
- 2019-08-27 09:19:29 -0700 (Tue, 27 Aug 2019)
Log Message
Cherry-pick r248886. rdar://problem/54365278
Source/WebCore:
[Cocoa] Fix misspelling of -preventsDisplaySleepForVideoPlayback
https://bugs.webkit.org/show_bug.cgi?id=200774
<rdar://problem/54321071>
Reviewed by Eric Carlson.
Only declare the API on platforms where that API is undefined, so as
to catch this kind of misspelling at compile time.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::ensureLayer):
Source/WebCore/PAL:
[Cocoa] Adopt -preventDisplaySleepForVideoPlayback
https://bugs.webkit.org/show_bug.cgi?id=200774
<rdar://problem/54321071>
Reviewed by Eric Carlson.
* pal/spi/mac/AVFoundationSPI.h:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@248886 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-608-branch/Source/WebCore/ChangeLog (249143 => 249144)
--- branches/safari-608-branch/Source/WebCore/ChangeLog 2019-08-27 16:16:17 UTC (rev 249143)
+++ branches/safari-608-branch/Source/WebCore/ChangeLog 2019-08-27 16:19:29 UTC (rev 249144)
@@ -1,3 +1,46 @@
+2019-08-27 Alan Coon <[email protected]>
+
+ Cherry-pick r248886. rdar://problem/54365278
+
+ Source/WebCore:
+ [Cocoa] Fix misspelling of -preventsDisplaySleepForVideoPlayback
+ https://bugs.webkit.org/show_bug.cgi?id=200774
+ <rdar://problem/54321071>
+
+ Reviewed by Eric Carlson.
+
+ Only declare the API on platforms where that API is undefined, so as
+ to catch this kind of misspelling at compile time.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::ensureLayer):
+
+ Source/WebCore/PAL:
+ [Cocoa] Adopt -preventDisplaySleepForVideoPlayback
+ https://bugs.webkit.org/show_bug.cgi?id=200774
+ <rdar://problem/54321071>
+
+ Reviewed by Eric Carlson.
+
+ * pal/spi/mac/AVFoundationSPI.h:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@248886 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-08-19 Jer Noble <[email protected]>
+
+ [Cocoa] Fix misspelling of -preventsDisplaySleepForVideoPlayback
+ https://bugs.webkit.org/show_bug.cgi?id=200774
+ <rdar://problem/54321071>
+
+ Reviewed by Eric Carlson.
+
+ Only declare the API on platforms where that API is undefined, so as
+ to catch this kind of misspelling at compile time.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::ensureLayer):
+
2019-08-23 Kocsen Chung <[email protected]>
Cherry-pick r248969. rdar://problem/54643450
Modified: branches/safari-608-branch/Source/WebCore/PAL/ChangeLog (249143 => 249144)
--- branches/safari-608-branch/Source/WebCore/PAL/ChangeLog 2019-08-27 16:16:17 UTC (rev 249143)
+++ branches/safari-608-branch/Source/WebCore/PAL/ChangeLog 2019-08-27 16:19:29 UTC (rev 249144)
@@ -1,3 +1,42 @@
+2019-08-27 Alan Coon <[email protected]>
+
+ Cherry-pick r248886. rdar://problem/54365278
+
+ Source/WebCore:
+ [Cocoa] Fix misspelling of -preventsDisplaySleepForVideoPlayback
+ https://bugs.webkit.org/show_bug.cgi?id=200774
+ <rdar://problem/54321071>
+
+ Reviewed by Eric Carlson.
+
+ Only declare the API on platforms where that API is undefined, so as
+ to catch this kind of misspelling at compile time.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::ensureLayer):
+
+ Source/WebCore/PAL:
+ [Cocoa] Adopt -preventDisplaySleepForVideoPlayback
+ https://bugs.webkit.org/show_bug.cgi?id=200774
+ <rdar://problem/54321071>
+
+ Reviewed by Eric Carlson.
+
+ * pal/spi/mac/AVFoundationSPI.h:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@248886 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-08-19 Jer Noble <[email protected]>
+
+ [Cocoa] Adopt -preventDisplaySleepForVideoPlayback
+ https://bugs.webkit.org/show_bug.cgi?id=200774
+ <rdar://problem/54321071>
+
+ Reviewed by Eric Carlson.
+
+ * pal/spi/mac/AVFoundationSPI.h:
+
2019-08-12 Alan Coon <[email protected]>
Cherry-pick r248081. rdar://problem/54223700
Modified: branches/safari-608-branch/Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h (249143 => 249144)
--- branches/safari-608-branch/Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h 2019-08-27 16:16:17 UTC (rev 249143)
+++ branches/safari-608-branch/Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h 2019-08-27 16:19:29 UTC (rev 249144)
@@ -317,6 +317,12 @@
@end
#endif
+#if !USE(APPLE_INTERNAL_SDK) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101500) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MAX_ALLOWED < 130000)
+@interface AVSampleBufferDisplayLayer (WebCorePrivate)
+@property (assign, nonatomic) BOOL preventsDisplaySleepDuringVideoPlayback;
+@end
+#endif
+
#if !USE(APPLE_INTERNAL_SDK) && PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR) && !PLATFORM(MACCATALYST)
#import <AVFoundation/AVAudioSession.h>
Modified: branches/safari-608-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (249143 => 249144)
--- branches/safari-608-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2019-08-27 16:16:17 UTC (rev 249143)
+++ branches/safari-608-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2019-08-27 16:19:29 UTC (rev 249144)
@@ -65,10 +65,6 @@
- (instancetype)initWithStorageDirectoryAtURL:(NSURL *)storageDirectory;
@end
-@interface AVSampleBufferDisplayLayer (WebCorePrivate)
-@property (assign, nonatomic) BOOL preventDisplaySleepForVideoPlayback;
-@end
-
namespace WebCore {
using namespace PAL;
@@ -762,8 +758,8 @@
return;
}
- if ([m_sampleBufferDisplayLayer respondsToSelector:@selector(setPreventDisplaySleepForVideoPlayback:)])
- m_sampleBufferDisplayLayer.get().preventDisplaySleepForVideoPlayback = NO;
+ if ([m_sampleBufferDisplayLayer respondsToSelector:@selector(setPreventsDisplaySleepDuringVideoPlayback:)])
+ m_sampleBufferDisplayLayer.get().preventsDisplaySleepDuringVideoPlayback = NO;
[m_synchronizer addRenderer:m_sampleBufferDisplayLayer.get()];
if (m_mediaSourcePrivate)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
