Title: [264774] branches/safari-610.1.23.1-branch/Source
Revision
264774
Author
repst...@apple.com
Date
2020-07-23 10:22:06 -0700 (Thu, 23 Jul 2020)

Log Message

Cherry-pick r264747. rdar://problem/65995978

    [Cocoa] Add feature flag for WebM & VP9
    https://bugs.webkit.org/show_bug.cgi?id=214672
    <rdar://problem/65959506>

    Reviewed by Beth Dakin.

    Source/WebKit:

    * FeatureFlags/WebKit.plist:
    * Shared/WebPreferences.yaml:
    * Shared/WebPreferencesDefaultValues.cpp:
    (WebKit::defaultVP9DecoderEnabled):
    (WebKit::defaultWebMParserEnabled):
    * Shared/WebPreferencesDefaultValues.h:

    Source/WTF:

    * wtf/PlatformEnableCocoa.h:

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

Modified Paths

Diff

Modified: branches/safari-610.1.23.1-branch/Source/WTF/ChangeLog (264773 => 264774)


--- branches/safari-610.1.23.1-branch/Source/WTF/ChangeLog	2020-07-23 17:22:02 UTC (rev 264773)
+++ branches/safari-610.1.23.1-branch/Source/WTF/ChangeLog	2020-07-23 17:22:06 UTC (rev 264774)
@@ -1,3 +1,39 @@
+2020-07-23  Alan Coon  <alanc...@apple.com>
+
+        Cherry-pick r264747. rdar://problem/65995978
+
+    [Cocoa] Add feature flag for WebM & VP9
+    https://bugs.webkit.org/show_bug.cgi?id=214672
+    <rdar://problem/65959506>
+    
+    Reviewed by Beth Dakin.
+    
+    Source/WebKit:
+    
+    * FeatureFlags/WebKit.plist:
+    * Shared/WebPreferences.yaml:
+    * Shared/WebPreferencesDefaultValues.cpp:
+    (WebKit::defaultVP9DecoderEnabled):
+    (WebKit::defaultWebMParserEnabled):
+    * Shared/WebPreferencesDefaultValues.h:
+    
+    Source/WTF:
+    
+    * wtf/PlatformEnableCocoa.h:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@264747 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-07-22  Jer Noble  <jer.no...@apple.com>
+
+            [Cocoa] Add feature flag for WebM & VP9
+            https://bugs.webkit.org/show_bug.cgi?id=214672
+            <rdar://problem/65959506>
+
+            Reviewed by Beth Dakin.
+
+            * wtf/PlatformEnableCocoa.h:
+
 2020-07-19  Geoffrey Garen  <gga...@apple.com>
 
         There should be only one RunLoop Timer class

Modified: branches/safari-610.1.23.1-branch/Source/WTF/wtf/PlatformEnableCocoa.h (264773 => 264774)


--- branches/safari-610.1.23.1-branch/Source/WTF/wtf/PlatformEnableCocoa.h	2020-07-23 17:22:02 UTC (rev 264773)
+++ branches/safari-610.1.23.1-branch/Source/WTF/wtf/PlatformEnableCocoa.h	2020-07-23 17:22:06 UTC (rev 264774)
@@ -530,6 +530,10 @@
 #define ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN 1
 #endif
 
+#if !defined(ENABLE_VP9) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101600
+#define ENABLE_VP9 1
+#endif
+
 #if !defined(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS)
 #define ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS 1
 #endif

Modified: branches/safari-610.1.23.1-branch/Source/WebKit/ChangeLog (264773 => 264774)


--- branches/safari-610.1.23.1-branch/Source/WebKit/ChangeLog	2020-07-23 17:22:02 UTC (rev 264773)
+++ branches/safari-610.1.23.1-branch/Source/WebKit/ChangeLog	2020-07-23 17:22:06 UTC (rev 264774)
@@ -1,3 +1,44 @@
+2020-07-23  Alan Coon  <alanc...@apple.com>
+
+        Cherry-pick r264747. rdar://problem/65995978
+
+    [Cocoa] Add feature flag for WebM & VP9
+    https://bugs.webkit.org/show_bug.cgi?id=214672
+    <rdar://problem/65959506>
+    
+    Reviewed by Beth Dakin.
+    
+    Source/WebKit:
+    
+    * FeatureFlags/WebKit.plist:
+    * Shared/WebPreferences.yaml:
+    * Shared/WebPreferencesDefaultValues.cpp:
+    (WebKit::defaultVP9DecoderEnabled):
+    (WebKit::defaultWebMParserEnabled):
+    * Shared/WebPreferencesDefaultValues.h:
+    
+    Source/WTF:
+    
+    * wtf/PlatformEnableCocoa.h:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@264747 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-07-22  Jer Noble  <jer.no...@apple.com>
+
+            [Cocoa] Add feature flag for WebM & VP9
+            https://bugs.webkit.org/show_bug.cgi?id=214672
+            <rdar://problem/65959506>
+
+            Reviewed by Beth Dakin.
+
+            * FeatureFlags/WebKit.plist:
+            * Shared/WebPreferences.yaml:
+            * Shared/WebPreferencesDefaultValues.cpp:
+            (WebKit::defaultVP9DecoderEnabled):
+            (WebKit::defaultWebMParserEnabled):
+            * Shared/WebPreferencesDefaultValues.h:
+
 2020-07-22  Alan Coon  <alanc...@apple.com>
 
         Cherry-pick r264685. rdar://problem/65944676

