Skip to site navigation (Press enter)

[webkit-changes] [275246] branches/safari-612.1.9-branch/Source/WebKit/FeatureFlags

rubent_22 Tue, 30 Mar 2021 16:06:58 -0700

Title: [275246] branches/safari-612.1.9-branch/Source/WebKit/FeatureFlags

Revision: 275246
Author: [email protected]
Date: 2021-03-30 16:05:46 -0700 (Tue, 30 Mar 2021)

Log Message

Apply patch. rdar://problem/76023886

    Apply patch. rdar://76023886


Modified Paths

branches/safari-612.1.9-branch/Source/WebKit/FeatureFlags/WebKit-appletvos.plist
branches/safari-612.1.9-branch/Source/WebKit/FeatureFlags/WebKit-ios.plist
branches/safari-612.1.9-branch/Source/WebKit/FeatureFlags/WebKit-macos.plist
branches/safari-612.1.9-branch/Source/WebKit/FeatureFlags/WebKit-watchos.plist

Diff

Modified: branches/safari-612.1.9-branch/Source/WebKit/FeatureFlags/WebKit-appletvos.plist (275245 => 275246)


--- branches/safari-612.1.9-branch/Source/WebKit/FeatureFlags/WebKit-appletvos.plist	2021-03-30 23:03:53 UTC (rev 275245)
+++ branches/safari-612.1.9-branch/Source/WebKit/FeatureFlags/WebKit-appletvos.plist	2021-03-30 23:05:46 UTC (rev 275246)
@@ -2,6 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+<<<<<<< ours
 	<key>async_frame_and_overflow_scrolling</key>
 	<dict>
 		<key>Enabled</key>
@@ -82,5 +83,97 @@
 		<key>Enabled</key>
 		<true/>
 	</dict>
+=======
+    <key>async_frame_and_overflow_scrolling</key>
+    <dict>
+        <key>Enabled</key>
+        <true/>
+    </dict>
+    <key>gpu_process_canvas_rendering</key>
+    <dict>
+        <key>Enabled</key>
+        <true/>
+        <key>Attributes</key>
+        <dict>
+            <key>CodeComplete</key>
+            <true/>
+        </dict>
+    </dict>
+    <key>gpu_process_dom_rendering</key>
+    <dict>
+        <key>Enabled</key>
+        <false/>
+    </dict>
+    <key>gpu_process_media</key>
+    <dict>
+        <key>Enabled</key>
+        <true/>
+        <key>Attributes</key>
+        <dict>
+            <key>CodeComplete</key>
+            <true/>
+        </dict>
+    </dict>
+    <key>gpu_process_webgl</key>
+    <dict>
+        <key>Enabled</key>
+        <false/>
+    </dict>
+    <key>gpu_process_webrtc</key>
+    <dict>
+        <key>Enabled</key>
+        <false/>
+        <key>Attributes</key>
+        <dict>
+            <key>CodeComplete</key>
+            <true/>
+        </dict>
+    </dict>
+    <key>InAppBrowserPrivacy</key>
+    <dict>
+        <key>Enabled</key>
+        <false/>
+    </dict>
+    <key>incremental_pdf</key>
+    <dict>
+        <key>Enabled</key>
+        <true/>
+    </dict>
+    <key>sw_vp9_decoder_on_battery</key>
+    <dict>
+        <key>Enabled</key>
+        <false/>
+    </dict>
+    <key>vp9_decoder</key>
+    <dict>
+        <key>Enabled</key>
+        <true/>
+    </dict>
+    <key>WebGPU</key>
+    <dict>
+        <key>Enabled</key>
+        <false/>
+    </dict>
+    <key>WebXR</key>
+    <dict>
+        <key>Enabled</key>
+        <false/>
+    </dict>
+    <key>webm_format_reader</key>
+    <dict>
+        <key>Enabled</key>
+        <true/>
+    </dict>
+    <key>webm_parser</key>
+    <dict>
+        <key>Enabled</key>
+        <true/>
+    </dict>
+    <key>RB_full_manage_WK_jetsam</key>
+    <dict>
+        <key>Enabled</key>
+        <true/>
+    </dict>
+>>>>>>> theirs
 </dict>
 </plist>

Modified: branches/safari-612.1.9-branch/Source/WebKit/FeatureFlags/WebKit-ios.plist (275245 => 275246)


