Changeset 255881 in webkit

Timestamp:

Feb 5, 2020 5:03:01 PM (4 years ago)

Author:

jer.noble@apple.com

Message:

Adopt MTOverrideShouldPlayHDRVideo()
​https://bugs.webkit.org/show_bug.cgi?id=207275
<rdar://problem/58837093>

Reviewed by Eric Carlson.

Source/WebCore:

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

(WebCore::setShouldOverrideScreenSupportsHighDynamicRange):

Source/WebCore/PAL:

• pal/cocoa/MediaToolboxSoftLink.cpp:
• pal/cocoa/MediaToolboxSoftLink.h:

Source/WebKit:

The WebProcess sandbox can block access to the services necessary for MediaToolbox to determine whether
the current display is capable of displaying HDR. Rather than opening up the sandbox, provide the information
gathered by the UIProcess by way of MTOverrideShouldPlayHDRVideo().

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::windowScreenDidChange):
(WebKit::WebPage::displayID const):

• WebProcess/WebPage/WebPage.h:
• WebProcess/WebProcess.cpp:

(WebKit::WebProcess::setScreenProperties): Deleted.

• WebProcess/WebProcess.h:
• WebProcess/cocoa/WebProcessCocoa.mm:

(WebKit::WebProcess::setScreenProperties):
(WebKit::WebProcess::updatePageScreenProperties):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/PAL/ChangeLog (modified) (1 diff)
• WebCore/PAL/pal/cocoa/MediaToolboxSoftLink.cpp (modified) (1 diff)
• WebCore/PAL/pal/cocoa/MediaToolboxSoftLink.h (modified) (1 diff)
• WebCore/platform/PlatformScreen.h (modified) (2 diffs)
• WebCore/platform/mac/PlatformScreenMac.mm (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebProcess/WebPage/WebPage.cpp (modified) (1 diff)
• WebKit/WebProcess/WebProcess.cpp (modified) (1 diff)
• WebKit/WebProcess/WebProcess.h (modified) (1 diff)
• WebKit/WebProcess/cocoa/WebProcessCocoa.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-02-05  Jer Noble  <jer.noble@apple.com>
+
+        Adopt MTOverrideShouldPlayHDRVideo()
+        https://bugs.webkit.org/show_bug.cgi?id=207275
+        <rdar://problem/58837093>
+
+        Reviewed by Eric Carlson.
+
+        * platform/PlatformScreen.h:
+        * platform/mac/PlatformScreenMac.mm:
+        (WebCore::setShouldOverrideScreenSupportsHighDynamicRange):
+
 2020-02-05  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2020-02-05  Jer Noble  <jer.noble@apple.com>
+
+        Adopt MTOverrideShouldPlayHDRVideo()
+        https://bugs.webkit.org/show_bug.cgi?id=207275
+        <rdar://problem/58837093>
+
+        Reviewed by Eric Carlson.
+
+        * pal/cocoa/MediaToolboxSoftLink.cpp:
+        * pal/cocoa/MediaToolboxSoftLink.h:
+
 2020-02-05  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebCore/PAL/pal/cocoa/MediaToolboxSoftLink.cpp

@@ -34 +34 @@
 
 SOFT_LINK_FUNCTION_MAY_FAIL_FOR_SOURCE_WITH_EXPORT(PAL, MediaToolbox, MTShouldPlayHDRVideo, Boolean, (CFArrayRef displayList), (displayList), PAL_EXPORT)
+SOFT_LINK_FUNCTION_MAY_FAIL_FOR_SOURCE_WITH_EXPORT(PAL, MediaToolbox, MTOverrideShouldPlayHDRVideo, void, (Boolean override, Boolean playHDRVideo), (override, playHDRVideo), PAL_EXPORT)
 
 #endif

trunk/Source/WebCore/PAL/pal/cocoa/MediaToolboxSoftLink.h

@@ -34 +34 @@
 
 SOFT_LINK_FUNCTION_MAY_FAIL_FOR_HEADER(PAL, MediaToolbox, MTShouldPlayHDRVideo, Boolean, (CFArrayRef displayList), (displayList))
+SOFT_LINK_FUNCTION_MAY_FAIL_FOR_HEADER(PAL, MediaToolbox, MTOverrideShouldPlayHDRVideo, void, (Boolean override, Boolean playHDRVideo), (override, playHDRVideo))
 
 #endif

trunk/Source/WebCore/platform/PlatformScreen.h

@@ -77 +77 @@
 
 #if PLATFORM(MAC) || PLATFORM(IOS_FAMILY)
-bool screenSupportsHighDynamicRange(Widget* = nullptr);
+WEBCORE_EXPORT bool screenSupportsHighDynamicRange(Widget* = nullptr);
 #else
 constexpr bool screenSupportsHighDynamicRange(Widget* = nullptr) { return false; }
@@ -105 +105 @@
 WEBCORE_EXPORT ScreenProperties collectScreenProperties();
 WEBCORE_EXPORT void setScreenProperties(const ScreenProperties&);
+
+WEBCORE_EXPORT void setShouldOverrideScreenSupportsHighDynamicRange(bool shouldOverride, bool supportsHighDynamicRange);
 
 WEBCORE_EXPORT PlatformDisplayID primaryScreenDisplayID();

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

@@ -157 +157 @@
 }
 