Modified: branches/safari-610.1.23.1-branch/Source/WebKit/FeatureFlags/WebKit.plist (264773 => 264774)


--- branches/safari-610.1.23.1-branch/Source/WebKit/FeatureFlags/WebKit.plist	2020-07-23 17:22:02 UTC (rev 264773)
+++ branches/safari-610.1.23.1-branch/Source/WebKit/FeatureFlags/WebKit.plist	2020-07-23 17:22:06 UTC (rev 264774)
@@ -47,5 +47,15 @@
         <key>Enabled</key>
         <false/>
     </dict>
+    <key>vp9_decoder</key>
+    <dict>
+        <key>Enabled</key>
+        <true/>
+    </dict>
+    <key>webm_parser</key>
+    <dict>
+        <key>Enabled</key>
+        <true/>
+    </dict>
 </dict>
 </plist>

Modified: branches/safari-610.1.23.1-branch/Source/WebKit/Shared/WebPreferences.yaml (264773 => 264774)


--- branches/safari-610.1.23.1-branch/Source/WebKit/Shared/WebPreferences.yaml	2020-07-23 17:22:02 UTC (rev 264773)
+++ branches/safari-610.1.23.1-branch/Source/WebKit/Shared/WebPreferences.yaml	2020-07-23 17:22:06 UTC (rev 264774)
@@ -662,20 +662,21 @@
 
 VP9DecoderEnabled:
   type: bool
-  defaultValue: false
+  defaultValue: defaultVP9DecoderEnabled()
   webcoreBinding: none
   humanReadableName: "VP9 decoder"
   humanReadableDescription: "Enable VP9 decoder"
   category: experimental
+  condition: ENABLE(VP9)
 
 WebMParserEnabled:
   type: bool
-  defaultValue: false
+  defaultValue: defaultWebMParserEnabled()
   webcoreBinding: RuntimeEnabledFeatures
   humanReadableName: "WebM MSE parser"
   humanReadableDescription: "Enable WebM MSE parser"
   category: experimental
-  condition: ENABLE(MEDIA_SOURCE)
+  condition: ENABLE(MEDIA_SOURCE) && ENABLE(VP9)
 
 UseLegacyTextAlignPositionedElementBehavior:
   type: bool

Modified: branches/safari-610.1.23.1-branch/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp (264773 => 264774)


--- branches/safari-610.1.23.1-branch/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp	2020-07-23 17:22:02 UTC (rev 264773)
+++ branches/safari-610.1.23.1-branch/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp	2020-07-23 17:22:06 UTC (rev 264774)
@@ -243,4 +243,26 @@
 
 #endif // ENABLE(WEBXR)
 
+#if ENABLE(VP9)
+bool defaultVP9DecoderEnabled()
+{
+#if HAVE(SYSTEM_FEATURE_FLAGS)
+    return isFeatureFlagEnabled("vp9_decoder");
+#endif
+
+    return true;
+}
+#endif
+
+#if ENABLE(MEDIA_SOURCE) && ENABLE(VP9)
+bool defaultWebMParserEnabled()
+{
+#if HAVE(SYSTEM_FEATURE_FLAGS)
+    return isFeatureFlagEnabled("webm_parser");
+#endif
+
+    return true;
+}
+#endif
+
 } // namespace WebKit

Modified: branches/safari-610.1.23.1-branch/Source/WebKit/Shared/WebPreferencesDefaultValues.h (264773 => 264774)


--- branches/safari-610.1.23.1-branch/Source/WebKit/Shared/WebPreferencesDefaultValues.h	2020-07-23 17:22:02 UTC (rev 264773)
+++ branches/safari-610.1.23.1-branch/Source/WebKit/Shared/WebPreferencesDefaultValues.h	2020-07-23 17:22:06 UTC (rev 264774)
@@ -362,4 +362,12 @@
 bool defaultWebXREnabled();
 #endif
 
+#if ENABLE(VP9)
+bool defaultVP9DecoderEnabled();
+#endif
+
+#if ENABLE(MEDIA_SOURCE) && ENABLE(VP9)
+bool defaultWebMParserEnabled();
+#endif
+
 } // namespace WebKit
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to