--- branches/safari-612.1.9-branch/Source/WebKit/FeatureFlags/WebKit-ios.plist	2021-03-30 23:03:53 UTC (rev 275245)
+++ branches/safari-612.1.9-branch/Source/WebKit/FeatureFlags/WebKit-ios.plist	2021-03-30 23:05:46 UTC (rev 275246)
@@ -2,6 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+<<<<<<< ours
 	<key>async_frame_and_overflow_scrolling</key>
 	<dict>
 		<key>Enabled</key>
@@ -82,5 +83,97 @@
 		<key>Enabled</key>
 		<true/>
 	</dict>
+=======
+    <key>async_frame_and_overflow_scrolling</key>
+    <dict>
+        <key>Enabled</key>
+        <true/>
+    </dict>
+    <key>gpu_process_canvas_rendering</key>
+    <dict>
+        <key>Enabled</key>
+        <true/>
+        <key>Attributes</key>
+        <dict>
+            <key>CodeComplete</key>
+            <true/>
+        </dict>
+    </dict>
+    <key>gpu_process_dom_rendering</key>
+    <dict>
+        <key>Enabled</key>
+        <false/>
+    </dict>
+    <key>gpu_process_media</key>
+    <dict>
+        <key>Enabled</key>
+        <true/>
+        <key>Attributes</key>
+        <dict>
+            <key>CodeComplete</key>
+            <true/>
+        </dict>
+    </dict>
+    <key>gpu_process_webgl</key>
+    <dict>
+        <key>Enabled</key>
+        <false/>
+    </dict>
+    <key>gpu_process_webrtc</key>
+    <dict>
+        <key>Enabled</key>
+        <true/>
+        <key>Attributes</key>
+        <dict>
+            <key>CodeComplete</key>
+            <true/>
+        </dict>
+    </dict>
+    <key>InAppBrowserPrivacy</key>
+    <dict>
+        <key>Enabled</key>
+        <false/>
+    </dict>
+    <key>incremental_pdf</key>
+    <dict>
+        <key>Enabled</key>
+        <true/>
+    </dict>
+    <key>sw_vp9_decoder_on_battery</key>
+    <dict>
+        <key>Enabled</key>
+        <false/>
+    </dict>
+    <key>vp9_decoder</key>
+    <dict>
+        <key>Enabled</key>
+        <true/>
+    </dict>
+    <key>WebGPU</key>
+    <dict>
+        <key>Enabled</key>
+        <false/>
+    </dict>
+    <key>WebXR</key>
+    <dict>
+        <key>Enabled</key>
+        <false/>
+    </dict>
+    <key>webm_format_reader</key>
+    <dict>
+        <key>Enabled</key>
+        <true/>
+    </dict>
+    <key>webm_parser</key>
+    <dict>
+        <key>Enabled</key>
+        <true/>
+    </dict>
+    <key>RB_full_manage_WK_jetsam</key>
+    <dict>
+        <key>Enabled</key>
+        <true/>
+    </dict>
+>>>>>>> theirs
 </dict>
 </plist>

Modified: branches/safari-612.1.9-branch/Source/WebKit/FeatureFlags/WebKit-macos.plist (275245 => 275246)


--- branches/safari-612.1.9-branch/Source/WebKit/FeatureFlags/WebKit-macos.plist	2021-03-30 23:03:53 UTC (rev 275245)
+++ branches/safari-612.1.9-branch/Source/WebKit/FeatureFlags/WebKit-macos.plist	2021-03-30 23:05:46 UTC (rev 275246)
@@ -2,6 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+<<<<<<< ours
 	<key>async_frame_and_overflow_scrolling</key>
 	<dict>
 		<key>Enabled</key>
@@ -82,5 +83,97 @@
 		<key>Enabled</key>
 		<true/>
 	</dict>
