Skip to site navigation (Press enter)

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

repstein Wed, 31 Mar 2021 10:07:41 -0700

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

Revision: 275286
Author: [email protected]
Date: 2021-03-31 10:06:21 -0700 (Wed, 31 Mar 2021)

Log Message

Unreviewed build fix after r275246.


Conflict markers in source.

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 (275285 => 275286)


--- branches/safari-612.1.9-branch/Source/WebKit/FeatureFlags/WebKit-appletvos.plist	2021-03-31 16:15:15 UTC (rev 275285)
+++ branches/safari-612.1.9-branch/Source/WebKit/FeatureFlags/WebKit-appletvos.plist	2021-03-31 17:06:21 UTC (rev 275286)
@@ -2,7 +2,6 @@
 <!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>
@@ -11,7 +10,7 @@
 	<key>gpu_process_canvas_rendering</key>
 	<dict>
 		<key>Enabled</key>
-		<true/>
+		<false/>
 	</dict>
 	<key>gpu_process_dom_rendering</key>
 	<dict>
@@ -21,7 +20,7 @@
 	<key>gpu_process_media</key>
 	<dict>
 		<key>Enabled</key>
-		<true/>
+		<false/>
 	</dict>
 	<key>gpu_process_webgl</key>
 	<dict>
@@ -83,97 +82,5 @@
 		<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 (275285 => 275286)


--- branches/safari-612.1.9-branch/Source/WebKit/FeatureFlags/WebKit-ios.plist	2021-03-31 16:15:15 UTC (rev 275285)
+++ branches/safari-612.1.9-branch/Source/WebKit/FeatureFlags/WebKit-ios.plist	2021-03-31 17:06:21 UTC (rev 275286)
@@ -2,7 +2,6 @@
 <!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>
@@ -11,7 +10,7 @@
 	<key>gpu_process_canvas_rendering</key>
 	<dict>
 		<key>Enabled</key>
-		<true/>
+		<false/>
 	</dict>
 	<key>gpu_process_dom_rendering</key>
 	<dict>
@@ -21,7 +20,7 @@
 	<key>gpu_process_media</key>
 	<dict>
 		<key>Enabled</key>
-		<true/>
+		<false/>
 	</dict>
 	<key>gpu_process_webgl</key>
 	<dict>
@@ -83,97 +82,5 @@
 		<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 (275285 => 275286)


--- branches/safari-612.1.9-branch/Source/WebKit/FeatureFlags/WebKit-macos.plist	2021-03-31 16:15:15 UTC (rev 275285)
+++ branches/safari-612.1.9-branch/Source/WebKit/FeatureFlags/WebKit-macos.plist	2021-03-31 17:06:21 UTC (rev 275286)
@@ -2,7 +2,6 @@
 <!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>
@@ -11,7 +10,7 @@
 	<key>gpu_process_canvas_rendering</key>
 	<dict>
 		<key>Enabled</key>
-		<true/>
+		<false/>
 	</dict>
 	<key>gpu_process_dom_rendering</key>
 	<dict>
@@ -21,7 +20,7 @@
 	<key>gpu_process_media</key>
 	<dict>
 		<key>Enabled</key>
-		<true/>
+		<false/>
 	</dict>
 	<key>gpu_process_webgl</key>
 	<dict>
@@ -83,97 +82,5 @@
 		<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 (275285 => 275286)


--- branches/safari-612.1.9-branch/Source/WebKit/FeatureFlags/WebKit-watchos.plist	2021-03-31 16:15:15 UTC (rev 275285)
+++ branches/safari-612.1.9-branch/Source/WebKit/FeatureFlags/WebKit-watchos.plist	2021-03-31 17:06:21 UTC (rev 275286)
@@ -2,7 +2,6 @@
 <!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>
@@ -11,7 +10,7 @@
 	<key>gpu_process_canvas_rendering</key>
 	<dict>
 		<key>Enabled</key>
-		<true/>
+		<false/>
 	</dict>
 	<key>gpu_process_dom_rendering</key>
 	<dict>
@@ -21,7 +20,7 @@
 	<key>gpu_process_media</key>
 	<dict>
 		<key>Enabled</key>
-		<true/>
+		<false/>
 	</dict>
 	<key>gpu_process_webgl</key>
 	<dict>
@@ -83,97 +82,5 @@
 		<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