Title: [256574] branches/safari-609-branch/Source

Diff

Modified: branches/safari-609-branch/Source/WebCore/ChangeLog (256573 => 256574)


--- branches/safari-609-branch/Source/WebCore/ChangeLog	2020-02-14 00:35:50 UTC (rev 256573)
+++ branches/safari-609-branch/Source/WebCore/ChangeLog	2020-02-14 00:36:09 UTC (rev 256574)
@@ -1,3 +1,7 @@
+2020-02-13  Russell Epstein  <[email protected]>
+
+        Revert r256407. rdar://problem/59299143
+
 2020-02-13  Alan Coon  <[email protected]>
 
         Cherry-pick r256564. rdar://problem/59440718

Modified: branches/safari-609-branch/Source/WebCore/PAL/ChangeLog (256573 => 256574)


--- branches/safari-609-branch/Source/WebCore/PAL/ChangeLog	2020-02-14 00:35:50 UTC (rev 256573)
+++ branches/safari-609-branch/Source/WebCore/PAL/ChangeLog	2020-02-14 00:36:09 UTC (rev 256574)
@@ -1,3 +1,7 @@
+2020-02-13  Russell Epstein  <[email protected]>
+
+        Revert r256407. rdar://problem/59299143
+
 2020-02-11  Alan Coon  <[email protected]>
 
         Cherry-pick r255881. rdar://problem/59299143

Modified: branches/safari-609-branch/Source/WebCore/PAL/pal/cocoa/MediaToolboxSoftLink.cpp (256573 => 256574)


--- branches/safari-609-branch/Source/WebCore/PAL/pal/cocoa/MediaToolboxSoftLink.cpp	2020-02-14 00:35:50 UTC (rev 256573)
+++ branches/safari-609-branch/Source/WebCore/PAL/pal/cocoa/MediaToolboxSoftLink.cpp	2020-02-14 00:36:09 UTC (rev 256574)
@@ -33,6 +33,5 @@
 SOFT_LINK_FRAMEWORK_FOR_SOURCE_WITH_EXPORT(PAL, MediaToolbox, PAL_EXPORT)
 
 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

Modified: branches/safari-609-branch/Source/WebCore/PAL/pal/cocoa/MediaToolboxSoftLink.h (256573 => 256574)


--- branches/safari-609-branch/Source/WebCore/PAL/pal/cocoa/MediaToolboxSoftLink.h	2020-02-14 00:35:50 UTC (rev 256573)
+++ branches/safari-609-branch/Source/WebCore/PAL/pal/cocoa/MediaToolboxSoftLink.h	2020-02-14 00:36:09 UTC (rev 256574)
@@ -33,6 +33,5 @@
 SOFT_LINK_FRAMEWORK_FOR_HEADER(PAL, MediaToolbox)
 
 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

Modified: branches/safari-609-branch/Source/WebCore/platform/PlatformScreen.h (256573 => 256574)


--- branches/safari-609-branch/Source/WebCore/platform/PlatformScreen.h	2020-02-14 00:35:50 UTC (rev 256573)
+++ branches/safari-609-branch/Source/WebCore/platform/PlatformScreen.h	2020-02-14 00:36:09 UTC (rev 256574)
@@ -76,7 +76,7 @@
 WEBCORE_EXPORT bool screenSupportsExtendedColor(Widget* = nullptr);
 
 #if PLATFORM(MAC) || PLATFORM(IOS_FAMILY)
-WEBCORE_EXPORT bool screenSupportsHighDynamicRange(Widget* = nullptr);
+bool screenSupportsHighDynamicRange(Widget* = nullptr);
 #else
 constexpr bool screenSupportsHighDynamicRange(Widget* = nullptr) { return false; }
 #endif
@@ -105,8 +105,6 @@
 WEBCORE_EXPORT ScreenProperties collectScreenProperties();
 WEBCORE_EXPORT void setScreenProperties(const ScreenProperties&);
 
-WEBCORE_EXPORT void setShouldOverrideScreenSupportsHighDynamicRange(bool shouldOverride, bool supportsHighDynamicRange);
-
 WEBCORE_EXPORT PlatformDisplayID primaryScreenDisplayID();
 
 uint32_t primaryOpenGLDisplayMask();

Modified: branches/safari-609-branch/Source/WebCore/platform/mac/PlatformScreenMac.mm (256573 => 256574)


