Changeset 248886 in webkit

Timestamp:

Aug 19, 2019, 7:16:43 PM (7 years ago)

Author:

jer.noble@apple.com

Message:

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:

Location:

trunk/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)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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-19  Justin Fan  <justin_fan@apple.com>
 

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+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-19  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h

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

trunk/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()];