+void setShouldOverrideScreenSupportsHighDynamicRange(bool shouldOverride, bool supportsHighDynamicRange)
+{
+    if (PAL::canLoad_MediaToolbox_MTOverrideShouldPlayHDRVideo())
+        PAL::softLink_MediaToolbox_MTOverrideShouldPlayHDRVideo(shouldOverride, supportsHighDynamicRange);
+}
+
 static ScreenData screenData(PlatformDisplayID screendisplayID)
 {

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-02-05  Jer Noble  <jer.noble@apple.com>
+
+        Adopt MTOverrideShouldPlayHDRVideo()
+        https://bugs.webkit.org/show_bug.cgi?id=207275
+        <rdar://problem/58837093>
+
+        Reviewed by Eric Carlson.
+
+        The WebProcess sandbox can block access to the services necessary for MediaToolbox to determine whether
+        the current display is capable of displaying HDR. Rather than opening up the sandbox, provide the information
+        gathered by the UIProcess by way of MTOverrideShouldPlayHDRVideo().
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::windowScreenDidChange):
+        (WebKit::WebPage::displayID const):
+        * WebProcess/WebPage/WebPage.h:
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::setScreenProperties): Deleted.
+        * WebProcess/WebProcess.h:
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        (WebKit::WebProcess::setScreenProperties):
+        (WebKit::WebProcess::updatePageScreenProperties):
+
 2020-02-05  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp

@@ -1994 +1994 @@
 {
     m_page->chrome().windowScreenDidChange(static_cast<PlatformDisplayID>(displayID));
+
+#if PLATFORM(MAC)
+    WebProcess::singleton().updatePageScreenProperties();
+#endif
 }
 

trunk/Source/WebKit/WebProcess/WebProcess.cpp

@@ -1878 +1878 @@
 #endif
 
-#if PLATFORM(MAC)
-void WebProcess::setScreenProperties(const WebCore::ScreenProperties& properties)
-{
-    WebCore::setScreenProperties(properties);
-    for (auto& page : m_pageMap.values())
-        page->screenPropertiesDidChange();
-}
-#endif
-
 #if ENABLE(MEDIA_STREAM)
 void WebProcess::addMockMediaDevice(const WebCore::MockMediaDevice& device)

trunk/Source/WebKit/WebProcess/WebProcess.h

@@ -324 +324 @@
 #endif
 
+#if PLATFORM(MAC)
+    void updatePageScreenProperties();
+#endif
+
 private:
     WebProcess();

trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm

@@ -79 +79 @@
 #import <stdio.h>
 #import <wtf/FileSystem.h>
+#import <wtf/ProcessPrivilege.h>
 #import <wtf/cocoa/NSURLExtras.h>
 
@@ -930 +931 @@
 #endif
 
+#if PLATFORM(MAC)
+void WebProcess::setScreenProperties(const ScreenProperties& properties)
+{
+    WebCore::setScreenProperties(properties);
+    for (auto& page : m_pageMap.values())
+        page->screenPropertiesDidChange();
+    updatePageScreenProperties();
+}
+
+void WebProcess::updatePageScreenProperties()
+{
+    if (hasProcessPrivilege(ProcessPrivilege::CanCommunicateWithWindowServer)) {
+        setShouldOverrideScreenSupportsHighDynamicRange(false, false);
+        return;
+    }
+
+    bool allPagesAreOnHDRScreens = allOf(m_pageMap.values(), [] (auto& page) {
+        return screenSupportsHighDynamicRange(page->mainFrameView());
+    });
+    setShouldOverrideScreenSupportsHighDynamicRange(true, allPagesAreOnHDRScreens);
+}
+#endif
+
 } // namespace WebKit