--- branches/safari-609-branch/Source/WebCore/platform/mac/PlatformScreenMac.mm	2020-02-14 00:35:50 UTC (rev 256573)
+++ branches/safari-609-branch/Source/WebCore/platform/mac/PlatformScreenMac.mm	2020-02-14 00:36:09 UTC (rev 256574)
@@ -156,12 +156,6 @@
     screenProperties() = properties;
 }
 
-void setShouldOverrideScreenSupportsHighDynamicRange(bool shouldOverride, bool supportsHighDynamicRange)
-{
-    if (PAL::canLoad_MediaToolbox_MTOverrideShouldPlayHDRVideo())
-        PAL::softLink_MediaToolbox_MTOverrideShouldPlayHDRVideo(shouldOverride, supportsHighDynamicRange);
-}
-
 static ScreenData screenData(PlatformDisplayID screendisplayID)
 {
     RELEASE_ASSERT(!screenProperties().screenDataMap.isEmpty());

Modified: branches/safari-609-branch/Source/WebKit/ChangeLog (256573 => 256574)


--- branches/safari-609-branch/Source/WebKit/ChangeLog	2020-02-14 00:35:50 UTC (rev 256573)
+++ branches/safari-609-branch/Source/WebKit/ChangeLog	2020-02-14 00:36:09 UTC (rev 256574)
@@ -1,5 +1,9 @@
 2020-02-13  Russell Epstein  <[email protected]>
 
+        Revert r256407. rdar://problem/59299143
+
+2020-02-13  Russell Epstein  <[email protected]>
+
         Cherry-pick r256520. rdar://problem/59430255
 
     [iOS] -updateSelectionWithExtentPoint:completionHandler: should work without requiring floating cursor

Modified: branches/safari-609-branch/Source/WebKit/WebProcess/WebPage/WebPage.cpp (256573 => 256574)


--- branches/safari-609-branch/Source/WebKit/WebProcess/WebPage/WebPage.cpp	2020-02-14 00:35:50 UTC (rev 256573)
+++ branches/safari-609-branch/Source/WebKit/WebProcess/WebPage/WebPage.cpp	2020-02-14 00:36:09 UTC (rev 256574)
@@ -1963,10 +1963,6 @@
 void WebPage::windowScreenDidChange(uint32_t displayID)
 {
     m_page->chrome().windowScreenDidChange(static_cast<PlatformDisplayID>(displayID));
-
-#if PLATFORM(MAC)
-    WebProcess::singleton().updatePageScreenProperties();
-#endif
 }
 
 void WebPage::scalePage(double scale, const IntPoint& origin)

Modified: branches/safari-609-branch/Source/WebKit/WebProcess/WebProcess.cpp (256573 => 256574)


--- branches/safari-609-branch/Source/WebKit/WebProcess/WebProcess.cpp	2020-02-14 00:35:50 UTC (rev 256573)
+++ branches/safari-609-branch/Source/WebKit/WebProcess/WebProcess.cpp	2020-02-14 00:36:09 UTC (rev 256574)
@@ -1872,6 +1872,15 @@
 }
 #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)
 {

Modified: branches/safari-609-branch/Source/WebKit/WebProcess/WebProcess.h (256573 => 256574)


--- branches/safari-609-branch/Source/WebKit/WebProcess/WebProcess.h	2020-02-14 00:35:50 UTC (rev 256573)
+++ branches/safari-609-branch/Source/WebKit/WebProcess/WebProcess.h	2020-02-14 00:36:09 UTC (rev 256574)
@@ -313,10 +313,6 @@
     bool removeServiceWorkerRegistration(WebCore::ServiceWorkerRegistrationIdentifier);
 #endif
 
-#if PLATFORM(MAC)
-    void updatePageScreenProperties();
-#endif
-
 private:
     WebProcess();
     ~WebProcess();

Modified: branches/safari-609-branch/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (256573 => 256574)


--- branches/safari-609-branch/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm	2020-02-14 00:35:50 UTC (rev 256573)
+++ branches/safari-609-branch/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm	2020-02-14 00:36:09 UTC (rev 256574)
@@ -77,7 +77,6 @@
 #import <pal/spi/mac/NSApplicationSPI.h>
 #import <stdio.h>
 #import <wtf/FileSystem.h>
-#import <wtf/ProcessPrivilege.h>
 #import <wtf/cocoa/NSURLExtras.h>
 
 #if PLATFORM(IOS)
@@ -892,29 +891,6 @@
     AVAssetMIMETypeCache::singleton().addSupportedTypes(types);
 }
 
-#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
 
 #undef RELEASE_LOG_SESSION_ID
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to