Title: [256984] branches/safari-609.1.20.1-branch/Source/WebCore
Revision
256984
Author
repst...@apple.com
Date
2020-02-19 15:38:53 -0800 (Wed, 19 Feb 2020)

Log Message

Cherry-pick r256584. rdar://problem/59576819

    MediaToolbox may not be available; check before calling MTOverrideShouldPlayHDRVideo()
    https://bugs.webkit.org/show_bug.cgi?id=207733
    <rdar://problem/59441647>

    Reviewed by Maciej Stachowiak.

    * platform/mac/PlatformScreenMac.mm:
    (WebCore::setShouldOverrideScreenSupportsHighDynamicRange):

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@256584 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-609.1.20.1-branch/Source/WebCore/ChangeLog (256983 => 256984)


--- branches/safari-609.1.20.1-branch/Source/WebCore/ChangeLog	2020-02-19 23:38:48 UTC (rev 256983)
+++ branches/safari-609.1.20.1-branch/Source/WebCore/ChangeLog	2020-02-19 23:38:53 UTC (rev 256984)
@@ -1,5 +1,32 @@
 2020-02-19  Alan Coon  <alanc...@apple.com>
 
+        Cherry-pick r256584. rdar://problem/59576819
+
+    MediaToolbox may not be available; check before calling MTOverrideShouldPlayHDRVideo()
+    https://bugs.webkit.org/show_bug.cgi?id=207733
+    <rdar://problem/59441647>
+    
+    Reviewed by Maciej Stachowiak.
+    
+    * platform/mac/PlatformScreenMac.mm:
+    (WebCore::setShouldOverrideScreenSupportsHighDynamicRange):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@256584 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-02-13  Jer Noble  <jer.no...@apple.com>
+
+            MediaToolbox may not be available; check before calling MTOverrideShouldPlayHDRVideo()
+            https://bugs.webkit.org/show_bug.cgi?id=207733
+            <rdar://problem/59441647>
+
+            Reviewed by Maciej Stachowiak.
+
+            * platform/mac/PlatformScreenMac.mm:
+            (WebCore::setShouldOverrideScreenSupportsHighDynamicRange):
+
+2020-02-19  Alan Coon  <alanc...@apple.com>
+
         Cherry-pick r255881. rdar://problem/59576819
 
     Adopt MTOverrideShouldPlayHDRVideo()

Modified: branches/safari-609.1.20.1-branch/Source/WebCore/platform/mac/PlatformScreenMac.mm (256983 => 256984)


--- branches/safari-609.1.20.1-branch/Source/WebCore/platform/mac/PlatformScreenMac.mm	2020-02-19 23:38:48 UTC (rev 256983)
+++ branches/safari-609.1.20.1-branch/Source/WebCore/platform/mac/PlatformScreenMac.mm	2020-02-19 23:38:53 UTC (rev 256984)
@@ -158,7 +158,7 @@
 
 void setShouldOverrideScreenSupportsHighDynamicRange(bool shouldOverride, bool supportsHighDynamicRange)
 {
-    if (PAL::canLoad_MediaToolbox_MTOverrideShouldPlayHDRVideo())
+    if (PAL::isMediaToolboxFrameworkAvailable() && PAL::canLoad_MediaToolbox_MTOverrideShouldPlayHDRVideo())
         PAL::softLink_MediaToolbox_MTOverrideShouldPlayHDRVideo(shouldOverride, supportsHighDynamicRange);
 }
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to