Changeset 264723 in webkit

Timestamp:

Jul 22, 2020, 1:16:00 PM (5 years ago)

Author:

ddkilzer@apple.com

Message:

Unreviewed build fix after r264710, r264719, r264721: use more HAVE_AVPLAYER_VIDEORANGEOVERRIDE.

• platform/PlatformScreen.h:
• platform/mac/PlatformScreenMac.mm:

(WebCore::collectScreenProperties):

• Guard more code with HAVE(AVPLAYER_VIDEORANGEOVERRIDE).

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/PlatformScreen.h (modified) (1 diff)
• platform/mac/PlatformScreenMac.mm (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-07-22  David Kilzer  <ddkilzer@apple.com>
+
+        Unreviewed build fix after r264710, r264719, r264721: use more HAVE_AVPLAYER_VIDEORANGEOVERRIDE.
+
+        * platform/PlatformScreen.h:
+        * platform/mac/PlatformScreenMac.mm:
+        (WebCore::collectScreenProperties):
+        - Guard more code with HAVE(AVPLAYER_VIDEORANGEOVERRIDE).
+
 2020-07-22  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Source/WebCore/platform/PlatformScreen.h

@@ -89 +89 @@
     DolbyVisionPQ,
 };
-#if PLATFORM(MAC)
+#if HAVE(AVPLAYER_VIDEORANGEOVERRIDE)
 WEBCORE_EXPORT DynamicRangeMode preferredDynamicRangeMode(Widget* = nullptr);
 #else

trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm

@@ -99 +99 @@
 }
 
+#if HAVE(AVPLAYER_VIDEORANGEOVERRIDE)
 static DynamicRangeMode convertAVVideoRangeToEnum(NSString* range)
 {
@@ -115 +116 @@
     return DynamicRangeMode::None;
 }
+#endif
 
 ScreenProperties collectScreenProperties()
@@ -141 +143 @@
         DynamicRangeMode dynamicRangeMode = DynamicRangeMode::None;
 
+#if HAVE(AVPLAYER_VIDEORANGEOVERRIDE)
         if (PAL::isAVFoundationFrameworkAvailable() && [PAL::getAVPlayerClass() respondsToSelector:@selector(preferredVideoRangeForDisplays:)]) {
             dynamicRangeMode = convertAVVideoRangeToEnum([PAL::getAVPlayerClass() preferredVideoRangeForDisplays:@[ @(displayID) ]]);
             screenSupportsHighDynamicRange = dynamicRangeMode > DynamicRangeMode::Standard;
         }
+#endif
+#if HAVE(AVPLAYER_VIDEORANGEOVERRIDE) && USE(MEDIATOOLBOX)
+        else
+#endif
 #if USE(MEDIATOOLBOX)
-        else if (PAL::isMediaToolboxFrameworkAvailable() && PAL::canLoad_MediaToolbox_MTShouldPlayHDRVideo())
+        if (PAL::isMediaToolboxFrameworkAvailable() && PAL::canLoad_MediaToolbox_MTShouldPlayHDRVideo())
             screenSupportsHighDynamicRange = PAL::softLink_MediaToolbox_MTShouldPlayHDRVideo((__bridge CFArrayRef)@[ @(displayID) ]);
 #endif
@@ -369 +376 @@
 }
 
+#if HAVE(AVPLAYER_VIDEORANGEOVERRIDE)
 DynamicRangeMode preferredDynamicRangeMode(Widget* widget)
 {
@@ -382 +390 @@
     return DynamicRangeMode::Standard;
 }
+#endif
 
 FloatRect toUserSpace(const NSRect& rect, NSWindow *destination)