Update to Chromium version 86.0.4240.0 (#800218)

- CefURLRequest::Create is no longer supported in the renderer process
  (see https://crbug.com/891872). Use CefFrame::CreateURLRequest instead.
- Mac platform definitions have been changed from `MACOSX` to `MAC`
  (see https://crbug.com/1105907) and related CMake macro names have
  been updated. The old `OS_MACOSX` define is still set in code and CMake
  for backwards compatibility.
- Linux ARM build is currently broken (see https://crbug.com/1123214).

tools/automate/automate-git.py

@@ -679,7 +679,7 @@ parser.add_option(
     help="Output commands without executing them.")
 parser.add_option('--dry-run-platform', dest='dryrunplatform', default=None,
                   help='Simulate a dry run on the specified platform '+\
-                       '(windows, macosx, linux). Must be used in combination'+\
+                       '(windows, mac, linux). Must be used in combination'+\
                        ' with the --dry-run flag.')
 
 # Update-related options.
@@ -970,13 +970,13 @@ if (options.buildtests or options.runtests) and len(options.testtarget) == 0:
 # Operating system.
 if options.dryrun and options.dryrunplatform is not None:
   platform = options.dryrunplatform
-  if not platform in ['windows', 'macosx', 'linux']:
+  if not platform in ['windows', 'mac', 'linux']:
     print('Invalid dry-run-platform value: %s' % (platform))
     sys.exit()
 elif sys.platform == 'win32':
   platform = 'windows'
 elif sys.platform == 'darwin':
-  platform = 'macosx'
+  platform = 'mac'
 elif sys.platform.startswith('linux'):
   platform = 'linux'
 else:
@@ -1039,15 +1039,15 @@ if options.arm64build:
 
 deps_file = 'DEPS'
 
-if platform == 'macosx' and not options.x64build:
-  print('32-bit Mac OS X builds are not supported. ' +
+if platform == 'mac' and not options.x64build:
+  print('32-bit MacOS builds are not supported. ' +
         'Add --x64-build flag to generate a 64-bit build.')
   sys.exit()
 
 # Platforms that build a cef_sandbox library.
 sandbox_lib_platforms = ['windows']
 if branch_is_3538_or_newer:
-  sandbox_lib_platforms.append('macosx')
+  sandbox_lib_platforms.append('mac')
 
 if not platform in sandbox_lib_platforms and (options.sandboxdistrib or
                                               options.sandboxdistribonly):
@@ -1531,7 +1531,7 @@ elif not options.nobuild:
 if options.runtests:
   if platform == 'windows':
     test_exe = '%s.exe' % options.testtarget
-  elif platform == 'macosx':
+  elif platform == 'mac':
     test_exe = '%s.app/Contents/MacOS/%s' % (options.testtarget,
                                              options.testtarget)
   elif platform == 'linux':

tools/cef_api_hash.py

@@ -35,7 +35,7 @@ class cef_api_hash:
     self.__debug_enabled = not (self.__debugdir is
                                 None) and len(self.__debugdir) > 0
 
-    self.platforms = ["windows", "macosx", "linux"]
+    self.platforms = ["windows", "mac", "linux"]
 
     self.platform_files = {
         # List of includes_win_capi from cef_paths2.gypi.
@@ -43,7 +43,7 @@ class cef_api_hash:
             "internal/cef_types_win.h",
         ],
         # List of includes_mac_capi from cef_paths2.gypi.
-        "macosx": [
+        "mac": [
             "internal/cef_types_mac.h",
         ],
         # List of includes_linux_capi from cef_paths2.gypi.

tools/cefbuilds/cef_html_builder.py

@@ -126,7 +126,7 @@ class cef_html_builder:
         'linux64': 'Linux 64-bit',
         'linuxarm': 'Linux ARM',
         'linuxarm64': 'Linux ARM64',
-        'macosx64': 'Mac OS X 64-bit',
+        'macosx64': 'MacOS 64-bit',
         'windows32': 'Windows 32-bit',
         'windows64': 'Windows 64-bit'
     }[platform]

tools/gclient_hook.py

@@ -21,7 +21,7 @@ src_dir = os.path.abspath(os.path.join(cef_dir, os.pardir))
 if sys.platform == 'win32':
   platform = 'windows'
 elif sys.platform == 'darwin':
-  platform = 'macosx'
+  platform = 'mac'
 elif sys.platform.startswith('linux'):
   platform = 'linux'
 else:

tools/gn_args.py

@@ -75,7 +75,7 @@ src_dir = os.path.abspath(os.path.join(cef_dir, os.pardir))
 if sys.platform == 'win32':
   platform = 'windows'
 elif sys.platform == 'darwin':
-  platform = 'macosx'
+  platform = 'mac'
 elif sys.platform.startswith('linux'):
   platform = 'linux'
 else:
@@ -281,7 +281,7 @@ def GetRequiredArgs():
     # can't be enforced by assert().
     result['enable_linux_installer'] = False
 
-  if platform == 'macosx':
+  if platform == 'mac':
     # Always generate dSYM files. The make_distrib script will fail if
     # enable_dsyms=true is not explicitly set when is_official_build=false.
     result['enable_dsyms'] = True
@@ -330,7 +330,7 @@ def ValidateArgs(args):
   # - Windows supports "x86" and "x64".
   # - Mac supports only "x64".
   # - Linux supports only "x64" unless using a sysroot environment.
-  if platform == 'macosx':
+  if platform == 'mac':
     assert target_cpu == 'x64', 'target_cpu must be "x64"'
   elif platform == 'windows':
     assert target_cpu in (
@@ -546,7 +546,7 @@ def GetAllPlatformConfigs(build_args):
     supported_cpus = ['x86', 'x64']
     if os.environ.get('CEF_ENABLE_ARM64', '') == '1':
       supported_cpus.append('arm64')
-  elif platform == 'macosx':
+  elif platform == 'mac':
     supported_cpus = ['x64']
   else:
     raise Exception('Unsupported platform')
@@ -556,7 +556,7 @@ def GetAllPlatformConfigs(build_args):
       result['Debug_GN_' + cpu] = GetConfigArgs(args, True, cpu)
     result['Release_GN_' + cpu] = GetConfigArgs(args, False, cpu)
 
-    if platform in ('windows', 'macosx') and GetArgValue(
+    if platform in ('windows', 'mac') and GetArgValue(
         args, 'is_official_build'):
       # Build cef_sandbox.lib with a different configuration.
       if create_debug:
@@ -585,7 +585,7 @@ if __name__ == '__main__':
   # Allow override of the platform via the command-line for testing.
   if len(sys.argv) > 1:
     platform = sys.argv[1]
-    if not platform in ('linux', 'macosx', 'windows'):
+    if not platform in ('linux', 'mac', 'windows'):
       sys.stderr.write('Usage: %s <platform>\n' % sys.argv[0])
       sys.exit()
 

tools/make_api_hash_header.py

@@ -35,8 +35,8 @@ def make_api_hash_header(cpp_header_dir):
 #define CEF_API_HASH_UNIVERSAL "$UNIVERSAL$"
 #if defined(OS_WIN)
 #define CEF_API_HASH_PLATFORM "$WINDOWS$"
-#elif defined(OS_MACOSX)
-#define CEF_API_HASH_PLATFORM "$MACOSX$"
+#elif defined(OS_MAC)
+#define CEF_API_HASH_PLATFORM "$MAC$"
 #elif defined(OS_LINUX)
 #define CEF_API_HASH_PLATFORM "$LINUX$"
 #endif

tools/make_cmake.py

@@ -114,7 +114,7 @@ def process_cmake_template_segment(segment, segment_ct, cmake_path, variables):
   #  'includes': [
   #    'cefsimple_sources_common',
   #    'cefsimple_sources_win:WINDOWS',
-  #    'cefsimple_sources_mac:MACOSX',
+  #    'cefsimple_sources_mac:MAC',
   #    'cefsimple_sources_linux:LINUX',
   #  ],
   values = eval('{' + segment + '}', {'__builtins__': None}, None)

tools/make_distrib.py

@@ -94,7 +94,7 @@ def get_readme_component(name):
   # platform directory
   if platform == 'windows':
     platform_cmp = 'win'
-  elif platform == 'macosx':
+  elif platform == 'mac':
     platform_cmp = 'mac'
   elif platform == 'linux':
     platform_cmp = 'linux'
@@ -135,8 +135,8 @@ def create_readme():
 
   if platform == 'windows':
     platform_str = 'Windows'
-  elif platform == 'macosx':
-    platform_str = 'Mac OS-X'
+  elif platform == 'mac':
+    platform_str = 'MacOS'
   elif platform == 'linux':
     platform_str = 'Linux'
 
@@ -360,7 +360,7 @@ def combine_libs(platform, build_dir, libs, dest_lib):
   if platform == 'windows':
     cmdline = 'msvs_env.bat win%s "%s" combine_libs.py -o "%s"' % (
         platform_arch, sys.executable, dest_lib)
-  elif platform == 'macosx':
+  elif platform == 'mac':
     # Find CEF_EXPORT symbols from libcef_sandbox.a (include/cef_sandbox_mac.h)
     # Export only symbols that include these strings.
     symbol_match = [
@@ -544,7 +544,7 @@ platform = ''
 if sys.platform == 'win32':
   platform = 'windows'
 elif sys.platform == 'darwin':
-  platform = 'macosx'
+  platform = 'mac'
 elif sys.platform.startswith('linux'):
   platform = 'linux'
 
@@ -569,7 +569,7 @@ if options.arm64build and not platform in ('linux', 'windows'):
   print_error('--arm64-build is only supported on Linux and Windows.')
   sys.exit()
 
-if options.sandbox and not platform in ('macosx', 'windows'):
+if options.sandbox and not platform in ('mac', 'windows'):
   print_error('--sandbox is only supported on macOS and Windows.')
   sys.exit()
 
@@ -632,7 +632,10 @@ else:
 output_dir_base = 'cef_binary_' + cef_ver
 
 if options.distribsubdir == '':
-  output_dir_name = output_dir_base + '_' + platform + platform_arch
+  # For backwards compatibility keep the old default directory name on mac.
+  platform_name = 'macosx' if platform == 'mac' else platform
+
+  output_dir_name = output_dir_base + '_' + platform_name + platform_arch
   if options.distribsubdirsuffix != '':
     output_dir_name += '_' + options.distribsubdirsuffix
 else:
@@ -1001,7 +1004,7 @@ if platform == 'windows':
       # transfer contents
       copy_dir(src_dir, docs_output_dir, options.quiet)
 
-elif platform == 'macosx':
+elif platform == 'mac':
   framework_name = 'Chromium Embedded Framework'
   framework_dsym = '%s.dSYM' % framework_name
   cefclient_app = 'cefclient.app'