WebKit Bugzilla
New
Browse
Search+
Log In
×
Sign in with GitHub
or
Remember my login
Create Account
·
Forgot Password
Forgotten password account recovery
[patch]
Patch
patch.patch (text/plain), 20.26 KB, created by
Peng Liu
on 2020-12-21 21:19:42 PST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Peng Liu
Created:
2020-12-21 21:19:42 PST
Size:
20.26 KB
patch
obsolete
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog >index 58ade6a4844d..550d043c3cd1 100644 >--- a/Source/WebKit/ChangeLog >+++ b/Source/WebKit/ChangeLog >@@ -1,3 +1,22 @@ >+2020-12-21 Peng Liu <peng.liu6@apple.com> >+ >+ [Cocoa] Add a script to generate the "Feature Flags" plist file >+ https://bugs.webkit.org/show_bug.cgi?id=220080 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Add a script to combine a plist file from WebKitAdditions with the corresponding plist >+ file in this repo to generate a `WebKit.plist` required by the Feature Flags interface. >+ >+ * FeatureFlags/WebKit-appletvos.plist: Copied from Source/WebKit/FeatureFlags/WebKit.plist. >+ * FeatureFlags/WebKit-ios.plist: Copied from Source/WebKit/FeatureFlags/WebKit.plist. >+ * FeatureFlags/WebKit-macos.plist: Copied from Source/WebKit/FeatureFlags/WebKit.plist. >+ * FeatureFlags/WebKit-watchos.plist: Renamed from Source/WebKit/FeatureFlags/WebKit.plist. >+ * Scripts/combine-feature-flags-plist.py: Added. >+ (main): >+ * Scripts/generate-feature-flags-plist.sh: Added. >+ * WebKit.xcodeproj/project.pbxproj: >+ > 2020-12-18 Peng Liu <peng.liu6@apple.com> > > [Media in GPU Process][MSE] SourceBufferPrivateRemote needs to override some track buffer related functions of SourceBufferPrivate >diff --git a/Source/WebKit/FeatureFlags/WebKit.plist b/Source/WebKit/FeatureFlags/WebKit-appletvos.plist >similarity index 94% >rename from Source/WebKit/FeatureFlags/WebKit.plist >rename to Source/WebKit/FeatureFlags/WebKit-appletvos.plist >index 06b60c8486b5..f1bdbef65895 100644 >--- a/Source/WebKit/FeatureFlags/WebKit.plist >+++ b/Source/WebKit/FeatureFlags/WebKit-appletvos.plist >@@ -46,11 +46,6 @@ > <dict> > <key>Enabled</key> > <true/> >- </dict> >- <key>ScriptOptimizations</key> >- <dict> >- <key>Enabled</key> >- <false/> > </dict> > <key>sw_vp9_decoder_on_battery</key> > <dict> >diff --git a/Source/WebKit/FeatureFlags/WebKit-ios.plist b/Source/WebKit/FeatureFlags/WebKit-ios.plist >new file mode 100644 >index 000000000000..f1bdbef65895 >--- /dev/null >+++ b/Source/WebKit/FeatureFlags/WebKit-ios.plist >@@ -0,0 +1,91 @@ >+<?xml version="1.0" encoding="UTF-8"?> >+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> >+<plist version="1.0"> >+<dict> >+ <key>app_highlights</key> >+ <dict> >+ <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> >+ <false/> >+ </dict> >+ <key>gpu_process_dom_rendering</key> >+ <dict> >+ <key>Enabled</key> >+ <false/> >+ </dict> >+ <key>gpu_process_media</key> >+ <dict> >+ <key>Enabled</key> >+ <false/> >+ </dict> >+ <key>gpu_process_webgl</key> >+ <dict> >+ <key>Enabled</key> >+ <false/> >+ </dict> >+ <key>gpu_process_webrtc</key> >+ <dict> >+ <key>Enabled</key> >+ <false/> >+ </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>WebGL2</key> >+ <dict> >+ <key>Enabled</key> >+ <false/> >+ </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> >+</dict> >+</plist> >diff --git a/Source/WebKit/FeatureFlags/WebKit-macos.plist b/Source/WebKit/FeatureFlags/WebKit-macos.plist >new file mode 100644 >index 000000000000..f1bdbef65895 >--- /dev/null >+++ b/Source/WebKit/FeatureFlags/WebKit-macos.plist >@@ -0,0 +1,91 @@ >+<?xml version="1.0" encoding="UTF-8"?> >+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> >+<plist version="1.0"> >+<dict> >+ <key>app_highlights</key> >+ <dict> >+ <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> >+ <false/> >+ </dict> >+ <key>gpu_process_dom_rendering</key> >+ <dict> >+ <key>Enabled</key> >+ <false/> >+ </dict> >+ <key>gpu_process_media</key> >+ <dict> >+ <key>Enabled</key> >+ <false/> >+ </dict> >+ <key>gpu_process_webgl</key> >+ <dict> >+ <key>Enabled</key> >+ <false/> >+ </dict> >+ <key>gpu_process_webrtc</key> >+ <dict> >+ <key>Enabled</key> >+ <false/> >+ </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>WebGL2</key> >+ <dict> >+ <key>Enabled</key> >+ <false/> >+ </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> >+</dict> >+</plist> >diff --git a/Source/WebKit/FeatureFlags/WebKit-watchos.plist b/Source/WebKit/FeatureFlags/WebKit-watchos.plist >new file mode 100644 >index 000000000000..f1bdbef65895 >--- /dev/null >+++ b/Source/WebKit/FeatureFlags/WebKit-watchos.plist >@@ -0,0 +1,91 @@ >+<?xml version="1.0" encoding="UTF-8"?> >+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> >+<plist version="1.0"> >+<dict> >+ <key>app_highlights</key> >+ <dict> >+ <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> >+ <false/> >+ </dict> >+ <key>gpu_process_dom_rendering</key> >+ <dict> >+ <key>Enabled</key> >+ <false/> >+ </dict> >+ <key>gpu_process_media</key> >+ <dict> >+ <key>Enabled</key> >+ <false/> >+ </dict> >+ <key>gpu_process_webgl</key> >+ <dict> >+ <key>Enabled</key> >+ <false/> >+ </dict> >+ <key>gpu_process_webrtc</key> >+ <dict> >+ <key>Enabled</key> >+ <false/> >+ </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>WebGL2</key> >+ <dict> >+ <key>Enabled</key> >+ <false/> >+ </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> >+</dict> >+</plist> >diff --git a/Source/WebKit/Scripts/combine-feature-flags-plist.py b/Source/WebKit/Scripts/combine-feature-flags-plist.py >new file mode 100644 >index 000000000000..f5bfc7aafc24 >--- /dev/null >+++ b/Source/WebKit/Scripts/combine-feature-flags-plist.py >@@ -0,0 +1,57 @@ >+#!/usr/bin/env python >+# >+# Copyright (c) 2020 Apple Inc. All rights reserved. >+# >+# Redistribution and use in source and binary forms, with or without >+# modification, are permitted provided that the following conditions >+# are met: >+# 1. Redistributions of source code must retain the above copyright >+# notice, this list of conditions and the following disclaimer. >+# 2. Redistributions in binary form must reproduce the above copyright >+# notice, this list of conditions and the following disclaimer in the >+# documentation and/or other materials provided with the distribution. >+# >+# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' >+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, >+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR >+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS >+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF >+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS >+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN >+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) >+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF >+# THE POSSIBILITY OF SUCH DAMAGE. >+ >+import plistlib >+import sys >+ >+ >+def main(argv): >+ if len(argv) != 4: >+ return 1 >+ >+ feature_flags_plist_path = argv[1] >+ internal_feature_flags_plist_path = argv[2] >+ output_plist_path = argv[3] >+ >+ with open(feature_flags_plist_path) as feature_flags_file: >+ feature_flags = plistlib.readPlist(feature_flags_file) >+ try: >+ with open(internal_feature_flags_plist_path) as internal_feature_flags_file: >+ internal_feature_flags = plistlib.readPlist(internal_feature_flags_file) >+ for key in internal_feature_flags: >+ if key not in feature_flags: >+ return 1 >+ >+ feature_flags[key].update(internal_feature_flags[key]) >+ except IOError: >+ pass >+ >+ plistlib.writePlist(feature_flags, output_plist_path) >+ >+ return 0 >+ >+ >+if __name__ == '__main__': >+ sys.exit(main(sys.argv)) >diff --git a/Source/WebKit/Scripts/generate-feature-flags-plist.sh b/Source/WebKit/Scripts/generate-feature-flags-plist.sh >new file mode 100755 >index 000000000000..c3bc0f59087d >--- /dev/null >+++ b/Source/WebKit/Scripts/generate-feature-flags-plist.sh >@@ -0,0 +1,52 @@ >+#!/bin/sh >+# >+# Copyright (c) 2020 Apple Inc. All rights reserved. >+# >+# Redistribution and use in source and binary forms, with or without >+# modification, are permitted provided that the following conditions >+# are met: >+# 1. Redistributions of source code must retain the above copyright >+# notice, this list of conditions and the following disclaimer. >+# 2. Redistributions in binary form must reproduce the above copyright >+# notice, this list of conditions and the following disclaimer in the >+# documentation and/or other materials provided with the distribution. >+# >+# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' >+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, >+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR >+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS >+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF >+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS >+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN >+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) >+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF >+# THE POSSIBILITY OF SUCH DAMAGE. >+ >+if [[ ${WK_PLATFORM_NAME} == "appletvos" ]]; then >+ WEBKIT_PLIST_FILE_NAME="WebKit-appletvos.plist" >+elif [[ ${WK_PLATFORM_NAME} == "iphoneos" ]]; then >+ WEBKIT_PLIST_FILE_NAME="WebKit-ios.plist" >+elif [[ ${WK_PLATFORM_NAME} == "macosx" ]]; then >+ WEBKIT_PLIST_FILE_NAME="WebKit-macos.plist" >+elif [[ ${WK_PLATFORM_NAME} == "watchos" ]]; then >+ WEBKIT_PLIST_FILE_NAME="WebKit-watchos.plist" >+else >+ exit 0; >+fi >+ >+WEBKIT_PLIST_DIR="${SRCROOT}/FeatureFlags" >+INTERNAL_WEBKIT_PLIST_DIR="${WK_WEBKITADDITIONS_HEADERS_FOLDER_PATH}/WebKit" >+DEST_DIR="${INSTALL_ROOT}/${WK_INSTALL_PATH_PREFIX}/${SYSTEM_LIBRARY_DIR}/FeatureFlags/Domain" >+ >+if [[ ! -d "${DEST_DIR}" ]]; then >+ mkdir -p "${DEST_DIR}" >+fi >+ >+if [[ ! -f "${INTERNAL_WEBKIT_PLIST_DIR}/${WEBKIT_PLIST_FILE_NAME}" ]]; then >+ echo "Copy ${WEBKIT_PLIST_DIR}/${WEBKIT_PLIST_FILE_NAME} to ${DEST_DIR}/WebKit.plist" >+ ditto "${WEBKIT_PLIST_DIR}/${WEBKIT_PLIST_FILE_NAME}" "${DEST_DIR}/WebKit.plist" >+else >+ echo "Generate ${DEST_DIR}/WebKit.plist" >+ python "${SRCROOT}/Scripts/combine-feature-flags-plist.py" "${WEBKIT_PLIST_DIR}/${WEBKIT_PLIST_FILE_NAME}" "${INTERNAL_WEBKIT_PLIST_DIR}/${WEBKIT_PLIST_FILE_NAME}" "${DEST_DIR}/WebKit.plist" >+fi >diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj >index 2373005e9be8..9222aa37d4bc 100644 >--- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj >+++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj >@@ -2953,6 +2953,12 @@ > 1D0369A82567943C00440372 /* RemoteTextTrackProxyMessagesReplies.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RemoteTextTrackProxyMessagesReplies.h; path = DerivedSources/WebKit2/RemoteTextTrackProxyMessagesReplies.h; sourceTree = BUILT_PRODUCTS_DIR; }; > 1D0369A92567943C00440372 /* RemoteVideoTrackProxyMessagesReplies.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RemoteVideoTrackProxyMessagesReplies.h; path = DerivedSources/WebKit2/RemoteVideoTrackProxyMessagesReplies.h; sourceTree = BUILT_PRODUCTS_DIR; }; > 1D0369AA2567943C00440372 /* RemoteTextTrackProxyMessageReceiver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = RemoteTextTrackProxyMessageReceiver.cpp; path = DerivedSources/WebKit2/RemoteTextTrackProxyMessageReceiver.cpp; sourceTree = BUILT_PRODUCTS_DIR; }; >+ 1D0530C9258EAB4400E436F7 /* combine-feature-flags-plist.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = "combine-feature-flags-plist.py"; sourceTree = "<group>"; }; >+ 1D0530D1259162C800E436F7 /* WebKit-ios.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "WebKit-ios.plist"; sourceTree = "<group>"; }; >+ 1D0530D2259162C900E436F7 /* WebKit-appletvos.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "WebKit-appletvos.plist"; sourceTree = "<group>"; }; >+ 1D0530D3259162C900E436F7 /* WebKit-macos.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "WebKit-macos.plist"; sourceTree = "<group>"; }; >+ 1D0530D4259162C900E436F7 /* WebKit-watchos.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "WebKit-watchos.plist"; sourceTree = "<group>"; }; >+ 1D0530D52591941500E436F7 /* generate-feature-flags-plist.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "generate-feature-flags-plist.sh"; sourceTree = "<group>"; }; > 1D0ECEAA23FC858400D172F6 /* RemoteMediaPlayerProxyCocoa.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = RemoteMediaPlayerProxyCocoa.mm; sourceTree = "<group>"; }; > 1D32F89823A8465A00B1EA6A /* RemoteMediaResource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteMediaResource.h; sourceTree = "<group>"; }; > 1D32F89923A8468000B1EA6A /* RemoteMediaResource.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteMediaResource.cpp; sourceTree = "<group>"; }; >@@ -2998,7 +3004,6 @@ > 1DE076D92460CCBD00B211E8 /* WebPreferencesDefaultValuesCocoa.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPreferencesDefaultValuesCocoa.mm; sourceTree = "<group>"; }; > 1DE0D095211CC21300439B5F /* WKShareSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKShareSheet.h; sourceTree = "<group>"; }; > 1DE2DFAC23A959F8003E013A /* RemoteMediaResourceIdentifier.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteMediaResourceIdentifier.h; sourceTree = "<group>"; }; >- 1DEC97AC246B691E007C83F4 /* WebKit.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = WebKit.plist; sourceTree = "<group>"; }; > 1DF29018257F202F003C28AF /* MediaSourcePrivateRemote.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = MediaSourcePrivateRemote.messages.in; sourceTree = "<group>"; }; > 1DF29E61257F3794003C28AF /* MediaSourcePrivateRemoteMessageReceiver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = MediaSourcePrivateRemoteMessageReceiver.cpp; path = DerivedSources/WebKit2/MediaSourcePrivateRemoteMessageReceiver.cpp; sourceTree = BUILT_PRODUCTS_DIR; }; > 1DF29E62257F3795003C28AF /* MediaSourcePrivateRemoteMessagesReplies.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MediaSourcePrivateRemoteMessagesReplies.h; path = DerivedSources/WebKit2/MediaSourcePrivateRemoteMessagesReplies.h; sourceTree = BUILT_PRODUCTS_DIR; }; >@@ -6961,7 +6966,10 @@ > 1DEC97AB246B6865007C83F4 /* FeatureFlags */ = { > isa = PBXGroup; > children = ( >- 1DEC97AC246B691E007C83F4 /* WebKit.plist */, >+ 1D0530D2259162C900E436F7 /* WebKit-appletvos.plist */, >+ 1D0530D1259162C800E436F7 /* WebKit-ios.plist */, >+ 1D0530D3259162C900E436F7 /* WebKit-macos.plist */, >+ 1D0530D4259162C900E436F7 /* WebKit-watchos.plist */, > ); > path = FeatureFlags; > sourceTree = "<group>"; >@@ -10958,7 +10966,9 @@ > 535E08CA225460FC00DF00CA /* postprocess-header-rule */, > 7CDE73A21F9DA59700390312 /* PreferencesTemplates */, > 0FC0856E187CE0A900780D86 /* __init__.py */, >+ 1D0530C9258EAB4400E436F7 /* combine-feature-flags-plist.py */, > 4157853021276B6F00DD3800 /* copy-webcontent-resources-to-private-headers.sh */, >+ 1D0530D52591941500E436F7 /* generate-feature-flags-plist.sh */, > C0CE73361247F70E00BC0EC4 /* generate-message-receiver.py */, > 0FC0856F187CE0A900780D86 /* messages.py */, > 0FC08570187CE0A900780D86 /* model.py */, >@@ -13077,17 +13087,20 @@ > inputFileListPaths = ( > ); > inputPaths = ( >- "${SRCROOT}/FeatureFlags/WebKit.plist", >+ "$(SRCROOT)/FeatureFlags/WebKit-appletvos.plist", >+ "$(SRCROOT)/FeatureFlags/WebKit-ios.plist", >+ "$(SRCROOT)/FeatureFlags/WebKit-macos.plist", >+ "$(SRCROOT)/FeatureFlags/WebKit-watchos.plist", > ); > name = "Copy Feature Flags Plist"; > outputFileListPaths = ( > ); > outputPaths = ( >- "${INSTALL_ROOT}/${WK_INSTALL_PATH_PREFIX}/${SYSTEM_LIBRARY_DIR}/FeatureFlags/Domain/WebKit.plist", >+ "$(INSTALL_ROOT)/$(WK_INSTALL_PATH_PREFIX)/$(SYSTEM_LIBRARY_DIR)/FeatureFlags/Domain/WebKit.plist", > ); > runOnlyForDeploymentPostprocessing = 1; > shellPath = /bin/sh; >- shellScript = "if [[ ${WK_PLATFORM_NAME} == \"maccatalyst\" ]]; then\n exit 0;\nfi\n\nSOURCE_DIR=\"${SRCROOT}/FeatureFlags\"\nDEST_DIR=${INSTALL_ROOT}/${WK_INSTALL_PATH_PREFIX}/${SYSTEM_LIBRARY_DIR}/FeatureFlags/Domain\n\nif [[ ! -d \"${DEST_DIR}\" ]]; then\n mkdir -p \"${DEST_DIR}\"\nfi\n\nditto \"${SOURCE_DIR}/WebKit.plist\" \"${DEST_DIR}/WebKit.plist\"\n"; >+ shellScript = "${SRCROOT}/Scripts/generate-feature-flags-plist.sh\n"; > }; > 2D7DEBDF21269C9F00B9F73C /* Generate Unified Sources */ = { > isa = PBXShellScriptBuildPhase;
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=416652">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Flags:
dbates
:
review+
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 220080
: 416652 |
416679
|
417633