Changeset 249144 in webkit

Timestamp:

Aug 27, 2019, 9:19:29 AM (7 years ago)

Author:

Alan Coon

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

Location:

branches/safari-608-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• PAL/ChangeLog (modified) (1 diff)
• PAL/pal/spi/mac/AVFoundationSPI.h (modified) (1 diff)
• platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (modified) (2 diffs)

branches/safari-608-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-27  Alan Coon  <alancoon@apple.com>
+
+        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  <jer.noble@apple.com>
+
+            [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  <kocsen_chung@apple.com>
 

branches/safari-608-branch/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2019-08-27  Alan Coon  <alancoon@apple.com>
+
+        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  <jer.noble@apple.com>
+
+            [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  <alancoon@apple.com>
 

branches/safari-608-branch/Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h

@@ -318 +318 @@
 #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>

branches/safari-608-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm

@@ -66 +66 @@
 @end
 
-@interface AVSampleBufferDisplayLayer (WebCorePrivate)
-@property (assign, nonatomic) BOOL preventDisplaySleepForVideoPlayback;
-@end
-
 namespace WebCore {
 using namespace PAL;
@@ -763 +759 @@
     }
 
-    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()];