Browse Source

chore: put "mas" in the names of mas patches (#29213)

Jeremy Rose 3 years ago
parent
commit
cd3c6f9e37

+ 6 - 6
patches/chromium/.patches

@@ -19,16 +19,20 @@ pepper_plugin_support.patch
 no_cache_storage_check.patch
 gtk_visibility.patch
 sysroot.patch
-mas_blink_no_private_api.patch
-mas_no_private_api.patch
 resource_file_conflict.patch
 scroll_bounce_flag.patch
+mas_blink_no_private_api.patch
+mas_no_private_api.patch
 mas-cfisobjc.patch
 mas-cgdisplayusesforcetogray.patch
 mas-audiodeviceduck.patch
 mas_disable_remote_layer.patch
 mas_disable_remote_accessibility.patch
 mas_disable_custom_window_frame.patch
+mas_avoid_usage_of_abort_report_np.patch
+mas_avoid_usage_of_pthread_fchdir_np.patch
+mas_avoid_usage_of_setapplicationisdaemon_and.patch
+mas_use_public_apis_to_determine_if_a_font_is_a_system_font.patch
 chrome_key_systems.patch
 add_didinstallconditionalfeatures.patch
 desktop_media_list.patch
@@ -40,9 +44,6 @@ dump_syms.patch
 command-ismediakey.patch
 printing.patch
 support_mixed_sandbox_with_zygote.patch
-fix_disable_usage_of_abort_report_np_in_mas_builds.patch
-fix_disable_usage_of_pthread_fchdir_np_and_pthread_chdir_np_in_mas.patch
-fix_disable_usage_of_setapplicationisdaemon_and.patch
 unsandboxed_ppapi_processes_skip_zygote.patch
 build_add_electron_tracing_category.patch
 worker_context_will_destroy.patch
@@ -91,7 +92,6 @@ fix_properly_honor_printing_page_ranges.patch
 fix_use_electron_generated_resources.patch
 chore_expose_v8_initialization_isolate_callbacks.patch
 export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
-use_public_apis_to_determine_if_a_font_is_a_system_font_in_mas_build.patch
 fix_export_zlib_symbols.patch
 don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
 web_contents.patch

+ 1 - 1
patches/chromium/mas-audiodeviceduck.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jeremy Apthorp <[email protected]>
 Date: Thu, 20 Sep 2018 17:49:31 -0700
-Subject: mas-audiodeviceduck.patch
+Subject: mas: avoid usage of AudioDeviceDuck
 
 Removes usage of the AudioDeviceDuck private API.
 

+ 1 - 1
patches/chromium/mas-cfisobjc.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jeremy Apthorp <[email protected]>
 Date: Thu, 20 Sep 2018 17:49:20 -0700
-Subject: mas-cfisobjc.patch
+Subject: mas: avoid usage of _CFIsObjC
 
 Removes usage of the _CFIsObjC private API.
 

+ 1 - 1
patches/chromium/mas-cgdisplayusesforcetogray.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jeremy Apthorp <[email protected]>
 Date: Thu, 20 Sep 2018 17:49:24 -0700
-Subject: mas-cgdisplayusesforcetogray.patch
+Subject: mas: avoid usage of CGDisplayUsesForceToGray
 
 Removes usage of the CGDisplayUsesForceToGray private API.
 

+ 2 - 2
patches/chromium/fix_disable_usage_of_abort_report_np_in_mas_builds.patch → patches/chromium/mas_avoid_usage_of_abort_report_np.patch

@@ -1,9 +1,9 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Samuel Attard <[email protected]>
 Date: Mon, 4 Mar 2019 14:43:36 -0800
-Subject: fix_disable_usage_of_abort_report_np_in_mas_builds.patch
+Subject: mas: avoid usage of abort_report_np
 
-Disable usage of abort_report_np in MAS builds.
+Disable usage of the private API abort_report_np in MAS builds.
 
 diff --git a/sandbox/mac/sandbox_logging.cc b/sandbox/mac/sandbox_logging.cc
 index 702224dce1871c07b07f6882e46d14fe532d6ed2..797cb6646171486797a5e5fbbb1b187e3a9f81d4 100644

+ 1 - 2
patches/chromium/fix_disable_usage_of_pthread_fchdir_np_and_pthread_chdir_np_in_mas.patch → patches/chromium/mas_avoid_usage_of_pthread_fchdir_np.patch

@@ -1,8 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Samuel Attard <[email protected]>
 Date: Mon, 4 Mar 2019 14:46:48 -0800
-Subject: 
- fix_disable_usage_of_pthread_fchdir_np_and_pthread_chdir_np_in_MAS.patch
+Subject: mas: avoid usage of pthread_fchdir_np
 
 Disable usage of pthread_fchdir_np and pthread_chdir_np in MAS builds.
 

+ 2 - 1
patches/chromium/fix_disable_usage_of_setapplicationisdaemon_and.patch → patches/chromium/mas_avoid_usage_of_setapplicationisdaemon_and.patch

@@ -1,7 +1,8 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Samuel Attard <[email protected]>
 Date: Mon, 4 Mar 2019 14:51:45 -0800
-Subject: fix_disable_usage_of_setapplicationisdaemon_and.patch
+Subject: mas: avoid usage of SetApplicationIsDaemon and
+ _LSSetApplicationLaunchServicesServerConnectionStatus
 
 Disable usage of SetApplicationIsDaemon and
 _LSSetApplicationLaunchServicesServerConnectionStatus in MAS builds

+ 1 - 1
patches/chromium/mas_blink_no_private_api.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cheng Zhao <[email protected]>
 Date: Thu, 20 Sep 2018 17:48:49 -0700
-Subject: mas_blink_no_private_api.patch
+Subject: mas: avoid private APIs in blink
 
 Guard usages in chromium code of private Mac APIs by MAS_BUILD, so they can
 be excluded for people who want to submit their apps to the Mac App store.

+ 1 - 1
patches/chromium/mas_disable_custom_window_frame.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cheng Zhao <[email protected]>
 Date: Thu, 20 Sep 2018 17:48:49 -0700
-Subject: mas_disable_custom_window_frame.patch
+Subject: mas: disable private window-frame APIs
 
 Disable private window frame APIs (NSNextStepFrame and NSThemeFrame) for MAS
 build.

+ 1 - 4
patches/chromium/mas_disable_remote_accessibility.patch

@@ -1,10 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cheng Zhao <[email protected]>
 Date: Thu, 20 Sep 2018 17:48:49 -0700
-Subject: mas_disable_remote_accessibility.patch
-
-Disable remote accessibility APIs (NSAccessibilityRemoteUIElement) for MAS
-build.
+Subject: mas: avoid usage of NSAccessibilityRemoteUIElement
 
 According to ccameron:
 

+ 2 - 3
patches/chromium/mas_disable_remote_layer.patch

@@ -1,9 +1,8 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cheng Zhao <[email protected]>
 Date: Thu, 20 Sep 2018 17:48:49 -0700
-Subject: mas_disable_remote_layer.patch
-
-Disable remote layer APIs (CAContext and CALayerHost) for MAS build.
+Subject: mas: disable remote layer APIs (CAContext and CALayerHost) for MAS
+ build
 
 Accordin to ccameron:
 

+ 1 - 1
patches/chromium/mas_no_private_api.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cheng Zhao <[email protected]>
 Date: Tue, 9 Oct 2018 10:36:20 -0700
-Subject: mas_no_private_api.patch
+Subject: mas: avoid some private APIs
 
 Guard usages in blink of private Mac APIs by MAS_BUILD, so they can be
 excluded for people who want to submit their apps to the Mac App store.

+ 5 - 2
patches/chromium/use_public_apis_to_determine_if_a_font_is_a_system_font_in_mas_build.patch → patches/chromium/mas_use_public_apis_to_determine_if_a_font_is_a_system_font.patch

@@ -1,9 +1,12 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Samuel Attard <[email protected]>
 Date: Tue, 17 Nov 2020 16:59:28 -0800
-Subject: use public APIs to determine if a font is a system font in MAS build
+Subject: mas: use public APIs to determine if a font is a system font
 
-CTFontDescriptorIsSystemUIFont is a private API, we're using an _interesting_ technique in the MAS build to determine if the font is a system font by checking if it's kCTFontPriorityAttribute is set to system priority.
+CTFontDescriptorIsSystemUIFont is a private API, we're using an
+_interesting_ technique in the MAS build to determine if the font is a
+system font by checking if it's kCTFontPriorityAttribute is set to
+system priority.
 
 diff --git a/ui/gfx/platform_font_mac.mm b/ui/gfx/platform_font_mac.mm
 index bc8aeaade0593f543de0e156bed02d685ac9bc39..b7d0127938ce8dfe66fc9f3375f0e01c674ee624 100644