+=======
+    <key>async_frame_and_overflow_scrolling</key>
+    <dict>
+        <key>Enabled</key>
+        <true/>
+    </dict>
+    <key>gpu_process_canvas_rendering</key>
+    <dict>
+        <key>Enabled</key>
+        <true/>
+        <key>Attributes</key>
+        <dict>
+            <key>CodeComplete</key>
+            <true/>
+        </dict>
+    </dict>
+    <key>gpu_process_dom_rendering</key>
+    <dict>
+        <key>Enabled</key>
+        <false/>
+    </dict>
+    <key>gpu_process_media</key>
+    <dict>
+        <key>Enabled</key>
+        <true/>
+        <key>Attributes</key>
+        <dict>
+            <key>CodeComplete</key>
+            <true/>
+        </dict>
+    </dict>
+    <key>gpu_process_webgl</key>
+    <dict>
+        <key>Enabled</key>
+        <false/>
+    </dict>
+    <key>gpu_process_webrtc</key>
+    <dict>
+        <key>Enabled</key>
+        <true/>
+        <key>Attributes</key>
+        <dict>
+            <key>CodeComplete</key>
+            <true/>
+        </dict>
+    </dict>
+    <key>InAppBrowserPrivacy</key>
+    <dict>
+        <key>Enabled</key>
+        <false/>
+    </dict>
+    <key>incremental_pdf</key>
+    <dict>
+        <key>Enabled</key>
+        <true/>
+    </dict>
+    <key>sw_vp9_decoder_on_battery</key>
+    <dict>
+        <key>Enabled</key>
+        <false/>
+    </dict>
+    <key>vp9_decoder</key>
+    <dict>
+        <key>Enabled</key>
+        <true/>
+    </dict>
+    <key>WebGPU</key>
+    <dict>
+        <key>Enabled</key>
+        <false/>
+    </dict>
+    <key>WebXR</key>
+    <dict>
+        <key>Enabled</key>
+        <false/>
+    </dict>
+    <key>webm_format_reader</key>
+    <dict>
+        <key>Enabled</key>
+        <true/>
+    </dict>
+    <key>webm_parser</key>
+    <dict>
+        <key>Enabled</key>
+        <true/>
+    </dict>
+    <key>RB_full_manage_WK_jetsam</key>
+    <dict>
+        <key>Enabled</key>
+        <true/>
+    </dict>
+>>>>>>> theirs
 </dict>
 </plist>

Modified: branches/safari-612.1.9-branch/Source/WebKit/FeatureFlags/WebKit-watchos.plist (275245 => 275246)


--- branches/safari-612.1.9-branch/Source/WebKit/FeatureFlags/WebKit-watchos.plist	2021-03-30 23:03:53 UTC (rev 275245)
+++ branches/safari-612.1.9-branch/Source/WebKit/FeatureFlags/WebKit-watchos.plist	2021-03-30 23:05:46 UTC (rev 275246)
@@ -2,6 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+<<<<<<< ours
 	<key>async_frame_and_overflow_scrolling</key>
 	<dict>
 		<key>Enabled</key>
@@ -82,5 +83,97 @@
 		<key>Enabled</key>
 		<true/>
 	</dict>
+=======
+    <key>async_frame_and_overflow_scrolling</key>
+    <dict>
+        <key>Enabled</key>
+        <true/>
+    </dict>
+    <key>gpu_process_canvas_rendering</key>
+    <dict>
+        <key>Enabled</key>
+        <true/>
+        <key>Attributes</key>
+        <dict>
+            <key>CodeComplete</key>
+            <true/>
+        </dict>
+    </dict>
+    <key>gpu_process_dom_rendering</key>
+    <dict>
+        <key>Enabled</key>
+        <false/>
+    </dict>
+    <key>gpu_process_media</key>
+    <dict>
+        <key>Enabled</key>
+        <true/>
+        <key>Attributes</key>
+        <dict>
+            <key>CodeComplete</key>
+            <true/>
+        </dict>
+    </dict>
+    <key>gpu_process_webgl</key>
+    <dict>
+        <key>Enabled</key>
+        <false/>
+    </dict>
+    <key>gpu_process_webrtc</key>
+    <dict>
+        <key>Enabled</key>
+        <false/>
+        <key>Attributes</key>
+        <dict>
+            <key>CodeComplete</key>
+            <true/>
+        </dict>
+    </dict>
+    <key>InAppBrowserPrivacy</key>
+    <dict>
+        <key>Enabled</key>
+        <false/>
+    </dict>
+    <key>incremental_pdf</key>
+    <dict>
+        <key>Enabled</key>
+        <true/>
+    </dict>
+    <key>sw_vp9_decoder_on_battery</key>
+    <dict>
+        <key>Enabled</key>
+        <false/>
+    </dict>
+    <key>vp9_decoder</key>
+    <dict>
+        <key>Enabled</key>
+        <true/>
+    </dict>
+    <key>WebGPU</key>
+    <dict>
+        <key>Enabled</key>
+        <false/>
+    </dict>
+    <key>WebXR</key>
+    <dict>
+        <key>Enabled</key>
+        <false/>
+    </dict>
+    <key>webm_format_reader</key>
+    <dict>
+        <key>Enabled</key>
+        <true/>
+    </dict>
+    <key>webm_parser</key>
+    <dict>
+        <key>Enabled</key>
+        <true/>
+    </dict>
+    <key>RB_full_manage_WK_jetsam</key>
+    <dict>
+        <key>Enabled</key>
+        <true/>
+    </dict>
+>>>>>>> theirs
 </dict>
 </plist>

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes