From 9f340ac40a473fdfaeb9db869849396d451f1cd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Thu, 28 Nov 2024 15:24:12 +0100 Subject: [PATCH] qtwebengine: bump version --- ...ngine-5.15.17-build-fixes-python3.patchset | 2586 -------- .../qtwebengine-5.15.17-x86-fixes.patchset | 278 - .../patches/qtwebengine-5.15.18.patchset | 389 ++ ... => qtwebengine-chromium-5.15.18.patchset} | 5359 ++++++----------- ...5.17.recipe => qtwebengine-5.15.18.recipe} | 22 +- 5 files changed, 2311 insertions(+), 6323 deletions(-) delete mode 100644 dev-qt/qtwebengine/patches/qtwebengine-5.15.17-build-fixes-python3.patchset delete mode 100644 dev-qt/qtwebengine/patches/qtwebengine-5.15.17-x86-fixes.patchset create mode 100644 dev-qt/qtwebengine/patches/qtwebengine-5.15.18.patchset rename dev-qt/qtwebengine/patches/{qtwebengine-5.15.17.patchset => qtwebengine-chromium-5.15.18.patchset} (64%) rename dev-qt/qtwebengine/{qtwebengine-5.15.17.recipe => qtwebengine-5.15.18.recipe} (90%) diff --git a/dev-qt/qtwebengine/patches/qtwebengine-5.15.17-build-fixes-python3.patchset b/dev-qt/qtwebengine/patches/qtwebengine-5.15.17-build-fixes-python3.patchset deleted file mode 100644 index ab0b637f8..000000000 --- a/dev-qt/qtwebengine/patches/qtwebengine-5.15.17-build-fixes-python3.patchset +++ /dev/null @@ -1,2586 +0,0 @@ -From 3c26a1e566be1a37b66f8c535a5d8b84630963eb Mon Sep 17 00:00:00 2001 -From: Ken Moffat -Date: Sat, 16 Dec 2023 18:57:13 +1000 -Subject: patches from Arch via gentoo to use python3 - - -diff --git a/configure.pri b/configure.pri -index 8be641c..c55ec5f 100644 ---- a/configure.pri -+++ b/configure.pri -@@ -7,20 +7,7 @@ QTWEBENGINE_SOURCE_TREE = $$PWD - equals(QMAKE_HOST.os, Windows): EXE_SUFFIX = .exe - - defineTest(isPythonVersionSupported) { -- python = $$system_quote($$system_path($$1)) -- python_version = $$system('$$python -c "import sys; print(sys.version_info[0:3])"') -- python_version ~= s/[()]//g -- python_version = $$split(python_version, ',') -- python_major_version = $$first(python_version) -- greaterThan(python_major_version, 2) { -- qtLog("Python version 3 is not supported by Chromium.") -- return(false) -- } -- python_minor_version = $$member(python_version, 1) -- python_patch_version = $$member(python_version, 2) -- greaterThan(python_major_version, 1): greaterThan(python_minor_version, 6): greaterThan(python_patch_version, 4): return(true) -- qtLog("Unsupported python version: $${python_major_version}.$${python_minor_version}.$${python_patch_version}.") -- return(false) -+ return(true) - } - - defineTest(qtConfTest_detectJumboBuild) { -@@ -52,22 +39,21 @@ defineTest(qtConfReport_jumboBuild) { - qtConfReportPadded($${1}, $$mergeLimit) - } - --defineTest(qtConfTest_detectPython2) { -- python = $$qtConfFindInPath("python2$$EXE_SUFFIX") -- isEmpty(python) { -- qtLog("'python2$$EXE_SUFFIX' not found in PATH. Checking for 'python$$EXE_SUFFIX'.") -- python = $$qtConfFindInPath("python$$EXE_SUFFIX") -+defineTest(qtConfTest_detectPython) { -+ python = $$qtConfFindInPath("python3$$EXE_SUFFIX") -+ isEmpty(python) { -+ qtLog("'python3$$EXE_SUFFIX' not found in PATH. Checking for 'python3$$EXE_SUFFIX'.") - } - isEmpty(python) { -- qtLog("'python$$EXE_SUFFIX' not found in PATH. Giving up.") -+ qtLog("'python3$$EXE_SUFFIX' not found in PATH. Giving up.") - return(false) - } - !isPythonVersionSupported($$python) { -- qtLog("A suitable Python 2 executable could not be located.") -+ qtLog("A suitable Python3 executable could not be located.") - return(false) - } - -- # Make tests.python2.location available in configure.json. -+ # Make tests.python.location available in configure.json. - $${1}.location = $$clean_path($$python) - export($${1}.location) - $${1}.cache += location -diff --git a/src/3rdparty/chromium/BUILD.gn b/src/3rdparty/chromium/BUILD.gn -index 5f6954b..e69038f 100644 ---- a/src/3rdparty/chromium/BUILD.gn -+++ b/src/3rdparty/chromium/BUILD.gn -@@ -239,7 +239,6 @@ group("gn_all") { - "//media/capture:capture_unittests", - "//media/cast:cast_unittests", - "//third_party/angle/src/tests:angle_white_box_tests", -- "//third_party/catapult/telemetry:bitmaptools($host_toolchain)", - ] - } else if (is_ios && !use_qt) { - deps += [ -@@ -354,7 +353,6 @@ group("gn_all") { - "//net/android:net_junit_tests", - "//services:services_junit_tests", - "//testing/android/junit:junit_unit_tests", -- "//third_party/catapult/devil", - "//third_party/smhasher:murmurhash3", - "//tools/android:android_tools", - "//tools/android:memconsumer", -@@ -948,7 +946,6 @@ if (is_chromeos) { - "//third_party/dawn/src/tests:dawn_unittests", - - # Blocked on https://github.com/catapult-project/catapult/issues/2297 -- #"//third_party/catapult/telemetry:bitmaptools", - "//tools/perf/clear_system_cache", - "//ui/ozone/gl:ozone_gl_unittests", - ] -@@ -1026,7 +1023,6 @@ if (!is_ios && !use_qt) { - data_deps = [ - "//chrome:chrome", - "//chrome/test/chromedriver", -- "//third_party/catapult/third_party/typ", - ] - if (is_win) { - data_deps += [ "//build/win:copy_cdb_to_output" ] -@@ -1073,7 +1069,6 @@ if (!is_ios && !use_qt) { - "//third_party/blink/public:blink_devtools_inspector_resources", - "//third_party/blink/public/mojom:mojom_platform_js_data_deps", - "//third_party/blink/renderer/core/html:js_files_for_form_controls_web_tests", -- "//third_party/catapult/third_party/typ", - "//third_party/mesa_headers", - "//tools/imagediff", - ] -@@ -1141,7 +1136,6 @@ if (!is_ios && !use_qt) { - - if (is_android) { - data += [ -- "//third_party/catapult/", - "//build/android/", - ] - } -@@ -1248,11 +1242,6 @@ if (!is_ios && !use_qt) { - "//third_party/blink/web_tests/StaleTestExpectations", - "//third_party/blink/web_tests/TestExpectations", - "//third_party/blink/web_tests/VirtualTestSuites", -- "//third_party/catapult/common/py_utils/", -- "//third_party/catapult/devil/", -- "//third_party/catapult/dependency_manager/", -- "//third_party/catapult/third_party/zipfile/", -- "//third_party/catapult/third_party/typ/", - "//third_party/depot_tools/pylint", - "//third_party/depot_tools/pylint-1.5", - "//third_party/depot_tools/pylint_main.py", -diff --git a/src/3rdparty/chromium/build/print_python_deps.py b/src/3rdparty/chromium/build/print_python_deps.py -index fd29c09..69af247 100755 ---- a/src/3rdparty/chromium/build/print_python_deps.py -+++ b/src/3rdparty/chromium/build/print_python_deps.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.7 -+#!/usr/bin/python - # Copyright 2016 The Chromium Authors. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. -@@ -80,7 +80,7 @@ def _GetTargetPythonVersion(module): - if shebang.startswith('#!'): - # Examples: - # '#!/usr/bin/python' -- # '#!/usr/bin/python2.7' -+ # '#!/usr/bin/python' - # '#!/usr/bin/python3' - # '#!/usr/bin/env python3' - # '#!/usr/bin/env vpython' -@@ -152,7 +152,7 @@ def main(): - - # Trybots run with vpython as default Python, but with a different config - # from //.vpython. To make the is_vpython test work, and to match the behavior -- # of dev machines, the shebang line must be run with python2.7. -+ # of dev machines, the shebang line must be run with python. - # - # E.g. $HOME/.vpython-root/dd50d3/bin/python - # E.g. /b/s/w/ir/cache/vpython/ab5c79/bin/python -diff --git a/src/3rdparty/chromium/chrome/chrome_paks.gni b/src/3rdparty/chromium/chrome/chrome_paks.gni -index 9323a77..0362b65 100644 ---- a/src/3rdparty/chromium/chrome/chrome_paks.gni -+++ b/src/3rdparty/chromium/chrome/chrome_paks.gni -@@ -94,7 +94,6 @@ template("chrome_extra_paks") { - "$root_gen_dir/chrome/common_resources.pak", - "$root_gen_dir/components/autofill/core/browser/autofill_address_rewriter_resources.pak", - "$root_gen_dir/components/components_resources.pak", -- "$root_gen_dir/content/browser/tracing/tracing_resources.pak", - "$root_gen_dir/content/content_resources.pak", - "$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak", - "$root_gen_dir/net/net_resources.pak", -@@ -110,7 +109,6 @@ template("chrome_extra_paks") { - "//components/autofill/core/browser:autofill_address_rewriter_resources", - "//components/resources", - "//content:content_resources", -- "//content/browser/tracing:resources", - "//mojo/public/js:resources", - "//net:net_resources", - "//skia:skia_resources", -diff --git a/src/3rdparty/chromium/chrome/test/BUILD.gn b/src/3rdparty/chromium/chrome/test/BUILD.gn -index 3c53323..38be116 100644 ---- a/src/3rdparty/chromium/chrome/test/BUILD.gn -+++ b/src/3rdparty/chromium/chrome/test/BUILD.gn -@@ -7103,8 +7103,6 @@ if (!is_fuchsia && !is_android) { - "//chrome/test/data/password/captured_sites/", - "//chrome/test/data/web_page_replay_go_helper_scripts/automation_helper.js", - "//components/test/data/autofill/web_page_replay_support_files/", -- "//third_party/catapult/telemetry/telemetry/bin/", -- "//third_party/catapult/web_page_replay_go/deterministic.js", - ] - - if (is_linux || is_chromeos || is_win) { -@@ -7141,7 +7139,6 @@ if (!is_fuchsia && !is_android) { - - # TODO(uwyiming@chromium.org) create a gn target for Web Page Replay Go (WPR Go) and only WPR Go. - # So that test targets requiring WPR Go does not pull down the whole telemetry tool chain. -- "//third_party/catapult:telemetry_chrome_test_support", - "//third_party/hunspell", - "//third_party/icu", - "//third_party/libpng", -@@ -7171,7 +7168,6 @@ if (!is_fuchsia && !is_android) { - deps = [ "//tools/perf/chrome_telemetry_build:telemetry_chrome_test" ] - - data = [ -- "//third_party/catapult/telemetry/telemetry/internal/bin/", - "//tools/perf/run_telemetry_tests", - - # For isolate contract. -@@ -7189,7 +7185,6 @@ if (!is_fuchsia && !is_android) { - group("telemetry_gpu_unittests") { - testonly = true - deps = [ -- "//third_party/catapult:telemetry_chrome_test_support", - "//tools/metrics:metrics_python_tests", - ] - data = [ -@@ -7313,7 +7308,6 @@ if (is_mac || is_win || is_android) { - "//testing/scripts", - "//testing/test_env.py", - "//testing/xvfb.py", -- "//third_party/catapult", - "//tools", - ] - } -diff --git a/src/3rdparty/chromium/components/bookmarks/browser/base_bookmark_model_observer.cc b/src/3rdparty/chromium/components/bookmarks/browser/base_bookmark_model_observer.cc -index 657a3c9..ad641a0 100644 ---- a/src/3rdparty/chromium/components/bookmarks/browser/base_bookmark_model_observer.cc -+++ b/src/3rdparty/chromium/components/bookmarks/browser/base_bookmark_model_observer.cc -@@ -2,6 +2,8 @@ - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - -+#include -+ - #include "components/bookmarks/browser/base_bookmark_model_observer.h" - - namespace bookmarks { -diff --git a/src/3rdparty/chromium/components/bookmarks/browser/bookmark_expanded_state_tracker.cc b/src/3rdparty/chromium/components/bookmarks/browser/bookmark_expanded_state_tracker.cc -index 4ad2afa..5c4596e 100644 ---- a/src/3rdparty/chromium/components/bookmarks/browser/bookmark_expanded_state_tracker.cc -+++ b/src/3rdparty/chromium/components/bookmarks/browser/bookmark_expanded_state_tracker.cc -@@ -2,6 +2,7 @@ - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - -+#include - #include "components/bookmarks/browser/bookmark_expanded_state_tracker.h" - - #include -diff --git a/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py b/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py -index 7422ead..1636551 100755 ---- a/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py -+++ b/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py -@@ -7,7 +7,7 @@ - Converts a given ASCII proto into a binary resource. - - """ -- -+from __future__ import print_function - import abc - import imp - import optparse -@@ -196,12 +196,12 @@ class BinaryProtoGenerator: - self._ImportProtoModules(opts.path) - - if not self.VerifyArgs(opts): -- print "Wrong arguments" -+ print("Wrong arguments") - return 1 - - try: - self._GenerateBinaryProtos(opts) - except Exception as e: -- print "ERROR: Failed to render binary version of %s:\n %s\n%s" % ( -- opts.infile, str(e), traceback.format_exc()) -+ print("ERROR: Failed to render binary version of %s:\n %s\n%s" % -+ (opts.infile, str(e), traceback.format_exc())) - return 1 -diff --git a/src/3rdparty/chromium/content/browser/BUILD.gn b/src/3rdparty/chromium/content/browser/BUILD.gn -index e9e1d56..00f4184 100644 ---- a/src/3rdparty/chromium/content/browser/BUILD.gn -+++ b/src/3rdparty/chromium/content/browser/BUILD.gn -@@ -2169,7 +2169,6 @@ jumbo_static_library("browser") { - if (!is_android) { - deps += [ - "//components/vector_icons", -- "//content/browser/tracing:resources", - ] - } - -diff --git a/src/3rdparty/chromium/content/browser/tracing/BUILD.gn b/src/3rdparty/chromium/content/browser/tracing/BUILD.gn -deleted file mode 100644 -index eac0599..0000000 ---- a/src/3rdparty/chromium/content/browser/tracing/BUILD.gn -+++ /dev/null -@@ -1,51 +0,0 @@ --# Copyright 2014 The Chromium Authors. All rights reserved. --# Use of this source code is governed by a BSD-style license that can be --# found in the LICENSE file. -- --import("//tools/grit/grit_rule.gni") -- --# generate_about_tracing puts its files in this directory --tracing_gen_dir = "$root_gen_dir/content/browser/tracing" -- --# The script just writes filename with no dirs to the .grd, so we always need --# this file to be in the same directory as the inputs. --tracing_grd = "$tracing_gen_dir/tracing_resources.grd" -- --action("generate_tracing_grd") { -- visibility = [ ":*" ] # Depend on ":resources" to get this. -- script = "generate_trace_viewer_grd.py" -- -- input_pages = [ -- "$tracing_gen_dir/about_tracing.html", -- "$tracing_gen_dir/about_tracing.js", -- ] -- inputs = input_pages -- outputs = [ tracing_grd ] -- -- args = rebase_path(input_pages, target_gen_dir) + [ -- "--output", -- rebase_path(tracing_grd, root_build_dir), -- ] -- -- deps = [ "//third_party/catapult/tracing:generate_about_tracing" ] --} -- --grit("resources") { -- source = tracing_grd -- -- # Required because the .grd is generated. -- enable_input_discovery_for_gn_analyze = false -- -- outputs = [ -- "grit/tracing_resources.h", -- "tracing_resources.pak", -- ] -- -- # resource_ids has an entry for our .grd file that looks like: -- # "<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.grd" -- # and what we pass here should make that resolve to our .grd file. -- defines = -- [ "SHARED_INTERMEDIATE_DIR=" + rebase_path(root_gen_dir, root_build_dir) ] -- -- deps = [ ":generate_tracing_grd" ] --} -diff --git a/src/3rdparty/chromium/content/browser/tracing/generate_trace_viewer_grd.py b/src/3rdparty/chromium/content/browser/tracing/generate_trace_viewer_grd.py -index 037f949..be393d2 100755 ---- a/src/3rdparty/chromium/content/browser/tracing/generate_trace_viewer_grd.py -+++ b/src/3rdparty/chromium/content/browser/tracing/generate_trace_viewer_grd.py -@@ -74,7 +74,7 @@ def main(argv): - for filename in parsed_args.source_files: - add_file_to_grd(doc, os.path.basename(filename)) - -- with open(parsed_args.output_filename, 'w') as output_file: -+ with open(parsed_args.output_filename, 'wb') as output_file: - output_file.write(doc.toxml(encoding='UTF-8')) - - -diff --git a/src/3rdparty/chromium/content/browser/tracing/tracing_ui.cc b/src/3rdparty/chromium/content/browser/tracing/tracing_ui.cc -index 2bffb5e..8965922 100644 ---- a/src/3rdparty/chromium/content/browser/tracing/tracing_ui.cc -+++ b/src/3rdparty/chromium/content/browser/tracing/tracing_ui.cc -@@ -27,7 +27,6 @@ - #include "base/strings/stringprintf.h" - #include "base/trace_event/trace_event.h" - #include "base/values.h" --#include "content/browser/tracing/grit/tracing_resources.h" - #include "content/browser/tracing/tracing_controller_impl.h" - #include "content/public/browser/browser_context.h" - #include "content/public/browser/browser_thread.h" -@@ -242,8 +241,6 @@ TracingUI::TracingUI(WebUI* web_ui) - WebUIDataSource* source = WebUIDataSource::Create(kChromeUITracingHost); - source->DisableTrustedTypesCSP(); - source->UseStringsJs(); -- source->SetDefaultResource(IDR_TRACING_HTML); -- source->AddResourcePath("tracing.js", IDR_TRACING_JS); - source->SetRequestFilter(base::BindRepeating(OnShouldHandleRequest), - base::BindRepeating(OnTracingRequest)); - WebUIDataSource::Add(browser_context, source); -diff --git a/src/3rdparty/chromium/content/shell/BUILD.gn b/src/3rdparty/chromium/content/shell/BUILD.gn -index f7a0c95..e7e8932 100644 ---- a/src/3rdparty/chromium/content/shell/BUILD.gn -+++ b/src/3rdparty/chromium/content/shell/BUILD.gn -@@ -396,7 +396,6 @@ repack("pak") { - sources = [ - "$root_gen_dir/content/app/resources/content_resources_100_percent.pak", - "$root_gen_dir/content/browser/resources/media/media_internals_resources.pak", -- "$root_gen_dir/content/browser/tracing/tracing_resources.pak", - "$root_gen_dir/content/browser/webrtc/resources/webrtc_internals_resources.pak", - "$root_gen_dir/content/content_resources.pak", - "$root_gen_dir/content/dev_ui_content_resources.pak", -@@ -419,7 +418,6 @@ repack("pak") { - "//content:dev_ui_content_resources", - "//content/app/resources", - "//content/browser/resources/media:media_internals_resources", -- "//content/browser/tracing:resources", - "//content/browser/webrtc/resources", - "//mojo/public/js:resources", - "//net:net_resources", -diff --git a/src/3rdparty/chromium/fuchsia/engine/BUILD.gn b/src/3rdparty/chromium/fuchsia/engine/BUILD.gn -index a502b7f..39df2a7 100644 ---- a/src/3rdparty/chromium/fuchsia/engine/BUILD.gn -+++ b/src/3rdparty/chromium/fuchsia/engine/BUILD.gn -@@ -43,7 +43,6 @@ repack("web_engine_pak") { - "$root_gen_dir/components/components_resources.pak", - "$root_gen_dir/components/strings/components_strings_en-US.pak", - "$root_gen_dir/content/app/resources/content_resources_100_percent.pak", -- "$root_gen_dir/content/browser/tracing/tracing_resources.pak", - "$root_gen_dir/content/content_resources.pak", - "$root_gen_dir/content/dev_ui_content_resources.pak", - "$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak", -@@ -66,7 +65,6 @@ repack("web_engine_pak") { - "//content:content_resources", - "//content:dev_ui_content_resources", - "//content/app/resources", -- "//content/browser/tracing:resources", - "//gpu/command_buffer/service", - "//mojo/public/js:resources", - "//net:net_resources", -diff --git a/src/3rdparty/chromium/headless/BUILD.gn b/src/3rdparty/chromium/headless/BUILD.gn -index fb3cfde..fb54a15 100644 ---- a/src/3rdparty/chromium/headless/BUILD.gn -+++ b/src/3rdparty/chromium/headless/BUILD.gn -@@ -37,7 +37,6 @@ repack("pak") { - "$root_gen_dir/components/components_resources.pak", - "$root_gen_dir/components/strings/components_strings_en-US.pak", - "$root_gen_dir/content/app/resources/content_resources_100_percent.pak", -- "$root_gen_dir/content/browser/tracing/tracing_resources.pak", - "$root_gen_dir/content/content_resources.pak", - "$root_gen_dir/content/dev_ui_content_resources.pak", - "$root_gen_dir/headless/headless_lib_resources.pak", -@@ -65,7 +64,6 @@ repack("pak") { - "//content:content_resources", - "//content:dev_ui_content_resources", - "//content/app/resources", -- "//content/browser/tracing:resources", - "//mojo/public/js:resources", - "//net:net_resources", - "//third_party/blink/public:resources", -diff --git a/src/3rdparty/chromium/mojo/public/tools/BUILD.gn b/src/3rdparty/chromium/mojo/public/tools/BUILD.gn -index 4c68350..1cc0125 100644 ---- a/src/3rdparty/chromium/mojo/public/tools/BUILD.gn -+++ b/src/3rdparty/chromium/mojo/public/tools/BUILD.gn -@@ -14,5 +14,4 @@ group("mojo_python_unittests") { - "//testing/xvfb.py", - ] - deps = [ "//mojo/public/tools/mojom/mojom:tests" ] -- data_deps = [ "//third_party/catapult/third_party/typ/" ] - } -diff --git a/src/3rdparty/chromium/mojo/public/tools/bindings/BUILD.gn b/src/3rdparty/chromium/mojo/public/tools/bindings/BUILD.gn -index fc04b5d..708958e 100644 ---- a/src/3rdparty/chromium/mojo/public/tools/bindings/BUILD.gn -+++ b/src/3rdparty/chromium/mojo/public/tools/bindings/BUILD.gn -@@ -2,9 +2,11 @@ - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - -+import("//build/config/python.gni") - import("//mojo/public/tools/bindings/mojom.gni") - import("//third_party/jinja2/jinja2.gni") - -+# TODO(crbug.com/1194274): Investigate nondeterminism in Py3 builds. - action("precompile_templates") { - sources = mojom_generator_sources - sources += [ -diff --git a/src/3rdparty/chromium/mojo/public/tools/bindings/gen_data_files_list.py b/src/3rdparty/chromium/mojo/public/tools/bindings/gen_data_files_list.py -index 79c9e50..8b78d09 100644 ---- a/src/3rdparty/chromium/mojo/public/tools/bindings/gen_data_files_list.py -+++ b/src/3rdparty/chromium/mojo/public/tools/bindings/gen_data_files_list.py -@@ -18,7 +18,6 @@ import os - import re - import sys - --from cStringIO import StringIO - from optparse import OptionParser - - sys.path.insert( -@@ -41,12 +40,9 @@ def main(): - pattern = re.compile(options.pattern) - files = [f for f in os.listdir(options.directory) if pattern.match(f)] - -- stream = StringIO() -- for f in files: -- print(f, file=stream) -+ contents = '\n'.join(f for f in files) + '\n' -+ WriteFile(contents, options.output) - -- WriteFile(stream.getvalue(), options.output) -- stream.close() - - if __name__ == '__main__': - sys.exit(main()) -diff --git a/src/3rdparty/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py b/src/3rdparty/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py -index 96b2fdf..00b9dcc 100644 ---- a/src/3rdparty/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py -+++ b/src/3rdparty/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py -@@ -25,6 +25,10 @@ sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, - 'build', 'android', 'gyp')) - from util import build_utils - -+# TODO(crbug.com/1174969): Remove this once Python2 is obsoleted. -+if sys.version_info.major != 2: -+ basestring = str -+ long = int - - GENERATOR_PREFIX = 'java' - -diff --git a/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator.py b/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator.py -index de62260..4a1c73f 100644 ---- a/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator.py -+++ b/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator.py -@@ -136,9 +136,14 @@ class Stylizer(object): - - def WriteFile(contents, full_path): - # If |contents| is same with the file content, we skip updating. -+ if not isinstance(contents, bytes): -+ data = contents.encode('utf8') -+ else: -+ data = contents -+ - if os.path.isfile(full_path): - with open(full_path, 'rb') as destination_file: -- if destination_file.read() == contents: -+ if destination_file.read() == data: - return - - # Make sure the containing directory exists. -@@ -146,11 +151,8 @@ def WriteFile(contents, full_path): - fileutil.EnsureDirectoryExists(full_dir) - - # Dump the data to disk. -- with open(full_path, "wb") as f: -- if not isinstance(contents, bytes): -- f.write(contents.encode('utf-8')) -- else: -- f.write(contents) -+ with open(full_path, 'wb') as f: -+ f.write(data) - - - def AddComputedData(module): -diff --git a/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/module.py b/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/module.py -index ebbc9b3..3d02642 100644 ---- a/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/module.py -+++ b/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/module.py -@@ -398,7 +398,8 @@ class Field(object): - - - class StructField(Field): -- pass -+ def __hash__(self): -+ return super(Field, self).__hash__() - - - class UnionField(Field): -diff --git a/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py b/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py -index 7a30056..8d9e26f 100644 ---- a/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py -+++ b/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py -@@ -75,9 +75,9 @@ def PrecompileTemplates(generator_modules, output_dir): - os.path.dirname(module.__file__), generator.GetTemplatePrefix()) - ])) - jinja_env.filters.update(generator.GetFilters()) -- jinja_env.compile_templates( -- os.path.join(output_dir, "%s.zip" % generator.GetTemplatePrefix()), -- extensions=["tmpl"], -- zip="stored", -- py_compile=True, -- ignore_errors=False) -+ jinja_env.compile_templates(os.path.join( -+ output_dir, "%s.zip" % generator.GetTemplatePrefix()), -+ extensions=["tmpl"], -+ zip="stored", -+ py_compile=sys.version_info.major < 3, -+ ignore_errors=False) -diff --git a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc -index 5e650d9..6ed415a 100644 ---- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc -+++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc -@@ -158,7 +158,15 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno, - return Allow(); - #endif - -- if (SyscallSets::IsClockApi(sysno)) { -+ if (sysno == __NR_clock_gettime || sysno == __NR_clock_nanosleep -+#if defined(__NR_clock_gettime64) -+ || sysno == __NR_clock_gettime64 -+#endif -+#if defined(__NR_clock_nanosleep_time64) -+ || sysno == __NR_clock_nanosleep_time64 -+#endif -+ ) { -+ - return RestrictClockID(); - } - -diff --git a/src/3rdparty/chromium/testing/BUILD.gn b/src/3rdparty/chromium/testing/BUILD.gn -index 56ebf8d..7d51bc0 100644 ---- a/src/3rdparty/chromium/testing/BUILD.gn -+++ b/src/3rdparty/chromium/testing/BUILD.gn -@@ -27,7 +27,6 @@ group("run_perf_test") { - - data_deps = [ - ":test_scripts_shared", -- "//third_party/catapult/tracing:convert_chart_json", - ] - - if (is_android) { -diff --git a/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp b/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp -index 013f1df..3ce63c1 100644 ---- a/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp -+++ b/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp -@@ -9,6 +9,7 @@ - - #include "libANGLE/HandleAllocator.h" - -+#include - #include - #include - -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py -index 3225ecc..fc078d3 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py -@@ -344,7 +344,7 @@ def make_default_value_expr(idl_type, default_value): - """ - assert default_value.is_type_compatible_with(idl_type) - -- class DefaultValueExpr: -+ class DefaultValueExpr(object): - _ALLOWED_SYMBOLS_IN_DEPS = ("isolate") - - def __init__(self, initializer_expr, initializer_deps, -@@ -502,7 +502,7 @@ def make_v8_to_blink_value(blink_var_name, - assert isinstance(blink_var_name, str) - assert isinstance(v8_value_expr, str) - assert isinstance(idl_type, web_idl.IdlType) -- assert (argument_index is None or isinstance(argument_index, (int, long))) -+ assert (argument_index is None or isinstance(argument_index, int)) - assert (default_value is None - or isinstance(default_value, web_idl.LiteralConstant)) - -@@ -622,7 +622,7 @@ def make_v8_to_blink_value_variadic(blink_var_name, v8_array, - """ - assert isinstance(blink_var_name, str) - assert isinstance(v8_array, str) -- assert isinstance(v8_array_start_index, (int, long)) -+ assert isinstance(v8_array_start_index, int) - assert isinstance(idl_type, web_idl.IdlType) - - pattern = ("auto&& ${{{_1}}} = " -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py -index 4a6df51..8b51f23 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py -@@ -177,7 +177,7 @@ def generate_callback_interface(callback_interface_identifier): - prop_install_mode=PropInstallMode.UNCONDITIONAL, - trampoline_var_name=None, - attribute_entries=[], -- constant_entries=filter(is_unconditional, constant_entries), -+ constant_entries=list(filter(is_unconditional, constant_entries)), - exposed_construct_entries=[], - operation_entries=[]) - (install_interface_template_decl, install_interface_template_def, -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py -index 52972fe..e5ae9d9 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py -@@ -503,13 +503,13 @@ class CompositeNode(CodeNode): - gensym_kwargs = {} - template_vars = {} - for arg in args: -- assert isinstance(arg, (CodeNode, int, long, str)) -+ assert isinstance(arg, (CodeNode, int, str)) - gensym = CodeNode.gensym() - gensym_args.append("${{{}}}".format(gensym)) - template_vars[gensym] = arg - for key, value in kwargs.items(): -- assert isinstance(key, (int, long, str)) -- assert isinstance(value, (CodeNode, int, long, str)) -+ assert isinstance(key, (int, str)) -+ assert isinstance(value, (CodeNode, int, str)) - gensym = CodeNode.gensym() - gensym_kwargs[key] = "${{{}}}".format(gensym) - template_vars[gensym] = value -@@ -602,7 +602,7 @@ class ListNode(CodeNode): - def insert(self, index, node): - if node is None: - return -- assert isinstance(index, (int, long)) -+ assert isinstance(index, int) - assert isinstance(node, CodeNode) - assert node.outer is None and node.prev is None - -@@ -721,7 +721,7 @@ class SymbolScopeNode(SequenceNode): - if not scope_chains: - return counts - -- self_index = iter(scope_chains).next().index(self) -+ self_index = next(iter(scope_chains)).index(self) - scope_chains = map( - lambda scope_chain: scope_chain[self_index + 1:], scope_chains) - scope_to_likeliness = {} -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py -index a229a6c..5fa288d 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py -@@ -109,7 +109,7 @@ def expr_and(terms): - - if any(term.is_always_false for term in terms): - return _Expr(False) -- terms = filter(lambda x: not x.is_always_true, terms) -+ terms = list(filter(lambda x: not x.is_always_true, terms)) - if not terms: - return _Expr(True) - if len(terms) == 1: -@@ -124,7 +124,7 @@ def expr_or(terms): - - if any(term.is_always_true for term in terms): - return _Expr(True) -- terms = filter(lambda x: not x.is_always_false, terms) -+ terms = list(filter(lambda x: not x.is_always_false, terms)) - if not terms: - return _Expr(False) - if len(terms) == 1: -@@ -222,7 +222,7 @@ def expr_from_exposure(exposure, - elif exposure.only_in_secure_contexts is False: - secure_context_term = _Expr(True) - else: -- terms = map(ref_enabled, exposure.only_in_secure_contexts) -+ terms = list(map(ref_enabled, exposure.only_in_secure_contexts)) - secure_context_term = expr_or( - [_Expr("${is_in_secure_context}"), - expr_not(expr_and(terms))]) -@@ -275,10 +275,11 @@ def expr_from_exposure(exposure, - - # [ContextEnabled] - if exposure.context_enabled_features: -- terms = map( -- lambda feature: _Expr( -- "${{context_feature_settings}}->is{}Enabled()".format( -- feature)), exposure.context_enabled_features) -+ terms = list( -+ map( -+ lambda feature: _Expr( -+ "${{context_feature_settings}}->is{}Enabled()".format( -+ feature)), exposure.context_enabled_features)) - context_enabled_terms.append( - expr_and([_Expr("${context_feature_settings}"), - expr_or(terms)])) -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py -index 87d26ee..f3e9d38 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py -@@ -23,7 +23,7 @@ class _TemplateFormatter(string.Formatter): - self._template_formatter_indexing_count_ = 0 - - def get_value(self, key, args, kwargs): -- if isinstance(key, (int, long)): -+ if isinstance(key, int): - return args[key] - assert isinstance(key, str) - if not key: -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py -index 2bcc4fe..e72282a 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py -@@ -116,4 +116,4 @@ def write_code_node_to_file(code_node, filepath): - # stderr=format_result.error_message)) - # - # web_idl.file_io.write_to_file_if_changed(filepath, format_result.contents) -- web_idl.file_io.write_to_file_if_changed(filepath, rendered_text) -+ web_idl.file_io.write_to_file_if_changed(filepath, rendered_text.encode('utf-8')) -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py -index b39f010..4d68202 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py -@@ -993,7 +993,7 @@ def make_dict_trace_func(cg_context): - _2 = _blink_member_name(member).value_var - return TextNode(_format(pattern, _1=_1, _2=_2)) - -- body.extend(map(make_trace_member_node, own_members)) -+ body.extend(list(map(make_trace_member_node, own_members))) - body.append(TextNode("BaseClass::Trace(visitor);")) - - return func_decl, func_def -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py -index 10ff306..bfdf712 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py -@@ -582,7 +582,7 @@ def _make_blink_api_call(code_node, - overriding_args=None): - assert isinstance(code_node, SymbolScopeNode) - assert isinstance(cg_context, CodeGenContext) -- assert num_of_args is None or isinstance(num_of_args, (int, long)) -+ assert num_of_args is None or isinstance(num_of_args, int) - assert (overriding_args is None - or (isinstance(overriding_args, (list, tuple)) - and all(isinstance(arg, str) for arg in overriding_args))) -@@ -1196,8 +1196,10 @@ def make_overload_dispatcher(cg_context): - did_use_break = did_use_break or can_fail - - conditional = expr_or( -- map(lambda item: expr_from_exposure(item.function_like.exposure), -- items)) -+ list( -+ map( -+ lambda item: expr_from_exposure(item.function_like.exposure -+ ), items))) - if not conditional.is_always_true: - node = CxxUnlikelyIfNode(cond=conditional, body=node) - -@@ -4642,7 +4644,7 @@ class _PropEntryConstructorGroup(_PropEntryBase): - def __init__(self, is_context_dependent, exposure_conditional, world, - constructor_group, ctor_callback_name, ctor_func_length): - assert isinstance(ctor_callback_name, str) -- assert isinstance(ctor_func_length, (int, long)) -+ assert isinstance(ctor_func_length, int) - - _PropEntryBase.__init__(self, is_context_dependent, - exposure_conditional, world, constructor_group) -@@ -4670,7 +4672,7 @@ class _PropEntryOperationGroup(_PropEntryBase): - op_func_length, - no_alloc_direct_callback_name=None): - assert isinstance(op_callback_name, str) -- assert isinstance(op_func_length, (int, long)) -+ assert isinstance(op_func_length, int) - - _PropEntryBase.__init__(self, is_context_dependent, - exposure_conditional, world, operation_group) -@@ -5175,9 +5177,9 @@ def make_install_interface_template(cg_context, function_name, class_name, api_c - ]) - - if class_like.identifier == "CSSStyleDeclaration": -- css_properties = filter( -- lambda attr: "CSSProperty" in attr.extended_attributes, -- class_like.attributes) -+ css_properties = list( -+ filter(lambda attr: "CSSProperty" in attr.extended_attributes, -+ class_like.attributes)) - if css_properties: - prop_name_list = "".join( - map(lambda attr: "\"{}\", ".format(attr.identifier), -@@ -5567,8 +5569,8 @@ ${instance_object} = ${v8_context}->Global()->GetPrototype().As();\ - "V8DOMConfiguration::InstallConstants(${isolate}, " - "${interface_template}, ${prototype_template}, " - "kConstantCallbackTable, base::size(kConstantCallbackTable));") -- constant_callback_entries = filter(lambda entry: entry.const_callback_name, -- constant_entries) -+ constant_callback_entries = list(filter(lambda entry: entry.const_callback_name, -+ constant_entries)) - install_properties(table_name, constant_callback_entries, - _make_constant_callback_registration_table, - installer_call_text) -@@ -5584,8 +5586,8 @@ ${instance_object} = ${v8_context}->Global()->GetPrototype().As();\ - "V8DOMConfiguration::InstallConstants(${isolate}, " - "${interface_template}, ${prototype_template}, " - "kConstantValueTable, base::size(kConstantValueTable));") -- constant_value_entries = filter( -- lambda entry: not entry.const_callback_name, constant_entries) -+ constant_value_entries = list(filter( -+ lambda entry: not entry.const_callback_name, constant_entries)) - install_properties(table_name, constant_value_entries, - _make_constant_value_registration_table, - installer_call_text) -@@ -6336,8 +6338,8 @@ def make_v8_context_snapshot_api(cg_context, component, attribute_entries, - assert isinstance(component, web_idl.Component) - - derived_interfaces = cg_context.interface.deriveds -- derived_names = map(lambda interface: interface.identifier, -- derived_interfaces) -+ derived_names = list( -+ map(lambda interface: interface.identifier, derived_interfaces)) - derived_names.append(cg_context.interface.identifier) - if not ("Window" in derived_names or "HTMLDocument" in derived_names): - return None, None -@@ -6411,9 +6413,11 @@ def _make_v8_context_snapshot_get_reference_table_function( - collect_callbacks(named_properties_object_callback_defs) - collect_callbacks(cross_origin_property_callback_defs) - -- entry_nodes = map( -- lambda name: TextNode("reinterpret_cast({}),".format(name)), -- filter(None, callback_names)) -+ entry_nodes = list( -+ map( -+ lambda name: TextNode("reinterpret_cast({}),".format(name -+ )), -+ filter(None, callback_names))) - table_node = ListNode([ - TextNode("using namespace ${class_name}Callbacks;"), - TextNode("static const intptr_t kReferenceTable[] = {"), -@@ -6451,10 +6455,11 @@ def _make_v8_context_snapshot_install_props_per_context_function( - class_name=None, - prop_install_mode=PropInstallMode.V8_CONTEXT_SNAPSHOT, - trampoline_var_name=None, -- attribute_entries=filter(selector, attribute_entries), -- constant_entries=filter(selector, constant_entries), -- exposed_construct_entries=filter(selector, exposed_construct_entries), -- operation_entries=filter(selector, operation_entries)) -+ attribute_entries=list(filter(selector, attribute_entries)), -+ constant_entries=list(filter(selector, constant_entries)), -+ exposed_construct_entries=list( -+ filter(selector, exposed_construct_entries)), -+ operation_entries=list(filter(selector, operation_entries))) - - return func_decl, func_def - -@@ -6810,11 +6815,11 @@ def generate_interface(interface_identifier): - class_name=impl_class_name, - prop_install_mode=PropInstallMode.UNCONDITIONAL, - trampoline_var_name=tp_install_unconditional_props, -- attribute_entries=filter(is_unconditional, attribute_entries), -- constant_entries=filter(is_unconditional, constant_entries), -- exposed_construct_entries=filter(is_unconditional, -- exposed_construct_entries), -- operation_entries=filter(is_unconditional, operation_entries)) -+ attribute_entries=list(filter(is_unconditional, attribute_entries)), -+ constant_entries=list(filter(is_unconditional, constant_entries)), -+ exposed_construct_entries=list( -+ filter(is_unconditional, exposed_construct_entries)), -+ operation_entries=list(filter(is_unconditional, operation_entries))) - (install_context_independent_props_decl, - install_context_independent_props_def, - install_context_independent_props_trampoline) = make_install_properties( -@@ -6823,11 +6828,14 @@ def generate_interface(interface_identifier): - class_name=impl_class_name, - prop_install_mode=PropInstallMode.CONTEXT_INDEPENDENT, - trampoline_var_name=tp_install_context_independent_props, -- attribute_entries=filter(is_context_independent, attribute_entries), -- constant_entries=filter(is_context_independent, constant_entries), -- exposed_construct_entries=filter(is_context_independent, -- exposed_construct_entries), -- operation_entries=filter(is_context_independent, operation_entries)) -+ attribute_entries=list( -+ filter(is_context_independent, attribute_entries)), -+ constant_entries=list(filter(is_context_independent, -+ constant_entries)), -+ exposed_construct_entries=list( -+ filter(is_context_independent, exposed_construct_entries)), -+ operation_entries=list( -+ filter(is_context_independent, operation_entries))) - (install_context_dependent_props_decl, install_context_dependent_props_def, - install_context_dependent_props_trampoline) = make_install_properties( - cg_context, -@@ -6835,11 +6843,13 @@ def generate_interface(interface_identifier): - class_name=impl_class_name, - prop_install_mode=PropInstallMode.CONTEXT_DEPENDENT, - trampoline_var_name=tp_install_context_dependent_props, -- attribute_entries=filter(is_context_dependent, attribute_entries), -- constant_entries=filter(is_context_dependent, constant_entries), -- exposed_construct_entries=filter(is_context_dependent, -- exposed_construct_entries), -- operation_entries=filter(is_context_dependent, operation_entries)) -+ attribute_entries=list(filter(is_context_dependent, -+ attribute_entries)), -+ constant_entries=list(filter(is_context_dependent, constant_entries)), -+ exposed_construct_entries=list( -+ filter(is_context_dependent, exposed_construct_entries)), -+ operation_entries=list(filter(is_context_dependent, -+ operation_entries))) - (install_interface_template_decl, install_interface_template_def, - install_interface_template_trampoline) = make_install_interface_template( - cg_context, -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py -index b4c7055..f3a2fcd 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py -@@ -105,7 +105,7 @@ class MakoRenderer(object): - on_error = self._caller_stack_on_error - if (len(current) <= len(on_error) - and all(current[i] == on_error[i] -- for i in xrange(len(current)))): -+ for i in range(len(current)))): - pass # Error happened in a deeper caller. - else: - self._caller_stack_on_error = list(self._caller_stack) -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py -index f37b40a..899a85e 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py -@@ -73,8 +73,13 @@ def gn_format(contents, filename=None): - - - def _invoke_format_command(command_line, filename, contents): -- proc = subprocess.Popen( -- command_line, stdin=subprocess.PIPE, stdout=subprocess.PIPE) -+ kwargs = {} -+ if sys.version_info.major != 2: -+ kwargs['encoding'] = 'utf-8' -+ proc = subprocess.Popen(command_line, -+ stdin=subprocess.PIPE, -+ stdout=subprocess.PIPE, -+ **kwargs) - stdout_output, stderr_output = proc.communicate(input=contents) - exit_code = proc.wait() - -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py -index 0d8f4c0..e666a9b 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py -@@ -2,6 +2,7 @@ - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - -+import functools - import multiprocessing - - from .package_initializer import package_initializer -@@ -76,7 +77,7 @@ class TaskQueue(object): - if not report_progress: - return - -- done_count = reduce( -+ done_count = functools.reduce( - lambda count, worker_task: count + bool(worker_task.ready()), - self._worker_tasks, 0) - report_progress(len(self._worker_tasks), done_count) -@@ -85,4 +86,4 @@ class TaskQueue(object): - def _task_queue_run_tasks(tasks): - for task in tasks: - func, args, kwargs = task -- apply(func, args, kwargs) -+ func(*args, **kwargs) -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py -index e8280be..e49e6eb 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py -@@ -13,6 +13,7 @@ import re - import sys - - from idl_types import set_ancestors, IdlType -+from itertools import groupby - from v8_globals import includes - from v8_interface import constant_filters - from v8_types import set_component_dirs -@@ -43,6 +44,7 @@ TEMPLATES_DIR = os.path.normpath( - # after path[0] == invoking script dir - sys.path.insert(1, THIRD_PARTY_DIR) - import jinja2 -+from jinja2.filters import make_attrgetter, environmentfilter - - - def generate_indented_conditional(code, conditional): -@@ -88,6 +90,13 @@ def runtime_enabled_if(code, name): - return generate_indented_conditional(code, function) - - -+@environmentfilter -+def do_stringify_key_group_by(environment, value, attribute): -+ expr = make_attrgetter(environment, attribute) -+ key = lambda item: '' if expr(item) is None else str(expr(item)) -+ return groupby(sorted(value, key=key), expr) -+ -+ - def initialize_jinja_env(cache_dir): - jinja_env = jinja2.Environment( - loader=jinja2.FileSystemLoader(TEMPLATES_DIR), -@@ -117,6 +126,7 @@ def initialize_jinja_env(cache_dir): - }) - jinja_env.filters.update(constant_filters()) - jinja_env.filters.update(method_filters()) -+ jinja_env.filters["stringifykeygroupby"] = do_stringify_key_group_by - return jinja_env - - -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py -index 130004e..04c0fab 100755 ---- a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py -@@ -80,7 +80,7 @@ def read_idl_file(reader, idl_filename): - assert len(interfaces) == 1, ( - "Expected one interface in file %r, found %d" % - (idl_filename, len(interfaces))) -- return (interfaces.values()[0], includes) -+ return (list(interfaces.values())[0], includes) - - - def interface_is_global(interface): -@@ -281,7 +281,7 @@ def main(): - - info_provider = create_component_info_provider( - os.path.normpath(options.info_dir), options.target_component) -- idl_filenames = map(str.strip, open(options.idl_files_list)) -+ idl_filenames = list(map(str.strip, open(options.idl_files_list))) - - generate_origin_trial_features(info_provider, options, idl_filenames) - return 0 -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py -index 14e6e9d..b027818 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py -@@ -394,7 +394,8 @@ class IdlInterface(object): - else: - raise ValueError('Unrecognized node class: %s' % child_class) - -- if len(filter(None, [self.iterable, self.maplike, self.setlike])) > 1: -+ if len(list(filter(None, -+ [self.iterable, self.maplike, self.setlike]))) > 1: - raise ValueError( - 'Interface can only have one of iterable<>, maplike<> and setlike<>.' - ) -@@ -512,6 +513,9 @@ class IdlAttribute(TypedObject): - def accept(self, visitor): - visitor.visit_attribute(self) - -+ def __lt__(self, other): -+ return self.name < other.name -+ - - ################################################################################ - # Constants -@@ -852,7 +856,7 @@ class IdlIncludes(object): - ################################################################################ - - --class Exposure: -+class Exposure(object): - """An Exposure holds one Exposed or RuntimeEnabled condition. - Each exposure has two properties: exposed and runtime_enabled. - Exposure(e, r) corresponds to [Exposed(e r)]. Exposure(e) corresponds to -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py -index 8d72865..b80eebd 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py -@@ -55,8 +55,8 @@ def validate_blink_idl_definitions(idl_filename, idl_file_basename, - definitions. There is no filename convention in this case. - - Otherwise, an IDL file is invalid. - """ -- targets = ( -- definitions.interfaces.values() + definitions.dictionaries.values()) -+ targets = (list(definitions.interfaces.values()) + -+ list(definitions.dictionaries.values())) - number_of_targets = len(targets) - if number_of_targets > 1: - raise Exception( -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py -index cd4f0c3..ab95e9c 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py -@@ -349,7 +349,7 @@ class IdlUnionType(IdlTypeBase): - return True - - def single_matching_member_type(self, predicate): -- matching_types = filter(predicate, self.flattened_member_types) -+ matching_types = list(filter(predicate, self.flattened_member_types)) - if len(matching_types) > 1: - raise ValueError('%s is ambiguous.' % self.name) - return matching_types[0] if matching_types else None -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/utilities.py b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/utilities.py -index e1677ee..3c5006f 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/utilities.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/utilities.py -@@ -196,8 +196,9 @@ class ComponentInfoProviderModules(ComponentInfoProvider): - - @property - def callback_functions(self): -- return dict(self._component_info_core['callback_functions'].items() + -- self._component_info_modules['callback_functions'].items()) -+ return dict( -+ list(self._component_info_core['callback_functions'].items()) + -+ list(self._component_info_modules['callback_functions'].items())) - - @property - def specifier_for_export(self): -@@ -209,8 +210,8 @@ class ComponentInfoProviderModules(ComponentInfoProvider): - - - def load_interfaces_info_overall_pickle(info_dir): -- with open(os.path.join(info_dir, -- 'interfaces_info.pickle')) as interface_info_file: -+ with open(os.path.join(info_dir, 'interfaces_info.pickle'), -+ mode='rb') as interface_info_file: - return pickle.load(interface_info_file) - - -@@ -236,23 +237,20 @@ def merge_dict_recursively(target, diff): - - def create_component_info_provider_core(info_dir): - interfaces_info = load_interfaces_info_overall_pickle(info_dir) -- with open( -- os.path.join(info_dir, 'core', -- 'component_info_core.pickle')) as component_info_file: -+ with open(os.path.join(info_dir, 'core', 'component_info_core.pickle'), -+ mode='rb') as component_info_file: - component_info = pickle.load(component_info_file) - return ComponentInfoProviderCore(interfaces_info, component_info) - - - def create_component_info_provider_modules(info_dir): - interfaces_info = load_interfaces_info_overall_pickle(info_dir) -- with open( -- os.path.join(info_dir, 'core', -- 'component_info_core.pickle')) as component_info_file: -+ with open(os.path.join(info_dir, 'core', 'component_info_core.pickle'), -+ mode='rb') as component_info_file: - component_info_core = pickle.load(component_info_file) -- with open( -- os.path.join( -- info_dir, 'modules', -- 'component_info_modules.pickle')) as component_info_file: -+ with open(os.path.join(info_dir, 'modules', -+ 'component_info_modules.pickle'), -+ mode='rb') as component_info_file: - component_info_modules = pickle.load(component_info_file) - return ComponentInfoProviderModules(interfaces_info, component_info_core, - component_info_modules) -@@ -356,7 +354,7 @@ def write_pickle_file(pickle_filename, data): - pickle_filename = abs(pickle_filename) - # If |data| is same with the file content, we skip updating. - if os.path.isfile(pickle_filename): -- with open(pickle_filename) as pickle_file: -+ with open(pickle_filename, 'rb') as pickle_file: - try: - if pickle.load(pickle_file) == data: - return -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py -index a432604..a85b03a 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py -@@ -189,7 +189,7 @@ def context_enabled_features(attributes): - return sorted([ - member for member in members - if member.get(KEY) and not member.get('exposed_test') -- ]) -+ ], key=lambda item: item['name']) - - def member_filter_by_name(members, name): - return [member for member in members if member[KEY] == name] -@@ -612,7 +612,8 @@ def interface_context(interface, interfaces, component_info): - sorted( - origin_trial_features(interface, context['constants'], - context['attributes'], context['methods']) + -- context_enabled_features(context['attributes'])), -+ context_enabled_features(context['attributes']), -+ key=lambda item: item['name']), - }) - if context['optional_features']: - includes.add('platform/bindings/v8_per_context_data.h') -@@ -1356,9 +1357,9 @@ def resolution_tests_methods(effective_overloads): - - # Extract argument and IDL type to simplify accessing these in each loop. - arguments = [method['arguments'][index] for method in methods] -- arguments_methods = zip(arguments, methods) -+ arguments_methods = list(zip(arguments, methods)) - idl_types = [argument['idl_type_object'] for argument in arguments] -- idl_types_methods = zip(idl_types, methods) -+ idl_types_methods = list(zip(idl_types, methods)) - - # We can’t do a single loop through all methods or simply sort them, because - # a method may be listed in multiple steps of the resolution algorithm, and -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py -index 5f1f89a..6ee8a40 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py -@@ -46,6 +46,10 @@ import v8_types - import v8_utilities - from v8_utilities import (has_extended_attribute_value, is_unforgeable) - -+# TODO: Remove this once Python2 is obsoleted. -+if sys.version_info.major != 2: -+ basestring = str -+ - - def method_is_visible(method, interface_is_partial): - if 'overloads' in method: -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py -index 2ecd692..fcfc483 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py -@@ -271,7 +271,7 @@ EXPOSED_WORKERS = set([ - ]) - - --class ExposureSet: -+class ExposureSet(object): - """An ExposureSet is a collection of Exposure instructions.""" - - def __init__(self, exposures=None): -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py -index 13fb7c7..b73b771 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py -@@ -91,11 +91,13 @@ class CallbackInterface(UserDefinedType, WithExtendedAttributes, - for operation_ir in ir.operations - ]) - self._operation_groups = tuple([ -- OperationGroup( -- operation_group_ir, -- filter(lambda x: x.identifier == operation_group_ir.identifier, -- self._operations), -- owner=self) for operation_group_ir in ir.operation_groups -+ OperationGroup(operation_group_ir, -+ list( -+ filter( -+ lambda x: x.identifier == operation_group_ir -+ .identifier, self._operations)), -+ owner=self) -+ for operation_group_ir in ir.operation_groups - ]) - - @property -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py -index c92cf48..f5d5912 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py -@@ -156,4 +156,4 @@ class Database(object): - return self._view_by_kind(Database._Kind.UNION) - - def _view_by_kind(self, kind): -- return self._impl.find_by_kind(kind).values() -+ return list(self._impl.find_by_kind(kind).values()) -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py -index abaeef3..e36cf74 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py -@@ -8,8 +8,11 @@ from .runtime_enabled_features import RuntimeEnabledFeatures - class _Feature(str): - """Represents a runtime-enabled feature.""" - -+ def __new__(cls, value): -+ return str.__new__(cls, value) -+ - def __init__(self, value): -- str.__init__(self, value) -+ str.__init__(self) - self._is_context_dependent = ( - RuntimeEnabledFeatures.is_context_dependent(self)) - -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py -index 648c70d..1712f19 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py -@@ -71,8 +71,9 @@ class FunctionLike(WithIdentifier): - def num_of_required_arguments(self): - """Returns the number of required arguments.""" - return len( -- filter(lambda arg: not (arg.is_optional or arg.is_variadic), -- self.arguments)) -+ list( -+ filter(lambda arg: not (arg.is_optional or arg.is_variadic), -+ self.arguments))) - - - class OverloadGroup(WithIdentifier): -@@ -171,8 +172,7 @@ class OverloadGroup(WithIdentifier): - Returns the effective overload set. - https://heycam.github.io/webidl/#compute-the-effective-overload-set - """ -- assert argument_count is None or isinstance(argument_count, -- (int, long)) -+ assert argument_count is None or isinstance(argument_count, int) - - N = argument_count - S = [] -@@ -188,21 +188,21 @@ class OverloadGroup(WithIdentifier): - - S.append( - OverloadGroup.EffectiveOverloadItem( -- X, map(lambda arg: arg.idl_type, X.arguments), -- map(lambda arg: arg.optionality, X.arguments))) -+ X, list(map(lambda arg: arg.idl_type, X.arguments)), -+ list(map(lambda arg: arg.optionality, X.arguments)))) - - if X.is_variadic: -- for i in xrange(n, max(maxarg, N)): -- t = map(lambda arg: arg.idl_type, X.arguments) -- o = map(lambda arg: arg.optionality, X.arguments) -- for _ in xrange(n, i + 1): -+ for i in range(n, max(maxarg, N)): -+ t = list(map(lambda arg: arg.idl_type, X.arguments)) -+ o = list(map(lambda arg: arg.optionality, X.arguments)) -+ for _ in range(n, i + 1): - t.append(X.arguments[-1].idl_type) - o.append(X.arguments[-1].optionality) - S.append(OverloadGroup.EffectiveOverloadItem(X, t, o)) - -- t = map(lambda arg: arg.idl_type, X.arguments) -- o = map(lambda arg: arg.optionality, X.arguments) -- for i in xrange(n - 1, -1, -1): -+ t = list(map(lambda arg: arg.idl_type, X.arguments)) -+ o = list(map(lambda arg: arg.optionality, X.arguments)) -+ for i in range(n - 1, -1, -1): - if X.arguments[i].optionality == IdlType.Optionality.REQUIRED: - break - S.append(OverloadGroup.EffectiveOverloadItem(X, t[:i], o[:i])) -@@ -222,7 +222,7 @@ class OverloadGroup(WithIdentifier): - for item in items) - assert len(items) > 1 - -- for index in xrange(len(items[0].type_list)): -+ for index in range(len(items[0].type_list)): - # Assume that the given items are valid, and we only need to test - # the two types. - if OverloadGroup.are_distinguishable_types( -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py -index c5ee2bd..5831507 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py -@@ -149,8 +149,8 @@ class IdlCompiler(object): - for old_ir in old_irs: - new_ir = make_copy(old_ir) - self._ir_map.add(new_ir) -- new_ir.attributes = filter(not_disabled, new_ir.attributes) -- new_ir.operations = filter(not_disabled, new_ir.operations) -+ new_ir.attributes = list(filter(not_disabled, new_ir.attributes)) -+ new_ir.operations = list(filter(not_disabled, new_ir.operations)) - - def _record_defined_in_partial_and_mixin(self): - old_irs = self._ir_map.irs_of_kinds( -@@ -231,7 +231,7 @@ class IdlCompiler(object): - only_to_members_of_partial_or_mixin=False) - propagate_to_exposure(propagate) - -- map(process_member_like, ir.iter_all_members()) -+ list(map(process_member_like, ir.iter_all_members())) - - def process_member_like(ir): - propagate = functools.partial(propagate_extattr, ir=ir) -@@ -257,7 +257,7 @@ class IdlCompiler(object): - - self._ir_map.move_to_new_phase() - -- map(process_interface_like, old_irs) -+ list(map(process_interface_like, old_irs)) - - def _determine_blink_headers(self): - irs = self._ir_map.irs_of_kinds( -@@ -422,9 +422,9 @@ class IdlCompiler(object): - assert not new_interface.deriveds - derived_set = identifier_to_derived_set.get( - new_interface.identifier, set()) -- new_interface.deriveds = map( -- lambda id_: self._ref_to_idl_def_factory.create(id_), -- sorted(derived_set)) -+ new_interface.deriveds = list( -+ map(lambda id_: self._ref_to_idl_def_factory.create(id_), -+ sorted(derived_set))) - - def _supplement_missing_html_constructor_operation(self): - # Temporary mitigation of misuse of [HTMLConstructor] -@@ -553,7 +553,8 @@ class IdlCompiler(object): - self._ir_map.add(new_ir) - - for group in new_ir.iter_all_overload_groups(): -- exposures = map(lambda overload: overload.exposure, group) -+ exposures = list(map(lambda overload: overload.exposure, -+ group)) - - # [Exposed] - if any(not exposure.global_names_and_features -@@ -653,8 +654,8 @@ class IdlCompiler(object): - constructs = set() - for global_name in global_names: - constructs.update(exposed_map.get(global_name, [])) -- new_ir.exposed_constructs = map( -- self._ref_to_idl_def_factory.create, sorted(constructs)) -+ new_ir.exposed_constructs = list( -+ map(self._ref_to_idl_def_factory.create, sorted(constructs))) - - assert not new_ir.legacy_window_aliases - if new_ir.identifier != 'Window': -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py -index 65d24e5..067ef2e 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py -@@ -180,8 +180,9 @@ class Interface(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, - self._constructor_groups = tuple([ - ConstructorGroup( - group_ir, -- filter(lambda x: x.identifier == group_ir.identifier, -- self._constructors), -+ list( -+ filter(lambda x: x.identifier == group_ir.identifier, -+ self._constructors)), - owner=self) for group_ir in ir.constructor_groups - ]) - assert len(self._constructor_groups) <= 1 -@@ -192,8 +193,9 @@ class Interface(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, - self._named_constructor_groups = tuple([ - ConstructorGroup( - group_ir, -- filter(lambda x: x.identifier == group_ir.identifier, -- self._named_constructors), -+ list( -+ filter(lambda x: x.identifier == group_ir.identifier, -+ self._named_constructors)), - owner=self) for group_ir in ir.named_constructor_groups - ]) - self._operations = tuple([ -@@ -203,22 +205,23 @@ class Interface(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, - self._operation_groups = tuple([ - OperationGroup( - group_ir, -- filter(lambda x: x.identifier == group_ir.identifier, -- self._operations), -+ list( -+ filter(lambda x: x.identifier == group_ir.identifier, -+ self._operations)), - owner=self) for group_ir in ir.operation_groups - ]) - self._exposed_constructs = tuple(ir.exposed_constructs) - self._legacy_window_aliases = tuple(ir.legacy_window_aliases) - self._indexed_and_named_properties = None -- indexed_and_named_property_operations = filter( -- lambda x: x.is_indexed_or_named_property_operation, -- self._operations) -+ indexed_and_named_property_operations = list( -+ filter(lambda x: x.is_indexed_or_named_property_operation, -+ self._operations)) - if indexed_and_named_property_operations: - self._indexed_and_named_properties = IndexedAndNamedProperties( - indexed_and_named_property_operations, owner=self) - self._stringifier = None -- stringifier_operation_irs = filter(lambda x: x.is_stringifier, -- ir.operations) -+ stringifier_operation_irs = list( -+ filter(lambda x: x.is_stringifier, ir.operations)) - if stringifier_operation_irs: - assert len(stringifier_operation_irs) == 1 - op_ir = make_copy(stringifier_operation_irs[0]) -@@ -231,8 +234,9 @@ class Interface(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, - attribute = None - if operation.stringifier_attribute: - attr_id = operation.stringifier_attribute -- attributes = filter(lambda x: x.identifier == attr_id, -- self._attributes) -+ attributes = list( -+ filter(lambda x: x.identifier == attr_id, -+ self._attributes)) - assert len(attributes) == 1 - attribute = attributes[0] - self._stringifier = Stringifier(operation, attribute, owner=self) -@@ -578,8 +582,9 @@ class Iterable(WithDebugInfo): - self._operation_groups = tuple([ - OperationGroup( - group_ir, -- filter(lambda x: x.identifier == group_ir.identifier, -- self._operations), -+ list( -+ filter(lambda x: x.identifier == group_ir.identifier, -+ self._operations)), - owner=owner) for group_ir in ir.operation_groups - ]) - -@@ -666,8 +671,9 @@ class Maplike(WithDebugInfo): - self._operation_groups = tuple([ - OperationGroup( - group_ir, -- filter(lambda x: x.identifier == group_ir.identifier, -- self._operations), -+ list( -+ filter(lambda x: x.identifier == group_ir.identifier, -+ self._operations)), - owner=owner) for group_ir in ir.operation_groups - ]) - -@@ -755,8 +761,9 @@ class Setlike(WithDebugInfo): - self._operation_groups = tuple([ - OperationGroup( - group_ir, -- filter(lambda x: x.identifier == group_ir.identifier, -- self._operations), -+ list( -+ filter(lambda x: x.identifier == group_ir.identifier, -+ self._operations)), - owner=owner) for group_ir in ir.operation_groups - ]) - -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py -index e9aeff4..d80554d 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py -@@ -2,6 +2,8 @@ - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - -+import sys -+ - from .argument import Argument - from .ast_group import AstGroup - from .attribute import Attribute -@@ -30,6 +32,11 @@ from .operation import Operation - from .typedef import Typedef - - -+# TODO: Remove this once Python2 is obsoleted. -+if sys.version_info.major != 2: -+ long = int -+ -+ - def load_and_register_idl_definitions(filepaths, register_ir, - create_ref_to_idl_def, idl_type_factory): - """ -@@ -160,7 +167,7 @@ class _IRBuilder(object): - child_nodes = list(node.GetChildren()) - extended_attributes = self._take_extended_attributes(child_nodes) - -- members = map(self._build_interface_member, child_nodes) -+ members = list(map(self._build_interface_member, child_nodes)) - attributes = [] - constants = [] - operations = [] -@@ -302,7 +309,7 @@ class _IRBuilder(object): - child_nodes = list(node.GetChildren()) - inherited = self._take_inheritance(child_nodes) - extended_attributes = self._take_extended_attributes(child_nodes) -- own_members = map(self._build_dictionary_member, child_nodes) -+ own_members = list(map(self._build_dictionary_member, child_nodes)) - - return Dictionary.IR( - identifier=Identifier(node.GetName()), -@@ -336,7 +343,7 @@ class _IRBuilder(object): - - child_nodes = list(node.GetChildren()) - extended_attributes = self._take_extended_attributes(child_nodes) -- members = map(self._build_interface_member, child_nodes) -+ members = list(map(self._build_interface_member, child_nodes)) - constants = [] - operations = [] - for member in members: -@@ -456,8 +463,8 @@ class _IRBuilder(object): - assert len(child_nodes) == 1 - child = child_nodes[0] - if child.GetClass() == 'Arguments': -- arguments = map(build_extattr_argument, -- child.GetChildren()) -+ arguments = list( -+ map(build_extattr_argument, child.GetChildren())) - elif child.GetClass() == 'Call': - assert len(child.GetChildren()) == 1 - grand_child = child.GetChildren()[0] -@@ -486,7 +493,9 @@ class _IRBuilder(object): - - assert node.GetClass() == 'ExtAttributes' - return ExtendedAttributes( -- filter(None, map(build_extended_attribute, node.GetChildren()))) -+ list( -+ filter(None, map(build_extended_attribute, -+ node.GetChildren())))) - - def _build_inheritance(self, node): - assert node.GetClass() == 'Inherit' -@@ -506,7 +515,7 @@ class _IRBuilder(object): - - def _build_iterable(self, node): - assert node.GetClass() == 'Iterable' -- types = map(self._build_type, node.GetChildren()) -+ types = list(map(self._build_type, node.GetChildren())) - assert len(types) == 1 or len(types) == 2 - if len(types) == 1: # value iterator - key_type, value_type = (None, types[0]) -@@ -584,7 +593,7 @@ class _IRBuilder(object): - def _build_maplike(self, node, interface_identifier): - assert node.GetClass() == 'Maplike' - assert isinstance(interface_identifier, Identifier) -- types = map(self._build_type, node.GetChildren()) -+ types = list(map(self._build_type, node.GetChildren())) - assert len(types) == 2 - key_type, value_type = types - is_readonly = bool(node.GetProperty('READONLY')) -@@ -676,7 +685,7 @@ class _IRBuilder(object): - def _build_setlike(self, node, interface_identifier): - assert node.GetClass() == 'Setlike' - assert isinstance(interface_identifier, Identifier) -- types = map(self._build_type, node.GetChildren()) -+ types = list(map(self._build_type, node.GetChildren())) - assert len(types) == 1 - value_type = types[0] - is_readonly = bool(node.GetProperty('READONLY')) -@@ -838,7 +847,7 @@ class _IRBuilder(object): - - def build_union_type(node, extended_attributes): - return self._idl_type_factory.union_type( -- member_types=map(self._build_type, node.GetChildren()), -+ member_types=list(map(self._build_type, node.GetChildren())), - is_optional=is_optional, - extended_attributes=extended_attributes, - debug_info=self._build_debug_info(node)) -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py -index a7a2b11..2f6b613 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py -@@ -3,6 +3,13 @@ - # found in the LICENSE file. - - -+import sys -+ -+# TODO: Remove this once Python2 is obsoleted. -+if sys.version_info.major != 2: -+ long = int -+ basestring = str -+ - def make_copy(obj, memo=None): - """ - Creates a copy of the given object, which should be an IR or part of IR. -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py -index eeabef9..bd7e989 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py -@@ -107,11 +107,13 @@ class Namespace(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, - for operation_ir in ir.operations - ]) - self._operation_groups = tuple([ -- OperationGroup( -- operation_group_ir, -- filter(lambda x: x.identifier == operation_group_ir.identifier, -- self._operations), -- owner=self) for operation_group_ir in ir.operation_groups -+ OperationGroup(operation_group_ir, -+ list( -+ filter( -+ lambda x: x.identifier == operation_group_ir -+ .identifier, self._operations)), -+ owner=self) -+ for operation_group_ir in ir.operation_groups - ]) - - @property -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl b/src/3rdparty/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl -index 0add9c4..dc910f6 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl -+++ b/src/3rdparty/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl -@@ -59,9 +59,9 @@ void {{v8_class}}::ToImpl(v8::Isolate* isolate, v8::Local v8_value, { - DCHECK(executionContext); - {% endif %}{# has_origin_trial_members #} - {% endif %}{# members #} -- {% for origin_trial_test, origin_trial_member_list in members | groupby('origin_trial_feature_name') %} -+ {% for origin_trial_test, origin_trial_member_list in members | stringifykeygroupby('origin_trial_feature_name') %} - {% filter origin_trial_enabled(origin_trial_test, "executionContext") %} -- {% for feature_name, member_list in origin_trial_member_list | groupby('runtime_enabled_feature_name') %} -+ {% for feature_name, member_list in origin_trial_member_list | stringifykeygroupby('runtime_enabled_feature_name') %} - {% filter runtime_enabled(feature_name) %} - {% for member in member_list %} - v8::Local {{member.v8_value}}; -@@ -147,9 +147,9 @@ bool toV8{{cpp_class}}(const {{cpp_class}}* impl, v8::Local dictiona - DCHECK(executionContext); - {% endif %}{# has_origin_trial_members #} - {% endif %}{# members #} -- {% for origin_trial_test, origin_trial_member_list in members | groupby('origin_trial_feature_name') %} -+ {% for origin_trial_test, origin_trial_member_list in members | stringifykeygroupby('origin_trial_feature_name') %} - {% filter origin_trial_enabled(origin_trial_test, "executionContext") %} -- {% for feature_name, member_list in origin_trial_member_list | groupby('runtime_enabled_feature_name') %} -+ {% for feature_name, member_list in origin_trial_member_list | stringifykeygroupby('runtime_enabled_feature_name') %} - {% filter runtime_enabled(feature_name) %} - {% for member in member_list %} - v8::Local {{member.v8_value}}; -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py -index 1799cd5..5f43ffa 100755 ---- a/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py -@@ -71,7 +71,7 @@ class Expansion(object): - def enabled_longhands(self): - include = lambda longhand: not longhand[ - 'runtime_flag'] or self.is_enabled(longhand['runtime_flag']) -- return filter(include, self._longhands) -+ return list(filter(include, self._longhands)) - - @property - def index(self): -@@ -87,8 +87,9 @@ class Expansion(object): - - def create_expansions(longhands): - flags = collect_runtime_flags(longhands) -- expansions = map(lambda mask: Expansion(longhands, flags, mask), -- range(1 << len(flags))) -+ expansions = list( -+ map(lambda mask: Expansion(longhands, flags, mask), -+ range(1 << len(flags)))) - assert len(expansions) > 0 - # We generate 2^N expansions for N flags, so enforce some limit. - assert len(flags) <= 4, 'Too many runtime flags for a single shorthand' -@@ -114,14 +115,14 @@ class StylePropertyShorthandWriter(json5_generator.Writer): - - self._longhand_dictionary = defaultdict(list) - for property_ in json5_properties.shorthands: -- property_['longhand_enum_keys'] = map(enum_key_for_css_property, -- property_['longhands']) -- property_['longhand_property_ids'] = map(id_for_css_property, -- property_['longhands']) -- -- longhands = map( -- lambda name: json5_properties.properties_by_name[name], -- property_['longhands']) -+ property_['longhand_enum_keys'] = list( -+ map(enum_key_for_css_property, property_['longhands'])) -+ property_['longhand_property_ids'] = list( -+ map(id_for_css_property, property_['longhands'])) -+ -+ longhands = list( -+ map(lambda name: json5_properties.properties_by_name[name], -+ property_['longhands'])) - property_['expansions'] = create_expansions(longhands) - for longhand_enum_key in property_['longhand_enum_keys']: - self._longhand_dictionary[longhand_enum_key].append(property_) -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py -index 75030ac..f72aade 100755 ---- a/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py -@@ -42,8 +42,8 @@ class CSSPropertyInstancesWriter(json5_generator.Writer): - aliases = self._css_properties.aliases - - # Lists of PropertyClassData. -- self._property_classes_by_id = map(self.get_class, properties) -- self._alias_classes_by_id = map(self.get_class, aliases) -+ self._property_classes_by_id = list(map(self.get_class, properties)) -+ self._alias_classes_by_id = list(map(self.get_class, aliases)) - - # Sort by enum value. - self._property_classes_by_id.sort(key=lambda t: t.enum_value) -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/gperf.py b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/gperf.py -index 5ee4905..db72660 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/gperf.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/gperf.py -@@ -95,7 +95,7 @@ def main(): - - open(args.output_file, 'wb').write( - generate_gperf(gperf_path, -- open(infile).read(), gperf_args)) -+ open(infile).read(), gperf_args).encode('utf-8')) - - - if __name__ == '__main__': -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/in_file.py b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/in_file.py -index 28adc05..5811348 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/in_file.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/in_file.py -@@ -66,7 +66,7 @@ class InFile(object): - self._defaults = defaults - self._valid_values = copy.deepcopy( - valid_values if valid_values else {}) -- self._parse(map(str.strip, lines)) -+ self._parse(list(map(str.strip, lines))) - - @classmethod - def load_from_files(self, file_paths, defaults, valid_values, -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/in_generator.py b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/in_generator.py -index e46740a..ab1981a 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/in_generator.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/in_generator.py -@@ -32,10 +32,15 @@ import os - import os.path - import shlex - import shutil -+import sys - import optparse - - from in_file import InFile - -+# TODO: Remove this once Python2 is obsoleted. -+if sys.version_info.major != 2: -+ basestring = str -+ - - ######################################################### - # This is now deprecated - use json5_generator.py instead -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py -index cafe8d9..6925a4f 100755 ---- a/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py -@@ -138,7 +138,7 @@ class RuntimeFeatureWriter(BaseRuntimeFeatureWriter): - except Exception: - # If trouble unpickling, overwrite - pass -- with open(os.path.abspath(file_name), 'w') as pickle_file: -+ with open(os.path.abspath(file_name), 'wb') as pickle_file: - pickle.dump(features_map, pickle_file) - - def _template_inputs(self): -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl -index dc3f44c..3eefcf9 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl -+++ b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl -@@ -26,7 +26,7 @@ using {{namespace}}FunctionMap = HashMapGetExecutionContext())) { -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl -index 1b5297d..edecc81 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl -+++ b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl -@@ -15,7 +15,7 @@ namespace blink { - class Document; - - // Type checking. --{% for tag in tags|sort if not tag.multipleTagNames and not tag.noTypeHelpers %} -+{% for tag in tags|sort(attribute='name') if not tag.multipleTagNames and not tag.noTypeHelpers %} - class {{tag.interface}}; - template <> - inline bool IsElementOfType(const Node& node) { -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl -index 0244433..dcdbb02 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl -+++ b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl -@@ -25,7 +25,7 @@ - - - {% macro trie_leaf(index, object, return_macro, lowercase_data) %} --{% set name, value = object.items()[0] %} -+{% set name, value = (object.items()|list)[0] %} - {% if name|length %} - if ( - {%- for c in name -%} -@@ -45,7 +45,7 @@ return {{ return_macro(value) }}; - - - {% macro trie_switch(trie, index, return_macro, lowercase_data) %} --{% if trie|length == 1 and trie.values()[0] is string %} -+{% if trie|length == 1 and (trie.values()|list)[0] is string %} - {{ trie_leaf(index, trie, return_macro, lowercase_data) -}} - {% else %} - {% if lowercase_data %} -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl -index cb05c6c..bd5566b 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl -+++ b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl -@@ -24,12 +24,12 @@ namespace {{cpp_namespace}} { - {{symbol_export}}extern const WTF::AtomicString& {{namespace_prefix}}NamespaceURI; - - // Tags --{% for tag in tags|sort %} -+{% for tag in tags|sort(attribute='name') %} - {{symbol_export}}extern const blink::{{namespace}}QualifiedName& {{tag|symbol}}Tag; - {% endfor %} - - // Attributes --{% for attr in attrs|sort %} -+{% for attr in attrs|sort(attribute='name') %} - {{symbol_export}}extern const blink::QualifiedName& {{attr|symbol}}Attr; - {% endfor %} - -diff --git a/src/3rdparty/chromium/third_party/dawn/generator/generator_lib.py b/src/3rdparty/chromium/third_party/dawn/generator/generator_lib.py -index 5e3734d..e3d46bd 100644 ---- a/src/3rdparty/chromium/third_party/dawn/generator/generator_lib.py -+++ b/src/3rdparty/chromium/third_party/dawn/generator/generator_lib.py -@@ -201,6 +201,10 @@ def _compute_python_dependencies(root_dir=None): - - paths = set() - for path in module_paths: -+ # Builtin/namespaced modules may return None for the file path. -+ if not path: -+ continue -+ - path = os.path.abspath(path) - - if not path.startswith(root_dir): -diff --git a/src/3rdparty/chromium/third_party/devtools-frontend/src/BUILD.gn b/src/3rdparty/chromium/third_party/devtools-frontend/src/BUILD.gn -index cd488e8..ea1dc3d 100644 ---- a/src/3rdparty/chromium/third_party/devtools-frontend/src/BUILD.gn -+++ b/src/3rdparty/chromium/third_party/devtools-frontend/src/BUILD.gn -@@ -2,6 +2,8 @@ - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - -+import("//build/config/python.gni") -+ - import("//third_party/blink/public/public_features.gni") - import("./all_devtools_files.gni") - import("./all_devtools_modules.gni") -diff --git a/src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py b/src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py -index d6666e8..0f7a661 100644 ---- a/src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py -+++ b/src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py -@@ -45,7 +45,8 @@ def rollup(input_path, output_path, filename, max_size, rollup_plugin): - ['--format', 'iife', '-n', 'InspectorOverlay'] + ['--input', target] + - ['--plugin', rollup_plugin], - stdout=subprocess.PIPE, -- stderr=subprocess.PIPE) -+ stderr=subprocess.PIPE, -+ text=True) - out, error = rollup_process.communicate() - if not out: - raise Exception("rollup failed: " + error) -diff --git a/src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py b/src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py -index fa8e73d..7d0b84b 100644 ---- a/src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py -+++ b/src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py -@@ -10,7 +10,7 @@ Builds applications in release mode: - and the application loader into a single script. - """ - --from cStringIO import StringIO -+from io import StringIO - from os import path - from os.path import join - import copy -@@ -145,8 +145,7 @@ class ReleaseBuilder(object): - resource_content = read_file(path.join(self.application_dir, resource_name)) - if not (resource_name.endswith('.html') - or resource_name.endswith('md')): -- resource_content += resource_source_url(resource_name).encode( -- 'utf-8') -+ resource_content += resource_source_url(resource_name) - resource_content = resource_content.replace('\\', '\\\\') - resource_content = resource_content.replace('\n', '\\n') - resource_content = resource_content.replace('"', '\\"') -@@ -173,7 +172,9 @@ class ReleaseBuilder(object): - def _concatenate_application_script(self, output): - output.write('Root.allDescriptors.push(...%s);' % self._release_module_descriptors()) - if self.descriptors.extends: -- output.write('Root.applicationDescriptor.modules.push(...%s);' % json.dumps(self.descriptors.application.values())) -+ output.write( -+ 'Root.applicationDescriptor.modules.push(...%s);' % -+ json.dumps(list(self.descriptors.application.values()))) - else: - output.write('Root.applicationDescriptor = %s;' % self.descriptors.application_json()) - -diff --git a/src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py b/src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py -index be510c4..c6a59c9 100644 ---- a/src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py -+++ b/src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py -@@ -123,7 +123,7 @@ def main(argv): - - try: - os.makedirs(path.join(output_directory, 'Images')) -- except OSError, e: -+ except OSError as e: - if e.errno != errno.EEXIST: - raise e - -@@ -147,7 +147,7 @@ def main(argv): - shutil.copy(path.join(dirname, filename), path.join(output_directory, 'Images')) - add_file_to_grd(doc, path.join('Images', filename)) - -- with open(parsed_args.output_filename, 'w') as output_file: -+ with open(parsed_args.output_filename, 'wb') as output_file: - output_file.write(doc.toxml(encoding='UTF-8')) - - -diff --git a/src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py b/src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py -index 0ba695d..bb1da2f 100644 ---- a/src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py -+++ b/src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py -@@ -7,6 +7,8 @@ - Utilities for the modular DevTools build. - """ - -+from __future__ import print_function -+ - import collections - from os import path - import os -@@ -40,7 +42,7 @@ def load_and_parse_json(filename): - try: - return json.loads(read_file(filename)) - except: -- print 'ERROR: Failed to parse %s' % filename -+ print('ERROR: Failed to parse %s' % filename) - raise - - class Descriptors: -@@ -57,7 +59,7 @@ class Descriptors: - - def application_json(self): - result = dict() -- result['modules'] = self.application.values() -+ result['modules'] = list(self.application.values()) - return json.dumps(result) - - def all_compiled_files(self): -diff --git a/src/3rdparty/chromium/third_party/jinja2/tests.py b/src/3rdparty/chromium/third_party/jinja2/tests.py -index 0adc3d4..b14f85f 100644 ---- a/src/3rdparty/chromium/third_party/jinja2/tests.py -+++ b/src/3rdparty/chromium/third_party/jinja2/tests.py -@@ -10,7 +10,7 @@ - """ - import operator - import re --from collections import Mapping -+from collections.abc import Mapping - from jinja2.runtime import Undefined - from jinja2._compat import text_type, string_types, integer_types - import decimal -diff --git a/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh b/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh -index 626d6a2..b1008cf 100755 ---- a/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh -+++ b/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh -@@ -519,8 +519,3 @@ rm -rf $TEMP_DIR - - gn format --in-place $BASE_DIR/BUILD.gn - gn format --in-place $BASE_DIR/libvpx_srcs.gni -- --cd $BASE_DIR/$LIBVPX_SRC_DIR --update_readme -- --cd $BASE_DIR -diff --git a/src/3rdparty/chromium/third_party/libxml/src/encoding.c b/src/3rdparty/chromium/third_party/libxml/src/encoding.c -index 101eba9..085705b 100644 ---- a/src/3rdparty/chromium/third_party/libxml/src/encoding.c -+++ b/src/3rdparty/chromium/third_party/libxml/src/encoding.c -@@ -40,6 +40,7 @@ - #include - #include - -+#include - #include "private/buf.h" - #include "private/enc.h" - #include "private/error.h" -@@ -1999,7 +2000,7 @@ xmlUconvWrapper(uconv_t *cd, int toUnicode, unsigned char *out, int *outlen, - *inlen = ucv_in - (const char*) in; - *outlen = ucv_out - (char *) out; - if (U_SUCCESS(err)) { -- /* reset pivot buf if this is the last call for input (flush==TRUE) */ -+ /* reset pivot buf if this is the last call for input (flush==true) */ - if (flush) - cd->pivot_source = cd->pivot_target = cd->pivot_buf; - return 0; -diff --git a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.cc b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.cc -index fd65195..1e8d060 100644 ---- a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.cc -+++ b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.cc -@@ -14,9 +14,9 @@ - * limitations under the License. - */ - -+#include - #include "src/trace_processor/containers/string_pool.h" - --#include - - #include "perfetto/base/logging.h" - #include "perfetto/ext/base/utils.h" -diff --git a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/db/column.cc b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/db/column.cc -index 00496b3..0dccfeb 100644 ---- a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/db/column.cc -+++ b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/db/column.cc -@@ -14,6 +14,7 @@ - * limitations under the License. - */ - -+#include - #include "src/trace_processor/db/column.h" - - #include "src/trace_processor/db/compare.h" -diff --git a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/types/variadic.cc b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/types/variadic.cc -index 837bfeb..cdd5681 100644 ---- a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/types/variadic.cc -+++ b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/types/variadic.cc -@@ -14,6 +14,7 @@ - * limitations under the License. - */ - -+#include - #include "src/trace_processor/types/variadic.h" - - namespace perfetto { -diff --git a/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp b/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp -index 25e63f7..deb5e38 100644 ---- a/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp -+++ b/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp -@@ -7,6 +7,7 @@ - - #include - -+#include - #include "include/utils/SkParse.h" - - #include // std::lower_bound -diff --git a/src/3rdparty/chromium/third_party/webrtc/test/BUILD.gn b/src/3rdparty/chromium/third_party/webrtc/test/BUILD.gn -index 58d3dab..4832829 100644 ---- a/src/3rdparty/chromium/third_party/webrtc/test/BUILD.gn -+++ b/src/3rdparty/chromium/third_party/webrtc/test/BUILD.gn -@@ -258,10 +258,6 @@ rtc_library("perf_test") { - absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] - if (rtc_enable_protobuf) { - sources += [ "testsupport/perf_test_histogram_writer.cc" ] -- deps += [ -- "//third_party/catapult/tracing/tracing:histogram", -- "//third_party/catapult/tracing/tracing:reserved_infos", -- ] - } else { - sources += [ "testsupport/perf_test_histogram_writer_no_protobuf.cc" ] - } -@@ -566,7 +562,6 @@ if (rtc_include_tests) { - - if (rtc_enable_protobuf) { - sources += [ "testsupport/perf_test_histogram_writer_unittest.cc" ] -- deps += [ "//third_party/catapult/tracing/tracing:histogram" ] - } - - data = test_support_unittests_resources -diff --git a/src/3rdparty/chromium/tools/binary_size/BUILD.gn b/src/3rdparty/chromium/tools/binary_size/BUILD.gn -index e6806bf..2c985d1 100644 ---- a/src/3rdparty/chromium/tools/binary_size/BUILD.gn -+++ b/src/3rdparty/chromium/tools/binary_size/BUILD.gn -@@ -18,7 +18,6 @@ python_library("binary_size_trybot_py") { - python_library("sizes_py") { - testonly = true - pydeps_file = "sizes.pydeps" -- data_deps = [ "//third_party/catapult/tracing:convert_chart_json" ] - } - - if (is_linux || is_chromeos) { -diff --git a/src/3rdparty/chromium/tools/grit/BUILD.gn b/src/3rdparty/chromium/tools/grit/BUILD.gn -index 1cd3c75..60c4cf2 100644 ---- a/src/3rdparty/chromium/tools/grit/BUILD.gn -+++ b/src/3rdparty/chromium/tools/grit/BUILD.gn -@@ -33,7 +33,6 @@ group("grit_python_unittests") { - "//testing/scripts/run_isolated_script_test.py", - "//testing/xvfb.py", - "//tools/grit/", -- "//third_party/catapult/third_party/typ/", - ] - } - -diff --git a/src/3rdparty/chromium/tools/gritsettings/resource_ids.spec b/src/3rdparty/chromium/tools/gritsettings/resource_ids.spec -index d0a4545..80b0bf1 100644 ---- a/src/3rdparty/chromium/tools/gritsettings/resource_ids.spec -+++ b/src/3rdparty/chromium/tools/gritsettings/resource_ids.spec -@@ -499,12 +499,6 @@ - "content/shell/shell_resources.grd": { - "includes": [2940], - }, -- -- # This file is generated during the build. -- "<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.grd": { -- "META": {"sizes": {"includes": [20],}}, -- "includes": [2960], -- }, - # END content/ section. - - # START ios/web/ section. -diff --git a/src/3rdparty/chromium/tools/metrics/BUILD.gn b/src/3rdparty/chromium/tools/metrics/BUILD.gn -index 846d524..cb57d2b 100644 ---- a/src/3rdparty/chromium/tools/metrics/BUILD.gn -+++ b/src/3rdparty/chromium/tools/metrics/BUILD.gn -@@ -56,7 +56,6 @@ group("metrics_python_tests") { - "//testing/scripts/common.py", - "//testing/xvfb.py", - "//testing/test_env.py", -- "//third_party/catapult/third_party/typ/", - - # Scripts we depend on. Their unit tests are also included. - "//tools/json_comment_eater/json_comment_eater.py", -diff --git a/src/3rdparty/chromium/tools/metrics/ukm/gen_builders.py b/src/3rdparty/chromium/tools/metrics/ukm/gen_builders.py -index f9f61d9..44e46fa 100755 ---- a/src/3rdparty/chromium/tools/metrics/ukm/gen_builders.py -+++ b/src/3rdparty/chromium/tools/metrics/ukm/gen_builders.py -@@ -48,9 +48,10 @@ def ReadFilteredData(path): - data = ukm_model.UKM_XML_TYPE.Parse(ukm_file.read()) - event_tag = ukm_model._EVENT_TYPE.tag - metric_tag = ukm_model._METRIC_TYPE.tag -- data[event_tag] = filter(ukm_model.IsNotObsolete, data[event_tag]) -+ data[event_tag] = list(filter(ukm_model.IsNotObsolete, data[event_tag])) - for event in data[event_tag]: -- event[metric_tag] = filter(ukm_model.IsNotObsolete, event[metric_tag]) -+ event[metric_tag] = list( -+ filter(ukm_model.IsNotObsolete, event[metric_tag])) - return data - - -diff --git a/src/3rdparty/chromium/tools/perf/chrome_telemetry_build/BUILD.gn b/src/3rdparty/chromium/tools/perf/chrome_telemetry_build/BUILD.gn -index 4868810..70ebd4d 100644 ---- a/src/3rdparty/chromium/tools/perf/chrome_telemetry_build/BUILD.gn -+++ b/src/3rdparty/chromium/tools/perf/chrome_telemetry_build/BUILD.gn -@@ -107,7 +107,6 @@ group("telemetry_chrome_test_without_chrome") { - "//tools/perf/core/", # chrome_telemetry_build/ depends on core/ - ] - data_deps = [ -- "//third_party/catapult:telemetry_chrome_test_support", - "//tools/metrics:metrics_python_tests", - ] - -@@ -151,7 +150,5 @@ group("telemetry_chrome_test_without_chrome") { - "//build/android:devil_chromium_py", - "//build/android:stack_tools", - ] -- } else if (!is_fuchsia) { -- data_deps += [ "//third_party/catapult/telemetry:bitmaptools" ] - } - } -diff --git a/src/3rdparty/chromium/tools/perf/core/perfetto_binary_roller/BUILD.gn b/src/3rdparty/chromium/tools/perf/core/perfetto_binary_roller/BUILD.gn -index 7fe48cb..e9c7f02 100644 ---- a/src/3rdparty/chromium/tools/perf/core/perfetto_binary_roller/BUILD.gn -+++ b/src/3rdparty/chromium/tools/perf/core/perfetto_binary_roller/BUILD.gn -@@ -7,7 +7,6 @@ import("//build/util/generate_wrapper.gni") - generate_wrapper("upload_trace_processor") { - testonly = true - data_deps = [ -- "//third_party/catapult:telemetry_chrome_test_support", - "//third_party/perfetto/src/trace_processor:trace_processor_shell", - ] - data = [ -diff --git a/src/3rdparty/chromium/tools/polymer/BUILD.gn b/src/3rdparty/chromium/tools/polymer/BUILD.gn -index 092066b..d115144 100644 ---- a/src/3rdparty/chromium/tools/polymer/BUILD.gn -+++ b/src/3rdparty/chromium/tools/polymer/BUILD.gn -@@ -10,6 +10,5 @@ group("polymer_tools_python_unittests") { - "//testing/scripts/run_isolated_script_test.py", - "//testing/xvfb.py", - "//tools/polymer/", -- "//third_party/catapult/third_party/typ/", - ] - } -diff --git a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc -index be91def..73f2023 100644 ---- a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc -+++ b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc -@@ -245,7 +245,7 @@ static void AXPlatformAtkHyperlinkInit(AXPlatformAtkHyperlink* self, gpointer) { - } - - GType ax_platform_atk_hyperlink_get_type() { -- static volatile gsize type_volatile = 0; -+ static gsize type_volatile = 0; - - AXPlatformNodeAuraLinux::EnsureGTypeInit(); - -diff --git a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc -index 5c51478..35d02ce 100644 ---- a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc -+++ b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc -@@ -2274,7 +2274,7 @@ void ClassInit(gpointer class_pointer, gpointer /* class_data */) { - GType GetType() { - AXPlatformNodeAuraLinux::EnsureGTypeInit(); - -- static volatile gsize type_volatile = 0; -+ static gsize type_volatile = 0; - if (g_once_init_enter(&type_volatile)) { - static const GTypeInfo type_info = { - sizeof(AXPlatformNodeAuraLinuxClass), // class_size -diff --git a/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc b/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc -index c663a20..38a3424 100644 ---- a/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc -+++ b/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc -@@ -141,7 +141,7 @@ void GtkKeyBindingsHandler::HandlerClassInit(HandlerClass* klass) { - } - - GType GtkKeyBindingsHandler::HandlerGetType() { -- static volatile gsize type_id_volatile = 0; -+ static gsize type_id_volatile = 0; - if (g_once_init_enter(&type_id_volatile)) { - GType type_id = g_type_register_static_simple( - GTK_TYPE_TEXT_VIEW, g_intern_static_string("GtkKeyBindingsHandler"), -diff --git a/src/3rdparty/chromium/ui/ozone/generate_constructor_list.py b/src/3rdparty/chromium/ui/ozone/generate_constructor_list.py -index 8d80063..04fa18e 100755 ---- a/src/3rdparty/chromium/ui/ozone/generate_constructor_list.py -+++ b/src/3rdparty/chromium/ui/ozone/generate_constructor_list.py -@@ -45,12 +45,15 @@ Example Output: ./ui/ozone/generate_constructor_list.py \ - } // namespace ui - """ - -+try: -+ from StringIO import StringIO # for Python 2 -+except ImportError: -+ from io import StringIO # for Python 3 - import optparse - import os - import collections - import re - import sys --import string - - - def GetTypedefName(typename): -@@ -68,7 +71,7 @@ def GetConstructorName(typename, platform): - This is just "Create" + typename + platform. - """ - -- return 'Create' + typename + string.capitalize(platform) -+ return 'Create' + typename + platform.capitalize() - - - def GenerateConstructorList(out, namespace, export, typenames, platforms, -@@ -163,12 +166,14 @@ def main(argv): - sys.exit(1) - - # Write to standard output or file specified by --output_cc. -- out_cc = sys.stdout -+ out_cc = getattr(sys.stdout, 'buffer', sys.stdout) - if options.output_cc: - out_cc = open(options.output_cc, 'wb') - -- GenerateConstructorList(out_cc, options.namespace, options.export, -+ out_cc_str = StringIO() -+ GenerateConstructorList(out_cc_str, options.namespace, options.export, - typenames, platforms, includes, usings) -+ out_cc.write(out_cc_str.getvalue().encode('utf-8')) - - if options.output_cc: - out_cc.close() -diff --git a/src/3rdparty/chromium/ui/ozone/generate_ozone_platform_list.py b/src/3rdparty/chromium/ui/ozone/generate_ozone_platform_list.py -index d47c398..2702b68 100755 ---- a/src/3rdparty/chromium/ui/ozone/generate_ozone_platform_list.py -+++ b/src/3rdparty/chromium/ui/ozone/generate_ozone_platform_list.py -@@ -49,12 +49,15 @@ Example Output: ./generate_ozone_platform_list.py --default wayland dri wayland - - """ - -+try: -+ from StringIO import StringIO # for Python 2 -+except ImportError: -+ from io import StringIO # for Python 3 - import optparse - import os - import collections - import re - import sys --import string - - - def GetConstantName(name): -@@ -63,7 +66,7 @@ def GetConstantName(name): - We just capitalize the platform name and prepend "CreateOzonePlatform". - """ - -- return 'kPlatform' + string.capitalize(name) -+ return 'kPlatform' + name.capitalize() - - - def GeneratePlatformListText(out, platforms): -@@ -149,9 +152,9 @@ def main(argv): - platforms.insert(0, options.default) - - # Write to standard output or file specified by --output_{cc,h}. -- out_cc = sys.stdout -- out_h = sys.stdout -- out_txt = sys.stdout -+ out_cc = getattr(sys.stdout, 'buffer', sys.stdout) -+ out_h = getattr(sys.stdout, 'buffer', sys.stdout) -+ out_txt = getattr(sys.stdout, 'buffer', sys.stdout) - if options.output_cc: - out_cc = open(options.output_cc, 'wb') - if options.output_h: -@@ -159,9 +162,16 @@ def main(argv): - if options.output_txt: - out_txt = open(options.output_txt, 'wb') - -- GeneratePlatformListText(out_txt, platforms) -- GeneratePlatformListHeader(out_h, platforms) -- GeneratePlatformListSource(out_cc, platforms) -+ out_txt_str = StringIO() -+ out_h_str = StringIO() -+ out_cc_str = StringIO() -+ -+ GeneratePlatformListText(out_txt_str, platforms) -+ out_txt.write(out_txt_str.getvalue().encode('utf-8')) -+ GeneratePlatformListHeader(out_h_str, platforms) -+ out_h.write(out_h_str.getvalue().encode('utf-8')) -+ GeneratePlatformListSource(out_cc_str, platforms) -+ out_cc.write(out_cc_str.getvalue().encode('utf-8')) - - if options.output_cc: - out_cc.close() -diff --git a/src/3rdparty/chromium/v8/tools/BUILD.gn b/src/3rdparty/chromium/v8/tools/BUILD.gn -index 2f8197d..83304b6 100644 ---- a/src/3rdparty/chromium/v8/tools/BUILD.gn -+++ b/src/3rdparty/chromium/v8/tools/BUILD.gn -@@ -31,10 +31,6 @@ group("v8_android_test_runner_deps") { - - if (is_android && !build_with_chromium) { - data_deps = [ "//build/android:test_runner_py" ] -- data = [ -- # This is used by android.py, but not included by test_runner_py above. -- "//third_party/catapult/devil/devil/android/perf/", -- ] - } - } - -diff --git a/src/3rdparty/chromium/weblayer/shell/BUILD.gn b/src/3rdparty/chromium/weblayer/shell/BUILD.gn -index 66984a7..1815fad 100644 ---- a/src/3rdparty/chromium/weblayer/shell/BUILD.gn -+++ b/src/3rdparty/chromium/weblayer/shell/BUILD.gn -@@ -161,7 +161,6 @@ repack("support_pak") { - "$root_gen_dir/components/strings/components_locale_settings_en-US.pak", - "$root_gen_dir/components/strings/components_strings_en-US.pak", - "$root_gen_dir/content/app/resources/content_resources_100_percent.pak", -- "$root_gen_dir/content/browser/tracing/tracing_resources.pak", - "$root_gen_dir/content/content_resources.pak", - "$root_gen_dir/content/dev_ui_content_resources.pak", - "$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak", -@@ -182,7 +181,6 @@ repack("support_pak") { - "//content:content_resources", - "//content:dev_ui_content_resources", - "//content/app/resources", -- "//content/browser/tracing:resources", - "//mojo/public/js:resources", - "//net:net_resources", - "//third_party/blink/public:resources", -diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json -index 053468f..1fac600 100644 ---- a/src/buildtools/configure.json -+++ b/src/buildtools/configure.json -@@ -316,9 +316,9 @@ - "label": "system ninja", - "type": "detectNinja" - }, -- "webengine-python2": { -- "label": "python2", -- "type": "detectPython2", -+ "webengine-python": { -+ "label": "python3", -+ "type": "detectPython", - "log": "location" - }, - "webengine-winversion": { -@@ -395,7 +395,7 @@ - && features.webengine-gperf - && features.webengine-bison - && features.webengine-flex -- && features.webengine-python2 -+ && features.webengine-python - && features.webengine-nodejs - && (!config.sanitizer || features.webengine-sanitizer) - && (!config.unix || features.pkg-config) -@@ -420,7 +420,7 @@ - && features.webengine-gperf - && features.webengine-bison - && features.webengine-flex -- && features.webengine-python2 -+ && features.webengine-python - && (!config.sanitizer || features.webengine-sanitizer) - && (!config.linux || features.pkg-config) - && (!config.linux || features.webengine-host-pkg-config) -@@ -443,12 +443,12 @@ - "autoDetect": "features.private_tests", - "output": [ "privateFeature" ] - }, -- "webengine-python2": { -- "label": "python2", -- "condition": "tests.webengine-python2", -+ "webengine-python": { -+ "label": "python3", -+ "condition": "tests.webengine-python", - "output": [ - "privateFeature", -- { "type": "varAssign", "name": "QMAKE_PYTHON2", "value": "tests.webengine-python2.location" } -+ { "type": "varAssign", "name": "QMAKE_PYTHON2", "value": "tests.webengine-python.location" } - ] - }, - "webengine-gperf": { -diff --git a/src/core/qtwebengine_resources.gni b/src/core/qtwebengine_resources.gni -index 3bf1a5d..29fd260 100644 ---- a/src/core/qtwebengine_resources.gni -+++ b/src/core/qtwebengine_resources.gni -@@ -27,7 +27,6 @@ repack("qtwebengine_repack_resources") { - "$root_gen_dir/components/components_resources.pak", - "$root_gen_dir/components/dev_ui_components_resources.pak", - "$root_gen_dir/content/browser/resources/media/media_internals_resources.pak", -- "$root_gen_dir/content/browser/tracing/tracing_resources.pak", - "$root_gen_dir/content/content_resources.pak", - "$root_gen_dir/content/dev_ui_content_resources.pak", - "$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak", -@@ -44,7 +43,6 @@ repack("qtwebengine_repack_resources") { - "//components/resources:components_resources_grit", - "//components/resources:dev_ui_components_resources_grit", - "//content/browser/resources/media:media_internals_resources", -- "//content/browser/tracing:resources", - "//content:content_resources_grit", - "//content:dev_ui_content_resources_grit", - "//mojo/public/js:resources", --- -2.42.1 - diff --git a/dev-qt/qtwebengine/patches/qtwebengine-5.15.17-x86-fixes.patchset b/dev-qt/qtwebengine/patches/qtwebengine-5.15.17-x86-fixes.patchset deleted file mode 100644 index 43a50b645..000000000 --- a/dev-qt/qtwebengine/patches/qtwebengine-5.15.17-x86-fixes.patchset +++ /dev/null @@ -1,278 +0,0 @@ -From 39ce9c4c5c028a79975fc9275122c9c403cf6250 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Sat, 16 Dec 2023 18:56:29 +1000 -Subject: Fixes build for x86 arch - - -diff --git a/src/3rdparty/chromium/base/atomicops.h b/src/3rdparty/chromium/base/atomicops.h -index 5fa27a4..1122b5f 100644 ---- a/src/3rdparty/chromium/base/atomicops.h -+++ b/src/3rdparty/chromium/base/atomicops.h -@@ -57,7 +57,11 @@ typedef intptr_t Atomic64; - - // Use AtomicWord for a machine-sized pointer. It will use the Atomic32 or - // Atomic64 routines below, depending on your architecture. -+#if defined(ARCH_CPU_64_BITS) - typedef intptr_t AtomicWord; -+#else -+typedef int32_t AtomicWord; -+#endif - - // Atomically execute: - // result = *ptr; -diff --git a/src/3rdparty/chromium/base/memory/discardable_shared_memory.cc b/src/3rdparty/chromium/base/memory/discardable_shared_memory.cc -index 4aa6229..cdfde4f 100644 ---- a/src/3rdparty/chromium/base/memory/discardable_shared_memory.cc -+++ b/src/3rdparty/chromium/base/memory/discardable_shared_memory.cc -@@ -178,7 +178,11 @@ bool DiscardableSharedMemory::CreateAndMap(size_t size) { - DCHECK(last_known_usage_.is_null()); - SharedState new_state(SharedState::LOCKED, Time()); - subtle::Release_Store( -+#if defined(ARCH_CPU_64_BITS) - &SharedStateFromSharedMemory(shared_memory_mapping_)->value.i, -+#else -+ (base::subtle::Atomic32*)&SharedStateFromSharedMemory(shared_memory_mapping_)->value.i, -+#endif - new_state.value.i); - return true; - } -@@ -239,7 +243,11 @@ DiscardableSharedMemory::LockResult DiscardableSharedMemory::Lock( - SharedState old_state(SharedState::UNLOCKED, last_known_usage_); - SharedState new_state(SharedState::LOCKED, Time()); - SharedState result(subtle::Acquire_CompareAndSwap( -+#if defined(ARCH_CPU_64_BITS) - &SharedStateFromSharedMemory(shared_memory_mapping_)->value.i, -+#else -+ (base::subtle::Atomic32*)&SharedStateFromSharedMemory(shared_memory_mapping_)->value.i, -+#endif - old_state.value.i, new_state.value.i)); - if (result.value.u != old_state.value.u) { - // Update |last_known_usage_| in case the above CAS failed because of -@@ -354,7 +362,11 @@ void DiscardableSharedMemory::Unlock(size_t offset, size_t length) { - DCHECK_EQ((new_state.GetTimestamp() - Time::UnixEpoch()).InSeconds(), - (current_time - Time::UnixEpoch()).InSeconds()); - SharedState result(subtle::Release_CompareAndSwap( -+#if defined(ARCH_CPU_64_BITS) - &SharedStateFromSharedMemory(shared_memory_mapping_)->value.i, -+#else -+ (base::subtle::Atomic32*)&SharedStateFromSharedMemory(shared_memory_mapping_)->value.i, -+#endif - old_state.value.i, new_state.value.i)); - - DCHECK_EQ(old_state.value.u, result.value.u); -@@ -375,7 +387,11 @@ bool DiscardableSharedMemory::Purge(Time current_time) { - SharedState old_state(SharedState::UNLOCKED, last_known_usage_); - SharedState new_state(SharedState::UNLOCKED, Time()); - SharedState result(subtle::Acquire_CompareAndSwap( -+#if defined(ARCH_CPU_64_BITS) - &SharedStateFromSharedMemory(shared_memory_mapping_)->value.i, -+#else -+ (base::subtle::Atomic32*)&SharedStateFromSharedMemory(shared_memory_mapping_)->value.i, -+#endif - old_state.value.i, new_state.value.i)); - - // Update |last_known_usage_| to |current_time| if the memory is locked. This -@@ -466,7 +482,11 @@ bool DiscardableSharedMemory::IsMemoryResident() const { - DCHECK(shared_memory_mapping_.IsValid()); - - SharedState result(subtle::NoBarrier_Load( -+#if defined(ARCH_CPU_64_BITS) - &SharedStateFromSharedMemory(shared_memory_mapping_)->value.i)); -+#else -+ (base::subtle::Atomic32*)&SharedStateFromSharedMemory(shared_memory_mapping_)->value.i)); -+#endif - - return result.GetLockState() == SharedState::LOCKED || - !result.GetTimestamp().is_null(); -@@ -476,7 +496,11 @@ bool DiscardableSharedMemory::IsMemoryLocked() const { - DCHECK(shared_memory_mapping_.IsValid()); - - SharedState result(subtle::NoBarrier_Load( -+#if defined(ARCH_CPU_64_BITS) - &SharedStateFromSharedMemory(shared_memory_mapping_)->value.i)); -+#else -+ (base::subtle::Atomic32*)&SharedStateFromSharedMemory(shared_memory_mapping_)->value.i)); -+#endif - - return result.GetLockState() == SharedState::LOCKED; - } -diff --git a/src/3rdparty/chromium/base/process/internal_linux.cc b/src/3rdparty/chromium/base/process/internal_linux.cc -index 41cae83..48f76d3 100644 ---- a/src/3rdparty/chromium/base/process/internal_linux.cc -+++ b/src/3rdparty/chromium/base/process/internal_linux.cc -@@ -47,13 +47,17 @@ pid_t ProcDirSlotToPid(const char* d_name) { - return 0; - - // Read the process's command line. -+#if defined(ARCH_CPU_64_BITS) - pid_t pid; -+#else -+ int pid; -+#endif - std::string pid_string(d_name); - if (!StringToInt(pid_string, &pid)) { - NOTREACHED(); - return 0; - } -- return pid; -+ return (pid_t)pid; - } - - bool ReadProcFile(const FilePath& file, std::string* buffer) { -diff --git a/src/3rdparty/chromium/base/process/internal_linux.h b/src/3rdparty/chromium/base/process/internal_linux.h -index 10fa85a..cfd5647 100644 ---- a/src/3rdparty/chromium/base/process/internal_linux.h -+++ b/src/3rdparty/chromium/base/process/internal_linux.h -@@ -121,8 +121,15 @@ void ForEachProcessTask(base::ProcessHandle process, Lambda&& lambda) { - continue; - - PlatformThreadId tid; -+#if defined(ARCH_CPU_64_BITS) - if (!StringToInt(tid_str, &tid)) - continue; -+#else -+ int tid_int; -+ if (!StringToInt(tid_str, &tid_int)) -+ continue; -+ tid = (PlatformThreadId)tid_int; -+#endif - - FilePath task_path = fd_path.Append(tid_str); - lambda(tid, task_path); -diff --git a/src/3rdparty/chromium/base/process/process_handle.h b/src/3rdparty/chromium/base/process/process_handle.h -index d7e185a..4b49da5 100644 ---- a/src/3rdparty/chromium/base/process/process_handle.h -+++ b/src/3rdparty/chromium/base/process/process_handle.h -@@ -36,6 +36,11 @@ typedef zx_handle_t ProcessHandle; - typedef zx_koid_t ProcessId; - const ProcessHandle kNullProcessHandle = ZX_HANDLE_INVALID; - const ProcessId kNullProcessId = ZX_KOID_INVALID; -+#elif defined(OS_HAIKU) -+typedef int32_t ProcessHandle; -+typedef int32_t ProcessId; -+const ProcessHandle kNullProcessHandle = 0; -+const ProcessId kNullProcessId = 0; - #elif defined(OS_POSIX) - // On POSIX, our ProcessHandle will just be the PID. - typedef pid_t ProcessHandle; -diff --git a/src/3rdparty/chromium/base/system/sys_info_posix.cc b/src/3rdparty/chromium/base/system/sys_info_posix.cc -index 9a58b6d..e018730 100644 ---- a/src/3rdparty/chromium/base/system/sys_info_posix.cc -+++ b/src/3rdparty/chromium/base/system/sys_info_posix.cc -@@ -219,7 +219,7 @@ std::string SysInfo::OperatingSystemArchitecture() { - return std::string(); - } - std::string arch(info.machine); -- if (arch == "i386" || arch == "i486" || arch == "i586" || arch == "i686") { -+ if (arch == "i386" || arch == "i486" || arch == "i586" || arch == "i686" || arch == "BePC") { - arch = "x86"; - } else if (arch == "amd64") { - arch = "x86_64"; -diff --git a/src/3rdparty/chromium/content/browser/zygote_host/zygote_host_impl_linux.cc b/src/3rdparty/chromium/content/browser/zygote_host/zygote_host_impl_linux.cc -index 6870307..2664266 100644 ---- a/src/3rdparty/chromium/content/browser/zygote_host/zygote_host_impl_linux.cc -+++ b/src/3rdparty/chromium/content/browser/zygote_host/zygote_host_impl_linux.cc -@@ -177,7 +177,11 @@ pid_t ZygoteHostImpl::LaunchZygote( - close(fds[1]); - control_fd->reset(fds[0]); - -+#if defined(ARCH_CPU_64_BITS) - pid_t pid = process.Pid(); -+#else -+ int32_t pid = process.Pid(); -+#endif - - if (is_sandboxed_zygote && (use_namespace_sandbox_ || use_suid_sandbox_)) { - // The namespace and SUID sandbox will execute the zygote in a new -@@ -200,7 +204,11 @@ pid_t ZygoteHostImpl::LaunchZygote( - - // Now receive the message that the zygote's ready to go, along with the - // main zygote process's ID. -+#if defined(ARCH_CPU_64_BITS) - pid_t real_pid; -+#else -+ int32_t real_pid; -+#endif - CHECK(ReceiveFixedMessage(fds[0], kZygoteHelloMessage, - sizeof(kZygoteHelloMessage), &real_pid)); - CHECK_GT(real_pid, 1); -diff --git a/src/3rdparty/chromium/content/common/zygote/zygote_communication_linux.cc b/src/3rdparty/chromium/content/common/zygote/zygote_communication_linux.cc -index 474be46..9ec8402 100644 ---- a/src/3rdparty/chromium/content/common/zygote/zygote_communication_linux.cc -+++ b/src/3rdparty/chromium/content/common/zygote/zygote_communication_linux.cc -@@ -123,7 +123,11 @@ pid_t ZygoteCommunication::ForkRequest( - // Sanity check that we've populated |fds| correctly. - DCHECK_EQ(num_fds_to_send, fds.size()); - -+#if defined(ARCH_CPU_64_BITS) - pid_t pid; -+#else -+ int32_t pid; -+#endif - { - base::AutoLock lock(control_lock_); - if (!SendMessage(pickle, &fds)) -diff --git a/src/3rdparty/chromium/gpu/ipc/common/memory_stats_mojom_traits.h b/src/3rdparty/chromium/gpu/ipc/common/memory_stats_mojom_traits.h -index e76b61b..97a3e17 100644 ---- a/src/3rdparty/chromium/gpu/ipc/common/memory_stats_mojom_traits.h -+++ b/src/3rdparty/chromium/gpu/ipc/common/memory_stats_mojom_traits.h -@@ -37,7 +37,7 @@ struct StructTraits { - static std::map - process_map(const gpu::VideoMemoryUsageStats& stats) { --#if defined(OS_WIN) || defined(OS_FUCHSIA) -+#if defined(OS_WIN) || defined(OS_FUCHSIA) || defined(OS_HAIKU) - std::map map; - for (const auto& pair : stats.process_map) - map[static_cast(pair.first)] = pair.second; -@@ -53,7 +53,7 @@ struct StructTraits process_map; - if (!data.ReadProcessMap(&process_map)) - return false; -diff --git a/src/3rdparty/chromium/third_party/blink/public/platform/web_vector.h b/src/3rdparty/chromium/third_party/blink/public/platform/web_vector.h -index 2cc291d..83b2538 100644 ---- a/src/3rdparty/chromium/third_party/blink/public/platform/web_vector.h -+++ b/src/3rdparty/chromium/third_party/blink/public/platform/web_vector.h -@@ -81,7 +81,7 @@ class WebVector { - // The vector can be populated using reserve() and emplace_back(). - WebVector() = default; - --#if defined(ARCH_CPU_64_BITS) -+#if defined(ARCH_CPU_64_BITS) || defined(__HAIKU__) - // Create a vector with |size| default-constructed elements. We define - // a constructor with size_t otherwise we'd have a duplicate define. - explicit WebVector(size_t size) : data_(size) {} -diff --git a/src/3rdparty/chromium/v8/src/base/atomicops.h b/src/3rdparty/chromium/v8/src/base/atomicops.h -index 5d6422b..9299d4c 100644 ---- a/src/3rdparty/chromium/v8/src/base/atomicops.h -+++ b/src/3rdparty/chromium/v8/src/base/atomicops.h -@@ -73,6 +73,8 @@ using Atomic64 = intptr_t; - // Atomic64 routines below, depending on your architecture. - #if defined(V8_OS_STARBOARD) - using AtomicWord = SbAtomicPtr; -+#elif defined(V8_TARGET_ARCH_IA32) -+using AtomicWord = int32_t; - #else - using AtomicWord = intptr_t; - #endif -diff --git a/src/3rdparty/gn/tools/gn/args.cc b/src/3rdparty/gn/tools/gn/args.cc -index a2f49b1..0d79586 100644 ---- a/src/3rdparty/gn/tools/gn/args.cc -+++ b/src/3rdparty/gn/tools/gn/args.cc -@@ -336,7 +336,7 @@ void Args::SetSystemVarsLocked(Scope* dest) const { - // Set the host CPU architecture based on the underlying OS, not - // whatever the current bit-tedness of the GN binary is. - std::string os_arch = OperatingSystemArchitecture(); -- if (os_arch == "x86") -+ if (os_arch == "x86" || os_arch == "BePC") - arch = kX86; - else if (os_arch == "x86_64") - arch = kX64; --- -2.42.1 - diff --git a/dev-qt/qtwebengine/patches/qtwebengine-5.15.18.patchset b/dev-qt/qtwebengine/patches/qtwebengine-5.15.18.patchset new file mode 100644 index 000000000..bc7bec77a --- /dev/null +++ b/dev-qt/qtwebengine/patches/qtwebengine-5.15.18.patchset @@ -0,0 +1,389 @@ +From 0f12ee97c4ca2f4fd7840c332a512827c3018fc9 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Thu, 7 Dec 2023 18:33:47 +1000 +Subject: =?UTF-8?q?Patchset=20based=20on=20qtwebengine=20patches=20for=20F?= + =?UTF-8?q?reeBSD,=20as=20well=20as=20patches=20by=20Kacper=20Kasper=20(Ka?= + =?UTF-8?q?pix),=20J=C3=A9r=C3=B4me=20Duval=20(korli)=20and=20Gerasim=20Tr?= + =?UTF-8?q?oeglazov=20(3dEyes).?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + + +diff --git a/configure.pri b/configure.pri +index cb53c93..1ddc84f 100644 +--- a/configure.pri ++++ b/configure.pri +@@ -136,6 +136,9 @@ defineTest(qtConfTest_detectPlatform) { + macos:qtwebengine_isMacOsPlatformSupported() { + $${1}.platform = "macos" + } ++ unix:qtwebengine_isLinuxPlatformSupported() { ++ $${1}.platform = "linux" ++ } + ios:qtwebengine_isMacOsPlatformSupported() { + $${1}.platform = "ios" + } +diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf +index 7f63058..dc536cc 100644 +--- a/mkspecs/features/functions.prf ++++ b/mkspecs/features/functions.prf +@@ -89,6 +89,10 @@ defineReplace(gnWebEngineArgs) { + include($$QTWEBENGINE_ROOT/src/buildtools/config/windows.pri) + include($$QTWEBENGINE_ROOT/src/core/config/windows.pri) + } ++ haiku { ++ include($$QTWEBENGINE_ROOT/src/buildtools/config/haiku.pri) ++ include($$QTWEBENGINE_ROOT/src/core/config/haiku.pri) ++ } + isEmpty(gn_args): error(No gn_args found please make sure you have valid configuration.) + return($$gn_args) + } +@@ -98,6 +102,7 @@ defineReplace(gnPdfArgs) { + macos: include($$QTWEBENGINE_ROOT/src/buildtools/config/mac_osx.pri) + ios: include($$QTWEBENGINE_ROOT/src/pdf/config/ios.pri) + win32: include($$QTWEBENGINE_ROOT/src/buildtools/config/windows.pri) ++ haiku: include($$QTWEBENGINE_ROOT/src/buildtools/config/haiku.pri) + include($$QTWEBENGINE_ROOT/src/pdf/config/common.pri) + isEmpty(gn_args): error(No gn_args found please make sure you have valid configuration.) + return($$gn_args) +@@ -119,6 +124,7 @@ defineReplace(gnOS) { + macos: return(mac) + win32: return(win) + linux: return(linux) ++ haiku: return(haiku) + error(Unsupported platform) + return(unknown) + } +diff --git a/src/buildtools/buildtools.pro b/src/buildtools/buildtools.pro +index 1366d18..d6fbdfd 100644 +--- a/src/buildtools/buildtools.pro ++++ b/src/buildtools/buildtools.pro +@@ -1,6 +1,6 @@ + TEMPLATE = subdirs + +-linux { ++unix { + # configure_host.pro and configure_target.pro are phony pro files that + # extract things like compiler and linker from qmake. + # Only used on Linux as it is only important for cross-building and alternative compilers. +diff --git a/src/buildtools/config/haiku.pri b/src/buildtools/config/haiku.pri +new file mode 100644 +index 0000000..33aa8be +--- /dev/null ++++ b/src/buildtools/config/haiku.pri +@@ -0,0 +1,6 @@ ++include(linux.pri) ++gn_args += \ ++ enable_basic_printing=true \ ++ enable_print_preview=true \ ++ use_dbus=false \ ++ use_udev=false +diff --git a/src/buildtools/config/linking.pri b/src/buildtools/config/linking.pri +index f295e2c..90d63b0 100644 +--- a/src/buildtools/config/linking.pri ++++ b/src/buildtools/config/linking.pri +@@ -34,7 +34,7 @@ if(macos|ios) { + } + } + +-linux { ++if(unix) { + !static { + QMAKE_LFLAGS += @$${RSP_OBJECT_FILE} + QMAKE_LFLAGS += -Wl,--start-group @$${RSP_ARCHIVE_FILE} -Wl,--end-group +@@ -60,7 +60,7 @@ LIBS_PRIVATE += $$NINJA_LIB_DIRS $$NINJA_LIBS + + unix:qtConfig(webengine-noexecstack): \ + QMAKE_LFLAGS += -Wl,-z,noexecstack +-linux { ++unix { + # add chromium flags + for(flag, NINJA_LFLAGS) { + # filter out some flags +diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri +index a9df3d2..e533ffc 100644 +--- a/src/buildtools/config/support.pri ++++ b/src/buildtools/config/support.pri +@@ -5,7 +5,7 @@ defineTest(qtwebengine_skipBuild) { + + # this should match webengine-core-support + defineReplace(qtwebengine_checkWebEngineCoreError) { +- !linux:!win32:!macos { ++ !linux:!win32:!macos:!unix { + qtwebengine_skipBuild("QtWebEngine can be built only on Linux, Windows or macOS.") + return(false) + } +@@ -24,14 +24,14 @@ defineReplace(qtwebengine_checkWebEngineCoreError) { + !qtwebengine_checkForPython(QtWebEngine):return(false) + !qtwebengine_checkForNodejs(QtWebEngine):return(false) + !qtwebengine_checkForSanitizer(QtWebEngine):return(false) +- linux:!qtwebengine_checkForPkgCfg(QtWebEngine):return(false) +- linux:!qtwebengine_checkForHostPkgCfg(QtWebEngine):return(false) ++ unix:!qtwebengine_checkForPkgCfg(QtWebEngine):return(false) ++ unix:!qtwebengine_checkForHostPkgCfg(QtWebEngine):return(false) + linux:!qtwebengine_checkForGlibc(QtWebEngine):return(false) +- linux:!qtwebengine_checkForKhronos(QtWebEngine):return(false) +- linux:!qtwebengine_checkForPackage(QtWebEngine,nss):return(false) +- linux:!qtwebengine_checkForPackage(QtWebEngine,dbus):return(false) +- linux:!qtwebengine_checkForPackage(QtWebEngine,fontconfig):return(false) +- linux:!qtwebengine_checkForQpaXcb(QtWebEngine):return(false) ++ unix:!qtwebengine_checkForKhronos(QtWebEngine):return(false) ++ unix:!qtwebengine_checkForPackage(QtWebEngine,nss):return(false) ++# unix:!qtwebengine_checkForPackage(QtWebEngine,dbus):return(false) ++ unix:!qtwebengine_checkForPackage(QtWebEngine,fontconfig):return(false) ++ unix:!qtwebengine_checkForQpaXcb(QtWebEngine):return(false) + win32:!qtwebengine_checkForCompiler64(QtWebEngine):return(false) + win32:!qtwebengine_checkForWinVersion(QtWebEngine):return(false) + return(true) +@@ -39,7 +39,7 @@ defineReplace(qtwebengine_checkWebEngineCoreError) { + + # this shuold match webengine-qtpdf-support + defineReplace(qtwebengine_checkPdfError) { +- !linux:!win32:!macos:!ios { ++ !linux:!win32:!macos:!ios:!unix { + qtwebengine_skipBuild("QtPdf can be built only on Linux, Windows, macOS or iOS.") + return(false) + } +@@ -53,8 +53,8 @@ defineReplace(qtwebengine_checkPdfError) { + !qtwebengine_checkForFlex(QtPdf):return(false) + !qtwebengine_checkForPython(QtPdf):return(false) + !qtwebengine_checkForSanitizer(QtPdf):return(false) +- linux:!qtwebengine_checkForPkgCfg(QtPdf):return(false) +- linux:!qtwebengine_checkForHostPkgCfg(QtPdf):return(false) ++ unix:!qtwebengine_checkForPkgCfg(QtPdf):return(false) ++ unix:!qtwebengine_checkForHostPkgCfg(QtPdf):return(false) + win32:!qtwebengine_checkForWinVersion(QtPdf):return(false) + return(true) + } +diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json +index 5e5d9d7..fe464c7 100644 +--- a/src/buildtools/configure.json ++++ b/src/buildtools/configure.json +@@ -318,8 +318,8 @@ + "type": "detectNinja" + }, + "webengine-python": { +- "label": "python2", +- "type": "detectPython2", ++ "label": "python3", ++ "type": "detectPython", + "log": "location" + }, + "webengine-winversion": { +@@ -386,7 +386,7 @@ + "features": { + "webengine-core-support": { + "label": "Support Qt WebEngine Core", +- "condition": "(config.linux || config.win32 || config.macos) ++ "condition": "(config.unix || config.win32 || config.macos) + && !config.static + && module.gui + && features.webengine-submodule +@@ -399,21 +399,20 @@ + && features.webengine-python + && features.webengine-nodejs + && (!config.sanitizer || features.webengine-sanitizer) +- && (!config.linux || features.pkg-config) +- && (!config.linux || features.webengine-host-pkg-config) ++ && (!config.unix || features.pkg-config) ++ && (!config.unix || features.webengine-host-pkg-config) + && (!config.linux || features.webengine-system-glibc) +- && (!config.linux || features.webengine-system-khr) +- && (!config.linux || features.webengine-system-nss) +- && (!config.linux || features.webengine-system-dbus) +- && (!config.linux || features.webengine-system-fontconfig) +- && (!config.linux || !features.pkg-config || !features.xcb || features.webengine-ozone-x11) ++ && (!config.unix || features.webengine-system-khr) ++ && (!config.unix || features.webengine-system-nss) ++ && (!config.unix || features.webengine-system-fontconfig) ++ && (!config.unix || !features.pkg-config || !features.xcb || features.webengine-ozone-x11) + && (!config.win32 || features.webengine-win-compiler64) + && (!config.win32 || features.webengine-winversion)", + "output": [ "privateFeature" ] + }, + "webengine-qtpdf-support": { + "label": "Support Qt Pdf", +- "condition": "(config.linux || config.win32 || config.macos || config.ios) ++ "condition": "(config.unix || config.win32 || config.macos || config.ios) + && module.gui + && features.webengine-submodule + && features.webengine-nowhitespace +@@ -446,7 +445,7 @@ + "output": [ "privateFeature" ] + }, + "webengine-python": { +- "label": "python2", ++ "label": "python3", + "condition": "tests.webengine-python", + "output": [ + "privateFeature", +@@ -525,7 +524,6 @@ + }, + "webengine-system-gn": { + "label": "Use System Gn", +- "autoDetect": "false", + "condition": "tests.webengine-gn", + "output": [ "privateFeature" ] + }, +@@ -807,7 +805,6 @@ + "condition": "config.unix && !config.macos && !config.ios", + "entries": [ + "webengine-system-fontconfig", +- "webengine-system-dbus", + "webengine-system-nss", + "webengine-system-khr", + "webengine-system-glibc" +diff --git a/src/core/api/core_api.pro b/src/core/api/core_api.pro +index 28d5586..6564be6 100644 +--- a/src/core/api/core_api.pro ++++ b/src/core/api/core_api.pro +@@ -73,7 +73,7 @@ SOURCES = \ + qwebengineurlschemehandler.cpp + + ### Qt6 Remove this workaround +-unix:!isEmpty(QMAKE_LFLAGS_VERSION_SCRIPT):!static { ++linux:!isEmpty(QMAKE_LFLAGS_VERSION_SCRIPT):!static { + SOURCES += qtbug-60565.cpp \ + qtbug-61521.cpp + } +diff --git a/src/core/chromium_overrides.cpp b/src/core/chromium_overrides.cpp +index 8a385e4..d6eb5e0 100644 +--- a/src/core/chromium_overrides.cpp ++++ b/src/core/chromium_overrides.cpp +@@ -36,7 +36,7 @@ + ** $QT_END_LICENSE$ + ** + ****************************************************************************/ +- ++#pragma GCC diagnostic ignored "-Wdeprecated-copy" + #include "ozone/gl_context_qt.h" + #include "qtwebenginecoreglobal_p.h" + #include "web_contents_view_qt.h" +diff --git a/src/core/color_chooser_controller.cpp b/src/core/color_chooser_controller.cpp +index 361ff93..2714eef 100644 +--- a/src/core/color_chooser_controller.cpp ++++ b/src/core/color_chooser_controller.cpp +@@ -37,6 +37,7 @@ + ** + ****************************************************************************/ + ++#pragma GCC diagnostic ignored "-Wdeprecated-copy" + #include "content/browser/web_contents/web_contents_impl.h" + + #include "color_chooser_controller.h" +diff --git a/src/core/config/haiku.pri b/src/core/config/haiku.pri +new file mode 100644 +index 0000000..82139a4 +--- /dev/null ++++ b/src/core/config/haiku.pri +@@ -0,0 +1,26 @@ ++include(common.pri) ++ ++!host_build{ ++ gn_args += use_pulseaudio=false ++ gn_args += use_alsa=false ++ ++ !packagesExist(libpci): gn_args += use_libpci=false ++ ++ qtConfig(webengine-webrtc): qtConfig(webengine-webrtc-pipewire): gn_args += rtc_use_pipewire=true ++ ++ qtConfig(webengine-system-libevent): gn_args += use_system_libevent=true ++ qtConfig(webengine-system-libwebp): gn_args += use_system_libwebp=true ++ qtConfig(webengine-system-libxml2): gn_args += use_system_libxml=true use_system_libxslt=true ++ qtConfig(webengine-system-opus): gn_args += use_system_opus=true ++ qtConfig(webengine-system-snappy): gn_args += use_system_snappy=true ++ qtConfig(webengine-system-libvpx): gn_args += use_system_libvpx=true ++ qtConfig(webengine-system-icu): gn_args += use_system_icu=true icu_use_data_file=false ++ qtConfig(webengine-system-ffmpeg): gn_args += use_system_ffmpeg=true ++ qtConfig(webengine-system-re2): gn_args += use_system_re2=true ++ qtConfig(webengine-system-lcms2): gn_args += use_system_lcms2=true ++ ++ # FIXME: ++ #qtConfig(webengine-system-protobuf): gn_args += use_system_protobuf=true ++ #qtConfig(webengine-system-jsoncpp): gn_args += use_system_jsoncpp=true ++ #qtConfig(webengine-system-libsrtp: gn_args += use_system_libsrtp=true ++} +diff --git a/src/core/core_module.pro b/src/core/core_module.pro +index 9e087c8..decafe8 100644 +--- a/src/core/core_module.pro ++++ b/src/core/core_module.pro +@@ -45,10 +45,10 @@ QMAKE_INFO_PLIST = Info_mac.plist + # and doesn't let Chromium get access to libc symbols through dlsym. + CONFIG -= bsymbolic_functions + +-linux { ++unix { + !ccache:!use_gold_linker:!use_lld_linker { +- QMAKE_LINK="ulimit -n 4096 && $$QMAKE_LINK" +- QMAKE_LINK_SHLIB="ulimit -n 4096 && $$QMAKE_LINK_SHLIB" ++ QMAKE_LINK="ulimit -S -n 4096 && $$QMAKE_LINK" ++ QMAKE_LINK_SHLIB="ulimit -S -n 4096 && $$QMAKE_LINK_SHLIB" + } + qtConfig(separate_debug_info): QMAKE_POST_LINK="cd $(DESTDIR) && $(STRIP) --strip-unneeded $(TARGET)" + } +diff --git a/src/core/qtwebengine_resources.gni b/src/core/qtwebengine_resources.gni +index 3bf1a5d..29fd260 100644 +--- a/src/core/qtwebengine_resources.gni ++++ b/src/core/qtwebengine_resources.gni +@@ -27,7 +27,6 @@ repack("qtwebengine_repack_resources") { + "$root_gen_dir/components/components_resources.pak", + "$root_gen_dir/components/dev_ui_components_resources.pak", + "$root_gen_dir/content/browser/resources/media/media_internals_resources.pak", +- "$root_gen_dir/content/browser/tracing/tracing_resources.pak", + "$root_gen_dir/content/content_resources.pak", + "$root_gen_dir/content/dev_ui_content_resources.pak", + "$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak", +@@ -44,7 +43,6 @@ repack("qtwebengine_repack_resources") { + "//components/resources:components_resources_grit", + "//components/resources:dev_ui_components_resources_grit", + "//content/browser/resources/media:media_internals_resources", +- "//content/browser/tracing:resources", + "//content:content_resources_grit", + "//content:dev_ui_content_resources_grit", + "//mojo/public/js:resources", +-- +2.45.2 + + +From b0a9e6c4c09993da3ccf886ef2e362779a125fbf Mon Sep 17 00:00:00 2001 +From: Ken Moffat +Date: Sat, 16 Dec 2023 18:57:13 +1000 +Subject: patches from Arch via gentoo to use python3 + + +diff --git a/configure.pri b/configure.pri +index 1ddc84f..3792f42 100644 +--- a/configure.pri ++++ b/configure.pri +@@ -7,17 +7,7 @@ QTWEBENGINE_SOURCE_TREE = $$PWD + equals(QMAKE_HOST.os, Windows): EXE_SUFFIX = .exe + + defineTest(isPythonVersionSupported) { +- python = $$system_quote($$system_path($$1)) +- python_version = $$system('$$python -c "import sys; print(sys.version_info[0:3])"') +- python_version ~= s/[()]//g +- python_version = $$split(python_version, ',') +- python_major_version = $$first(python_version) +- python_minor_version = $$member(python_version, 1) +- python_patch_version = $$member(python_version, 2) +- greaterThan(python_major_version, 2): greaterThan(python_minor_version, 7): return(true) +- greaterThan(python_major_version, 1): greaterThan(python_minor_version, 6): greaterThan(python_patch_version, 4): return(true) +- qtLog("Unsupported python version: $${python_major_version}.$${python_minor_version}.$${python_patch_version}.") +- return(false) ++ return(true) + } + + defineTest(qtConfTest_detectJumboBuild) { +@@ -49,7 +39,7 @@ defineTest(qtConfReport_jumboBuild) { + qtConfReportPadded($${1}, $$mergeLimit) + } + +-defineTest(qtConfTest_detectPython2) { ++defineTest(qtConfTest_detectPython) { + pythonOverride = $$eval(config.input.python_override) + !isEmpty(pythonOverride) { + python = $$qtConfFindInPath("$$pythonOverride$$EXE_SUFFIX") +-- +2.45.2 + diff --git a/dev-qt/qtwebengine/patches/qtwebengine-5.15.17.patchset b/dev-qt/qtwebengine/patches/qtwebengine-chromium-5.15.18.patchset similarity index 64% rename from dev-qt/qtwebengine/patches/qtwebengine-5.15.17.patchset rename to dev-qt/qtwebengine/patches/qtwebengine-chromium-5.15.18.patchset index f8889e04b..86f30bda1 100644 --- a/dev-qt/qtwebengine/patches/qtwebengine-5.15.17.patchset +++ b/dev-qt/qtwebengine/patches/qtwebengine-chromium-5.15.18.patchset @@ -1,4 +1,4 @@ -From 923f115cbb1a207af05f76e159acdbd11c211d76 Mon Sep 17 00:00:00 2001 +From 57aa28e5f662a5cc5267c93234907ab856cc1f8f Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 7 Dec 2023 18:33:47 +1000 Subject: =?UTF-8?q?Patchset=20based=20on=20qtwebengine=20patches=20for=20F?= @@ -10,55 +10,10 @@ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -diff --git a/configure.pri b/configure.pri -index 3a33bdc..8be641c 100644 ---- a/configure.pri -+++ b/configure.pri -@@ -123,6 +123,9 @@ defineTest(qtConfTest_detectPlatform) { - macos:qtwebengine_isMacOsPlatformSupported() { - $${1}.platform = "macos" - } -+ unix:qtwebengine_isLinuxPlatformSupported() { -+ $${1}.platform = "linux" -+ } - ios:qtwebengine_isMacOsPlatformSupported() { - $${1}.platform = "ios" - } -diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf -index 7f63058..dc536cc 100644 ---- a/mkspecs/features/functions.prf -+++ b/mkspecs/features/functions.prf -@@ -89,6 +89,10 @@ defineReplace(gnWebEngineArgs) { - include($$QTWEBENGINE_ROOT/src/buildtools/config/windows.pri) - include($$QTWEBENGINE_ROOT/src/core/config/windows.pri) - } -+ haiku { -+ include($$QTWEBENGINE_ROOT/src/buildtools/config/haiku.pri) -+ include($$QTWEBENGINE_ROOT/src/core/config/haiku.pri) -+ } - isEmpty(gn_args): error(No gn_args found please make sure you have valid configuration.) - return($$gn_args) - } -@@ -98,6 +102,7 @@ defineReplace(gnPdfArgs) { - macos: include($$QTWEBENGINE_ROOT/src/buildtools/config/mac_osx.pri) - ios: include($$QTWEBENGINE_ROOT/src/pdf/config/ios.pri) - win32: include($$QTWEBENGINE_ROOT/src/buildtools/config/windows.pri) -+ haiku: include($$QTWEBENGINE_ROOT/src/buildtools/config/haiku.pri) - include($$QTWEBENGINE_ROOT/src/pdf/config/common.pri) - isEmpty(gn_args): error(No gn_args found please make sure you have valid configuration.) - return($$gn_args) -@@ -119,6 +124,7 @@ defineReplace(gnOS) { - macos: return(mac) - win32: return(win) - linux: return(linux) -+ haiku: return(haiku) - error(Unsupported platform) - return(unknown) - } -diff --git a/src/3rdparty/chromium/BUILD.gn b/src/3rdparty/chromium/BUILD.gn +diff --git a/chromium/BUILD.gn b/chromium/BUILD.gn index 8d9657d..5f6954b 100644 ---- a/src/3rdparty/chromium/BUILD.gn -+++ b/src/3rdparty/chromium/BUILD.gn +--- a/chromium/BUILD.gn ++++ b/chromium/BUILD.gn @@ -423,7 +423,7 @@ group("gn_all") { ] } @@ -156,10 +111,10 @@ index 8d9657d..5f6954b 100644 ]) != [], "Do not use a platform name in your output directory (found \"$root_build_dir\"). http://crbug.com/548283") -diff --git a/src/3rdparty/chromium/base/BUILD.gn b/src/3rdparty/chromium/base/BUILD.gn +diff --git a/chromium/base/BUILD.gn b/chromium/base/BUILD.gn index c15b2b2..03bde29 100644 ---- a/src/3rdparty/chromium/base/BUILD.gn -+++ b/src/3rdparty/chromium/base/BUILD.gn +--- a/chromium/base/BUILD.gn ++++ b/chromium/base/BUILD.gn @@ -54,7 +54,7 @@ declare_args() { # replacement base::Location::Current(). On by default in non-official builds # for testing purposes. @@ -257,11 +212,11 @@ index c15b2b2..03bde29 100644 # iOS if (is_ios) { sources -= [ -diff --git a/src/3rdparty/chromium/base/base_paths_haiku.cc b/src/3rdparty/chromium/base/base_paths_haiku.cc +diff --git a/chromium/base/base_paths_haiku.cc b/chromium/base/base_paths_haiku.cc new file mode 100644 index 0000000..ca8aa43 --- /dev/null -+++ b/src/3rdparty/chromium/base/base_paths_haiku.cc ++++ b/chromium/base/base_paths_haiku.cc @@ -0,0 +1,21 @@ +// Copyright 2017 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be @@ -284,11 +239,11 @@ index 0000000..ca8aa43 +} + +} // namespace base -diff --git a/src/3rdparty/chromium/base/base_paths_haiku.h b/src/3rdparty/chromium/base/base_paths_haiku.h +diff --git a/chromium/base/base_paths_haiku.h b/chromium/base/base_paths_haiku.h new file mode 100644 index 0000000..d30b52a --- /dev/null -+++ b/src/3rdparty/chromium/base/base_paths_haiku.h ++++ b/chromium/base/base_paths_haiku.h @@ -0,0 +1,26 @@ +// Copyright (c) 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be @@ -316,10 +271,10 @@ index 0000000..d30b52a +} // namespace base + +#endif // BASE_BASE_PATHS_HAIKU_H_ -diff --git a/src/3rdparty/chromium/base/base_switches.cc b/src/3rdparty/chromium/base/base_switches.cc +diff --git a/chromium/base/base_switches.cc b/chromium/base/base_switches.cc index 8c8563e..4b73087 100644 ---- a/src/3rdparty/chromium/base/base_switches.cc -+++ b/src/3rdparty/chromium/base/base_switches.cc +--- a/chromium/base/base_switches.cc ++++ b/chromium/base/base_switches.cc @@ -117,7 +117,7 @@ const char kDisableHighResTimer[] = "disable-highres-timer"; const char kDisableUsbKeyboardDetect[] = "disable-usb-keyboard-detect"; #endif @@ -329,10 +284,10 @@ index 8c8563e..4b73087 100644 // The /dev/shm partition is too small in certain VM environments, causing // Chrome to fail or crash (see http://crbug.com/715363). Use this flag to // work-around this issue (a temporary directory will always be used to create -diff --git a/src/3rdparty/chromium/base/base_switches.h b/src/3rdparty/chromium/base/base_switches.h +diff --git a/chromium/base/base_switches.h b/chromium/base/base_switches.h index ce6d2db..b885653 100644 ---- a/src/3rdparty/chromium/base/base_switches.h -+++ b/src/3rdparty/chromium/base/base_switches.h +--- a/chromium/base/base_switches.h ++++ b/chromium/base/base_switches.h @@ -39,7 +39,7 @@ extern const char kDisableHighResTimer[]; extern const char kDisableUsbKeyboardDetect[]; #endif @@ -342,10 +297,10 @@ index ce6d2db..b885653 100644 extern const char kDisableDevShmUsage[]; #endif -diff --git a/src/3rdparty/chromium/base/cpu.cc b/src/3rdparty/chromium/base/cpu.cc +diff --git a/chromium/base/cpu.cc b/chromium/base/cpu.cc index 2a5b803..9312918 100644 ---- a/src/3rdparty/chromium/base/cpu.cc -+++ b/src/3rdparty/chromium/base/cpu.cc +--- a/chromium/base/cpu.cc ++++ b/chromium/base/cpu.cc @@ -17,7 +17,7 @@ #include "base/stl_util.h" @@ -355,10 +310,10 @@ index 2a5b803..9312918 100644 #include "base/containers/flat_set.h" #include "base/files/file_util.h" #include "base/no_destructor.h" -diff --git a/src/3rdparty/chromium/base/cpu.h b/src/3rdparty/chromium/base/cpu.h +diff --git a/chromium/base/cpu.h b/chromium/base/cpu.h index 2e2d29a..0f3b681 100644 ---- a/src/3rdparty/chromium/base/cpu.h -+++ b/src/3rdparty/chromium/base/cpu.h +--- a/chromium/base/cpu.h ++++ b/chromium/base/cpu.h @@ -74,7 +74,7 @@ class BASE_EXPORT CPU final { const std::string& cpu_brand() const { return cpu_brand_; } @@ -377,10 +332,10 @@ index 2e2d29a..0f3b681 100644 private: // Query the processor for CPUID information. -diff --git a/src/3rdparty/chromium/base/debug/elf_reader.cc b/src/3rdparty/chromium/base/debug/elf_reader.cc +diff --git a/chromium/base/debug/elf_reader.cc b/chromium/base/debug/elf_reader.cc index 0389c44..8bc5fb2 100644 ---- a/src/3rdparty/chromium/base/debug/elf_reader.cc -+++ b/src/3rdparty/chromium/base/debug/elf_reader.cc +--- a/chromium/base/debug/elf_reader.cc ++++ b/chromium/base/debug/elf_reader.cc @@ -8,6 +8,12 @@ #include #include @@ -394,10 +349,10 @@ index 0389c44..8bc5fb2 100644 #include "base/bits.h" #include "base/containers/span.h" #include "base/hash/sha1.h" -diff --git a/src/3rdparty/chromium/base/debug/stack_trace.cc b/src/3rdparty/chromium/base/debug/stack_trace.cc +diff --git a/chromium/base/debug/stack_trace.cc b/chromium/base/debug/stack_trace.cc index f5e2dbb..f01db79 100644 ---- a/src/3rdparty/chromium/base/debug/stack_trace.cc -+++ b/src/3rdparty/chromium/base/debug/stack_trace.cc +--- a/chromium/base/debug/stack_trace.cc ++++ b/chromium/base/debug/stack_trace.cc @@ -225,7 +225,7 @@ std::string StackTrace::ToString() const { } std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const { @@ -407,10 +362,10 @@ index f5e2dbb..f01db79 100644 OutputToStreamWithPrefix(&stream, prefix_string); #endif return stream.str(); -diff --git a/src/3rdparty/chromium/base/debug/stack_trace_posix.cc b/src/3rdparty/chromium/base/debug/stack_trace_posix.cc +diff --git a/chromium/base/debug/stack_trace_posix.cc b/chromium/base/debug/stack_trace_posix.cc index 6a1531e..61f1fcf 100644 ---- a/src/3rdparty/chromium/base/debug/stack_trace_posix.cc -+++ b/src/3rdparty/chromium/base/debug/stack_trace_posix.cc +--- a/chromium/base/debug/stack_trace_posix.cc ++++ b/chromium/base/debug/stack_trace_posix.cc @@ -27,7 +27,7 @@ #if !defined(USE_SYMBOLIZE) #include @@ -472,10 +427,10 @@ index 6a1531e..61f1fcf 100644 void StackTrace::OutputToStreamWithPrefix(std::ostream* os, const char* prefix_string) const { StreamBacktraceOutputHandler handler(os); -diff --git a/src/3rdparty/chromium/base/files/file.h b/src/3rdparty/chromium/base/files/file.h +diff --git a/chromium/base/files/file.h b/chromium/base/files/file.h index 2743d1f..871ef43 100644 ---- a/src/3rdparty/chromium/base/files/file.h -+++ b/src/3rdparty/chromium/base/files/file.h +--- a/chromium/base/files/file.h ++++ b/chromium/base/files/file.h @@ -25,7 +25,8 @@ namespace base { @@ -486,10 +441,10 @@ index 2743d1f..871ef43 100644 typedef struct stat stat_wrapper_t; #elif defined(OS_POSIX) typedef struct stat64 stat_wrapper_t; -diff --git a/src/3rdparty/chromium/base/files/file_posix.cc b/src/3rdparty/chromium/base/files/file_posix.cc +diff --git a/chromium/base/files/file_posix.cc b/chromium/base/files/file_posix.cc index b69d2e6..a521ef0 100644 ---- a/src/3rdparty/chromium/base/files/file_posix.cc -+++ b/src/3rdparty/chromium/base/files/file_posix.cc +--- a/chromium/base/files/file_posix.cc ++++ b/chromium/base/files/file_posix.cc @@ -584,7 +584,8 @@ File::Error File::GetLastFileError() { } @@ -500,10 +455,10 @@ index b69d2e6..a521ef0 100644 int File::Stat(const char* path, stat_wrapper_t* sb) { ScopedBlockingCall scoped_blocking_call(FROM_HERE, BlockingType::MAY_BLOCK); return stat(path, sb); -diff --git a/src/3rdparty/chromium/base/files/file_util.h b/src/3rdparty/chromium/base/files/file_util.h +diff --git a/chromium/base/files/file_util.h b/chromium/base/files/file_util.h index df0f0bd..618b712 100644 ---- a/src/3rdparty/chromium/base/files/file_util.h -+++ b/src/3rdparty/chromium/base/files/file_util.h +--- a/chromium/base/files/file_util.h ++++ b/chromium/base/files/file_util.h @@ -278,14 +278,14 @@ BASE_EXPORT bool SetPosixFilePermissions(const FilePath& path, int mode); BASE_EXPORT bool ExecutableExistsInPath(Environment* env, const FilePath::StringType& executable); @@ -530,10 +485,10 @@ index df0f0bd..618b712 100644 // Broad categories of file systems as returned by statfs() on Linux. enum FileSystemType { FILE_SYSTEM_UNKNOWN, // statfs failed. -diff --git a/src/3rdparty/chromium/base/files/file_util_posix.cc b/src/3rdparty/chromium/base/files/file_util_posix.cc +diff --git a/chromium/base/files/file_util_posix.cc b/chromium/base/files/file_util_posix.cc index d74cf2b..1eb07ae 100644 ---- a/src/3rdparty/chromium/base/files/file_util_posix.cc -+++ b/src/3rdparty/chromium/base/files/file_util_posix.cc +--- a/chromium/base/files/file_util_posix.cc ++++ b/chromium/base/files/file_util_posix.cc @@ -951,6 +951,10 @@ bool AllocateFileRegion(File* file, int64_t offset, size_t size) { if (HANDLE_EINTR(fallocate(file->GetPlatformFile(), 0, offset, size)) != -1) return true; @@ -613,10 +568,10 @@ index d74cf2b..1eb07ae 100644 +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_HAIKU) } // namespace base -diff --git a/src/3rdparty/chromium/base/files/scoped_file.cc b/src/3rdparty/chromium/base/files/scoped_file.cc +diff --git a/chromium/base/files/scoped_file.cc b/chromium/base/files/scoped_file.cc index a2e1e6b..50226cf 100644 ---- a/src/3rdparty/chromium/base/files/scoped_file.cc -+++ b/src/3rdparty/chromium/base/files/scoped_file.cc +--- a/chromium/base/files/scoped_file.cc ++++ b/chromium/base/files/scoped_file.cc @@ -29,7 +29,7 @@ void ScopedFDCloseTraits::Free(int fd) { // It's especially problematic on Linux with the setuid sandbox, where // a single open directory would bypass the entire security model. @@ -634,10 +589,10 @@ index a2e1e6b..50226cf 100644 } #endif // OS_POSIX || OS_FUCHSIA -diff --git a/src/3rdparty/chromium/base/linux_util.cc b/src/3rdparty/chromium/base/linux_util.cc +diff --git a/chromium/base/linux_util.cc b/chromium/base/linux_util.cc index 8dac7c7..3b429fe 100644 ---- a/src/3rdparty/chromium/base/linux_util.cc -+++ b/src/3rdparty/chromium/base/linux_util.cc +--- a/chromium/base/linux_util.cc ++++ b/chromium/base/linux_util.cc @@ -25,6 +25,7 @@ #include "base/strings/string_split.h" #include "base/strings/string_tokenizer.h" @@ -646,10 +601,10 @@ index 8dac7c7..3b429fe 100644 #include "build/build_config.h" namespace base { -diff --git a/src/3rdparty/chromium/base/logging.cc b/src/3rdparty/chromium/base/logging.cc +diff --git a/chromium/base/logging.cc b/chromium/base/logging.cc index b5cf2c4..4efc27d 100644 ---- a/src/3rdparty/chromium/base/logging.cc -+++ b/src/3rdparty/chromium/base/logging.cc +--- a/chromium/base/logging.cc ++++ b/chromium/base/logging.cc @@ -549,7 +549,7 @@ LogMessage::LogMessage(const char* file, int line, const char* condition) LogMessage::~LogMessage() { size_t stack_start = stream_.tellp(); @@ -659,10 +614,10 @@ index b5cf2c4..4efc27d 100644 if (severity_ == LOG_FATAL && !base::debug::BeingDebugged()) { // Include a stack trace on a fatal, unless a debugger is attached. base::debug::StackTrace stack_trace; -diff --git a/src/3rdparty/chromium/base/memory/discardable_shared_memory.cc b/src/3rdparty/chromium/base/memory/discardable_shared_memory.cc +diff --git a/chromium/base/memory/discardable_shared_memory.cc b/chromium/base/memory/discardable_shared_memory.cc index c885b30..4aa6229 100644 ---- a/src/3rdparty/chromium/base/memory/discardable_shared_memory.cc -+++ b/src/3rdparty/chromium/base/memory/discardable_shared_memory.cc +--- a/chromium/base/memory/discardable_shared_memory.cc ++++ b/chromium/base/memory/discardable_shared_memory.cc @@ -407,6 +407,8 @@ bool DiscardableSharedMemory::Purge(Time current_time) { // reusable bit, which allows both Activity Monitor and memory-infra to // correctly track the pages. @@ -672,10 +627,10 @@ index c885b30..4aa6229 100644 #else #define MADV_PURGE_ARGUMENT MADV_FREE #endif -diff --git a/src/3rdparty/chromium/base/memory/madv_free_discardable_memory_posix.cc b/src/3rdparty/chromium/base/memory/madv_free_discardable_memory_posix.cc +diff --git a/chromium/base/memory/madv_free_discardable_memory_posix.cc b/chromium/base/memory/madv_free_discardable_memory_posix.cc index 3cc1c8c..105ebeb 100644 ---- a/src/3rdparty/chromium/base/memory/madv_free_discardable_memory_posix.cc -+++ b/src/3rdparty/chromium/base/memory/madv_free_discardable_memory_posix.cc +--- a/chromium/base/memory/madv_free_discardable_memory_posix.cc ++++ b/chromium/base/memory/madv_free_discardable_memory_posix.cc @@ -302,6 +302,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() const { std::vector vec(allocated_pages_); #endif @@ -692,10 +647,10 @@ index 3cc1c8c..105ebeb 100644 return true; } -diff --git a/src/3rdparty/chromium/base/memory/platform_shared_memory_region.h b/src/3rdparty/chromium/base/memory/platform_shared_memory_region.h +diff --git a/chromium/base/memory/platform_shared_memory_region.h b/chromium/base/memory/platform_shared_memory_region.h index 9b67c0e..6447162 100644 ---- a/src/3rdparty/chromium/base/memory/platform_shared_memory_region.h -+++ b/src/3rdparty/chromium/base/memory/platform_shared_memory_region.h +--- a/chromium/base/memory/platform_shared_memory_region.h ++++ b/chromium/base/memory/platform_shared_memory_region.h @@ -27,7 +27,7 @@ #include "base/files/scoped_file.h" #endif @@ -723,10 +678,10 @@ index 9b67c0e..6447162 100644 , bool executable = false #endif -diff --git a/src/3rdparty/chromium/base/memory/platform_shared_memory_region_posix.cc b/src/3rdparty/chromium/base/memory/platform_shared_memory_region_posix.cc +diff --git a/chromium/base/memory/platform_shared_memory_region_posix.cc b/chromium/base/memory/platform_shared_memory_region_posix.cc index f62a7d6..cabf383 100644 ---- a/src/3rdparty/chromium/base/memory/platform_shared_memory_region_posix.cc -+++ b/src/3rdparty/chromium/base/memory/platform_shared_memory_region_posix.cc +--- a/chromium/base/memory/platform_shared_memory_region_posix.cc ++++ b/chromium/base/memory/platform_shared_memory_region_posix.cc @@ -70,7 +70,7 @@ FDPair ScopedFDPair::get() const { return {fd.get(), readonly_fd.get()}; } @@ -772,10 +727,10 @@ index f62a7d6..cabf383 100644 if (!CheckFDAccessMode(handle.fd, mode == Mode::kReadOnly ? O_RDONLY : O_RDWR)) { return false; -diff --git a/src/3rdparty/chromium/base/message_loop/message_pump_for_ui.h b/src/3rdparty/chromium/base/message_loop/message_pump_for_ui.h +diff --git a/chromium/base/message_loop/message_pump_for_ui.h b/chromium/base/message_loop/message_pump_for_ui.h index 1eb7da0..2843510 100644 ---- a/src/3rdparty/chromium/base/message_loop/message_pump_for_ui.h -+++ b/src/3rdparty/chromium/base/message_loop/message_pump_for_ui.h +--- a/chromium/base/message_loop/message_pump_for_ui.h ++++ b/chromium/base/message_loop/message_pump_for_ui.h @@ -20,7 +20,7 @@ // No MessagePumpForUI, see below. #elif defined(USE_GLIB) @@ -794,10 +749,10 @@ index 1eb7da0..2843510 100644 using MessagePumpForUI = MessagePumpLibevent; #elif defined(OS_FUCHSIA) using MessagePumpForUI = MessagePumpFuchsia; -diff --git a/src/3rdparty/chromium/base/path_service.cc b/src/3rdparty/chromium/base/path_service.cc +diff --git a/chromium/base/path_service.cc b/chromium/base/path_service.cc index 4750944..3ed2519 100644 ---- a/src/3rdparty/chromium/base/path_service.cc -+++ b/src/3rdparty/chromium/base/path_service.cc +--- a/chromium/base/path_service.cc ++++ b/chromium/base/path_service.cc @@ -31,6 +31,8 @@ bool PathProviderMac(int key, FilePath* result); bool PathProviderAndroid(int key, FilePath* result); #elif defined(OS_FUCHSIA) @@ -834,10 +789,10 @@ index 4750944..3ed2519 100644 #elif defined(OS_POSIX) providers = &base_provider_posix; #endif -diff --git a/src/3rdparty/chromium/base/posix/can_lower_nice_to.cc b/src/3rdparty/chromium/base/posix/can_lower_nice_to.cc +diff --git a/chromium/base/posix/can_lower_nice_to.cc b/chromium/base/posix/can_lower_nice_to.cc index b1686dc..dc9661f 100644 ---- a/src/3rdparty/chromium/base/posix/can_lower_nice_to.cc -+++ b/src/3rdparty/chromium/base/posix/can_lower_nice_to.cc +--- a/chromium/base/posix/can_lower_nice_to.cc ++++ b/chromium/base/posix/can_lower_nice_to.cc @@ -31,6 +31,9 @@ bool CanLowerNiceTo(int nice_value) { if (geteuid() == 0) return true; @@ -856,10 +811,10 @@ index b1686dc..dc9661f 100644 } } // namespace internal -diff --git a/src/3rdparty/chromium/base/posix/unix_domain_socket.cc b/src/3rdparty/chromium/base/posix/unix_domain_socket.cc +diff --git a/chromium/base/posix/unix_domain_socket.cc b/chromium/base/posix/unix_domain_socket.cc index e4d052d..25da15c 100644 ---- a/src/3rdparty/chromium/base/posix/unix_domain_socket.cc -+++ b/src/3rdparty/chromium/base/posix/unix_domain_socket.cc +--- a/chromium/base/posix/unix_domain_socket.cc ++++ b/chromium/base/posix/unix_domain_socket.cc @@ -57,7 +57,7 @@ bool CreateSocketPair(ScopedFD* one, ScopedFD* two) { // static @@ -901,10 +856,10 @@ index e4d052d..25da15c 100644 } } -diff --git a/src/3rdparty/chromium/base/process/kill.h b/src/3rdparty/chromium/base/process/kill.h +diff --git a/chromium/base/process/kill.h b/chromium/base/process/kill.h index a7d23bd..f7082d5 100644 ---- a/src/3rdparty/chromium/base/process/kill.h -+++ b/src/3rdparty/chromium/base/process/kill.h +--- a/chromium/base/process/kill.h ++++ b/chromium/base/process/kill.h @@ -113,7 +113,7 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(ProcessHandle handle, BASE_EXPORT TerminationStatus GetKnownDeadTerminationStatus( ProcessHandle handle, int* exit_code); @@ -914,10 +869,10 @@ index a7d23bd..f7082d5 100644 // Spawns a thread to wait asynchronously for the child |process| to exit // and then reaps it. BASE_EXPORT void EnsureProcessGetsReaped(Process process); -diff --git a/src/3rdparty/chromium/base/process/kill_posix.cc b/src/3rdparty/chromium/base/process/kill_posix.cc +diff --git a/chromium/base/process/kill_posix.cc b/chromium/base/process/kill_posix.cc index 0fa6edb..eadf830 100644 ---- a/src/3rdparty/chromium/base/process/kill_posix.cc -+++ b/src/3rdparty/chromium/base/process/kill_posix.cc +--- a/chromium/base/process/kill_posix.cc ++++ b/chromium/base/process/kill_posix.cc @@ -160,7 +160,7 @@ void EnsureProcessTerminated(Process process) { 0, new BackgroundReaper(std::move(process), TimeDelta::FromSeconds(2))); } @@ -927,10 +882,10 @@ index 0fa6edb..eadf830 100644 void EnsureProcessGetsReaped(Process process) { DCHECK(!process.is_current()); -diff --git a/src/3rdparty/chromium/base/process/launch.cc b/src/3rdparty/chromium/base/process/launch.cc +diff --git a/chromium/base/process/launch.cc b/chromium/base/process/launch.cc index a643828..9845344 100644 ---- a/src/3rdparty/chromium/base/process/launch.cc -+++ b/src/3rdparty/chromium/base/process/launch.cc +--- a/chromium/base/process/launch.cc ++++ b/chromium/base/process/launch.cc @@ -15,7 +15,7 @@ LaunchOptions::~LaunchOptions() = default; LaunchOptions LaunchOptionsForTest() { @@ -940,10 +895,10 @@ index a643828..9845344 100644 // To prevent accidental privilege sharing to an untrusted child, processes // are started with PR_SET_NO_NEW_PRIVS. Do not set that here, since this // new child will be used for testing only. -diff --git a/src/3rdparty/chromium/base/process/launch.h b/src/3rdparty/chromium/base/process/launch.h +diff --git a/chromium/base/process/launch.h b/chromium/base/process/launch.h index 6cf6eac..486b793 100644 ---- a/src/3rdparty/chromium/base/process/launch.h -+++ b/src/3rdparty/chromium/base/process/launch.h +--- a/chromium/base/process/launch.h ++++ b/chromium/base/process/launch.h @@ -180,7 +180,7 @@ struct BASE_EXPORT LaunchOptions { bool clear_environment = false; #endif // OS_WIN || OS_POSIX || OS_FUCHSIA @@ -971,10 +926,10 @@ index 6cf6eac..486b793 100644 // A wrapper for clone with fork-like behavior, meaning that it returns the // child's pid in the parent and 0 in the child. |flags|, |ptid|, and |ctid| are // as in the clone system call (the CLONE_VM flag is not supported). -diff --git a/src/3rdparty/chromium/base/process/launch_posix.cc b/src/3rdparty/chromium/base/process/launch_posix.cc +diff --git a/chromium/base/process/launch_posix.cc b/chromium/base/process/launch_posix.cc index a8b1f0b..bb8718a 100644 ---- a/src/3rdparty/chromium/base/process/launch_posix.cc -+++ b/src/3rdparty/chromium/base/process/launch_posix.cc +--- a/chromium/base/process/launch_posix.cc ++++ b/chromium/base/process/launch_posix.cc @@ -14,7 +14,9 @@ #include #include @@ -1002,10 +957,10 @@ index a8b1f0b..bb8718a 100644 } Process LaunchProcess(const CommandLine& cmdline, -diff --git a/src/3rdparty/chromium/base/process/memory.cc b/src/3rdparty/chromium/base/process/memory.cc +diff --git a/chromium/base/process/memory.cc b/chromium/base/process/memory.cc index 4454e32..83a0723 100644 ---- a/src/3rdparty/chromium/base/process/memory.cc -+++ b/src/3rdparty/chromium/base/process/memory.cc +--- a/chromium/base/process/memory.cc ++++ b/chromium/base/process/memory.cc @@ -55,7 +55,7 @@ NOINLINE void OnNoMemoryInternal(size_t size) { } // namespace internal @@ -1024,10 +979,10 @@ index 4454e32..83a0723 100644 bool UncheckedCalloc(size_t num_items, size_t size, void** result) { const size_t alloc_size = num_items * size; -diff --git a/src/3rdparty/chromium/base/process/memory.h b/src/3rdparty/chromium/base/process/memory.h +diff --git a/chromium/base/process/memory.h b/chromium/base/process/memory.h index 2d313ed..eb7b17a 100644 ---- a/src/3rdparty/chromium/base/process/memory.h -+++ b/src/3rdparty/chromium/base/process/memory.h +--- a/chromium/base/process/memory.h ++++ b/chromium/base/process/memory.h @@ -25,7 +25,7 @@ BASE_EXPORT void EnableTerminationOnOutOfMemory(); BASE_EXPORT void TerminateBecauseOutOfMemory(size_t size); @@ -1037,10 +992,10 @@ index 2d313ed..eb7b17a 100644 BASE_EXPORT extern size_t g_oom_size; // The maximum allowed value for the OOM score. -diff --git a/src/3rdparty/chromium/base/process/process_handle.h b/src/3rdparty/chromium/base/process/process_handle.h +diff --git a/chromium/base/process/process_handle.h b/chromium/base/process/process_handle.h index 3640351..d7e185a 100644 ---- a/src/3rdparty/chromium/base/process/process_handle.h -+++ b/src/3rdparty/chromium/base/process/process_handle.h +--- a/chromium/base/process/process_handle.h ++++ b/chromium/base/process/process_handle.h @@ -103,7 +103,7 @@ BASE_EXPORT ProcessId GetCurrentProcId(); // processes may be reused. BASE_EXPORT UniqueProcId GetUniqueIdForProcess(); @@ -1050,11 +1005,11 @@ index 3640351..d7e185a 100644 // When a process is started in a different PID namespace from the browser // process, this function must be called with the process's PID in the browser's // PID namespace in order to initialize its unique ID. Not thread safe. -diff --git a/src/3rdparty/chromium/base/process/process_handle_haiku.cc b/src/3rdparty/chromium/base/process/process_handle_haiku.cc +diff --git a/chromium/base/process/process_handle_haiku.cc b/chromium/base/process/process_handle_haiku.cc new file mode 100644 index 0000000..bc17cab --- /dev/null -+++ b/src/3rdparty/chromium/base/process/process_handle_haiku.cc ++++ b/chromium/base/process/process_handle_haiku.cc @@ -0,0 +1,24 @@ +// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be @@ -1080,11 +1035,11 @@ index 0000000..bc17cab +} + +} // namespace base -diff --git a/src/3rdparty/chromium/base/process/process_iterator_haiku.cc b/src/3rdparty/chromium/base/process/process_iterator_haiku.cc +diff --git a/chromium/base/process/process_iterator_haiku.cc b/chromium/base/process/process_iterator_haiku.cc new file mode 100644 index 0000000..6d411ba --- /dev/null -+++ b/src/3rdparty/chromium/base/process/process_iterator_haiku.cc ++++ b/chromium/base/process/process_iterator_haiku.cc @@ -0,0 +1,26 @@ +// Copyright 2017 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be @@ -1112,10 +1067,10 @@ index 0000000..6d411ba +} + +} // namespace base -diff --git a/src/3rdparty/chromium/base/process/process_metrics.h b/src/3rdparty/chromium/base/process/process_metrics.h +diff --git a/chromium/base/process/process_metrics.h b/chromium/base/process/process_metrics.h index bbf88c5..def2511 100644 ---- a/src/3rdparty/chromium/base/process/process_metrics.h -+++ b/src/3rdparty/chromium/base/process/process_metrics.h +--- a/chromium/base/process/process_metrics.h ++++ b/chromium/base/process/process_metrics.h @@ -47,7 +47,7 @@ namespace base { // Full declaration is in process_metrics_iocounters.h. struct IoCounters; @@ -1276,11 +1231,11 @@ index bbf88c5..def2511 100644 SystemMemoryInfoKB memory_info_; VmStatInfo vmstat_info_; SystemDiskInfo disk_info_; -diff --git a/src/3rdparty/chromium/base/process/process_metrics_haiku.cc b/src/3rdparty/chromium/base/process/process_metrics_haiku.cc +diff --git a/chromium/base/process/process_metrics_haiku.cc b/chromium/base/process/process_metrics_haiku.cc new file mode 100644 index 0000000..2a73cc1 --- /dev/null -+++ b/src/3rdparty/chromium/base/process/process_metrics_haiku.cc ++++ b/chromium/base/process/process_metrics_haiku.cc @@ -0,0 +1,43 @@ +// Copyright 2017 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be @@ -1325,10 +1280,10 @@ index 0000000..2a73cc1 + + +} // namespace base -diff --git a/src/3rdparty/chromium/base/process/process_metrics_posix.cc b/src/3rdparty/chromium/base/process/process_metrics_posix.cc +diff --git a/chromium/base/process/process_metrics_posix.cc b/chromium/base/process/process_metrics_posix.cc index 9d12c42..d29e675 100644 ---- a/src/3rdparty/chromium/base/process/process_metrics_posix.cc -+++ b/src/3rdparty/chromium/base/process/process_metrics_posix.cc +--- a/chromium/base/process/process_metrics_posix.cc ++++ b/chromium/base/process/process_metrics_posix.cc @@ -53,6 +53,8 @@ static const rlim_t kSystemDefaultMaxFds = 256; static const rlim_t kSystemDefaultMaxFds = 1024; #elif defined(OS_AIX) @@ -1347,10 +1302,10 @@ index 9d12c42..d29e675 100644 // TODO(fuchsia): Not currently exposed. https://crbug.com/735087. return 0; #endif -diff --git a/src/3rdparty/chromium/base/process/process_posix.cc b/src/3rdparty/chromium/base/process/process_posix.cc +diff --git a/chromium/base/process/process_posix.cc b/chromium/base/process/process_posix.cc index fc771b3..4c34d41 100644 ---- a/src/3rdparty/chromium/base/process/process_posix.cc -+++ b/src/3rdparty/chromium/base/process/process_posix.cc +--- a/chromium/base/process/process_posix.cc ++++ b/chromium/base/process/process_posix.cc @@ -268,13 +268,13 @@ Process Process::DeprecatedGetProcessFromHandle(ProcessHandle handle) { } @@ -1385,10 +1340,10 @@ index fc771b3..4c34d41 100644 int Process::GetPriority() const { DCHECK(IsValid()); -diff --git a/src/3rdparty/chromium/base/profiler/module_cache_posix.cc b/src/3rdparty/chromium/base/profiler/module_cache_posix.cc +diff --git a/chromium/base/profiler/module_cache_posix.cc b/chromium/base/profiler/module_cache_posix.cc index 310ab39..6e0f72c 100644 ---- a/src/3rdparty/chromium/base/profiler/module_cache_posix.cc -+++ b/src/3rdparty/chromium/base/profiler/module_cache_posix.cc +--- a/chromium/base/profiler/module_cache_posix.cc ++++ b/chromium/base/profiler/module_cache_posix.cc @@ -6,6 +6,11 @@ #include @@ -1401,10 +1356,10 @@ index 310ab39..6e0f72c 100644 #include "base/debug/elf_reader.h" #include "build/build_config.h" -diff --git a/src/3rdparty/chromium/base/system/sys_info.h b/src/3rdparty/chromium/base/system/sys_info.h +diff --git a/chromium/base/system/sys_info.h b/chromium/base/system/sys_info.h index eee730e..3f36569 100644 ---- a/src/3rdparty/chromium/base/system/sys_info.h -+++ b/src/3rdparty/chromium/base/system/sys_info.h +--- a/chromium/base/system/sys_info.h ++++ b/chromium/base/system/sys_info.h @@ -212,7 +212,7 @@ class BASE_EXPORT SysInfo { static HardwareInfo GetHardwareInfoSync(); @@ -1414,11 +1369,11 @@ index eee730e..3f36569 100644 static int64_t AmountOfAvailablePhysicalMemory( const SystemMemoryInfoKB& meminfo); #endif -diff --git a/src/3rdparty/chromium/base/system/sys_info_haiku.cc b/src/3rdparty/chromium/base/system/sys_info_haiku.cc +diff --git a/chromium/base/system/sys_info_haiku.cc b/chromium/base/system/sys_info_haiku.cc new file mode 100644 index 0000000..e4cf2f0 --- /dev/null -+++ b/src/3rdparty/chromium/base/system/sys_info_haiku.cc ++++ b/chromium/base/system/sys_info_haiku.cc @@ -0,0 +1,35 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be @@ -1455,10 +1410,10 @@ index 0000000..e4cf2f0 +} + +} // namespace base -diff --git a/src/3rdparty/chromium/base/third_party/libevent/BUILD.gn b/src/3rdparty/chromium/base/third_party/libevent/BUILD.gn +diff --git a/chromium/base/third_party/libevent/BUILD.gn b/chromium/base/third_party/libevent/BUILD.gn index 3628030..2e1bd65 100644 ---- a/src/3rdparty/chromium/base/third_party/libevent/BUILD.gn -+++ b/src/3rdparty/chromium/base/third_party/libevent/BUILD.gn +--- a/chromium/base/third_party/libevent/BUILD.gn ++++ b/chromium/base/third_party/libevent/BUILD.gn @@ -48,7 +48,7 @@ static_library("bundled_libevent") { "mac/event-config.h", ] @@ -1482,10 +1437,10 @@ index 3628030..2e1bd65 100644 } configs -= [ "//build/config/compiler:chromium_code" ] -diff --git a/src/3rdparty/chromium/base/third_party/libevent/event-config.h b/src/3rdparty/chromium/base/third_party/libevent/event-config.h +diff --git a/chromium/base/third_party/libevent/event-config.h b/chromium/base/third_party/libevent/event-config.h index bbd23f1..f01bea2 100644 ---- a/src/3rdparty/chromium/base/third_party/libevent/event-config.h -+++ b/src/3rdparty/chromium/base/third_party/libevent/event-config.h +--- a/chromium/base/third_party/libevent/event-config.h ++++ b/chromium/base/third_party/libevent/event-config.h @@ -19,6 +19,8 @@ #include "base/third_party/libevent/solaris/event-config.h" #elif defined(_AIX) @@ -1495,11 +1450,11 @@ index bbd23f1..f01bea2 100644 #else #error generate event-config.h for your platform #endif -diff --git a/src/3rdparty/chromium/base/third_party/libevent/haiku/config.h b/src/3rdparty/chromium/base/third_party/libevent/haiku/config.h +diff --git a/chromium/base/third_party/libevent/haiku/config.h b/chromium/base/third_party/libevent/haiku/config.h new file mode 100644 index 0000000..5990ae7 --- /dev/null -+++ b/src/3rdparty/chromium/base/third_party/libevent/haiku/config.h ++++ b/chromium/base/third_party/libevent/haiku/config.h @@ -0,0 +1,272 @@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.in by autoheader. */ @@ -1773,11 +1728,11 @@ index 0000000..5990ae7 + +/* Define to unsigned int if you dont have it */ +/* #undef socklen_t */ -diff --git a/src/3rdparty/chromium/base/third_party/libevent/haiku/event-config.h b/src/3rdparty/chromium/base/third_party/libevent/haiku/event-config.h +diff --git a/chromium/base/third_party/libevent/haiku/event-config.h b/chromium/base/third_party/libevent/haiku/event-config.h new file mode 100644 index 0000000..0a77f14 --- /dev/null -+++ b/src/3rdparty/chromium/base/third_party/libevent/haiku/event-config.h ++++ b/chromium/base/third_party/libevent/haiku/event-config.h @@ -0,0 +1,280 @@ +/* event-config.h + * Generated by autoconf; post-processed by libevent. @@ -2059,10 +2014,10 @@ index 0000000..0a77f14 +/* Define to unsigned int if you dont have it */ +/* #undef _EVENT_socklen_t */ +#endif -diff --git a/src/3rdparty/chromium/base/threading/platform_thread.h b/src/3rdparty/chromium/base/threading/platform_thread.h +diff --git a/chromium/base/threading/platform_thread.h b/chromium/base/threading/platform_thread.h index 76e53d3..465542c 100644 ---- a/src/3rdparty/chromium/base/threading/platform_thread.h -+++ b/src/3rdparty/chromium/base/threading/platform_thread.h +--- a/chromium/base/threading/platform_thread.h ++++ b/chromium/base/threading/platform_thread.h @@ -230,7 +230,7 @@ class BASE_EXPORT PlatformThread { // Returns a realtime period provided by |delegate|. static TimeDelta GetRealtimePeriod(Delegate* delegate); @@ -2072,11 +2027,11 @@ index 76e53d3..465542c 100644 // Toggles a specific thread's priority at runtime. This can be used to // change the priority of a thread in a different process and will fail // if the calling process does not have proper permissions. The -diff --git a/src/3rdparty/chromium/base/threading/platform_thread_haiku.cc b/src/3rdparty/chromium/base/threading/platform_thread_haiku.cc +diff --git a/chromium/base/threading/platform_thread_haiku.cc b/chromium/base/threading/platform_thread_haiku.cc new file mode 100644 index 0000000..6bfe285 --- /dev/null -+++ b/src/3rdparty/chromium/base/threading/platform_thread_haiku.cc ++++ b/chromium/base/threading/platform_thread_haiku.cc @@ -0,0 +1,79 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be @@ -2157,10 +2112,10 @@ index 0000000..6bfe285 +} + +} // namespace base -diff --git a/src/3rdparty/chromium/base/threading/platform_thread_linux.cc b/src/3rdparty/chromium/base/threading/platform_thread_linux.cc +diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc index c1a705e..146a7d9 100644 ---- a/src/3rdparty/chromium/base/threading/platform_thread_linux.cc -+++ b/src/3rdparty/chromium/base/threading/platform_thread_linux.cc +--- a/chromium/base/threading/platform_thread_linux.cc ++++ b/chromium/base/threading/platform_thread_linux.cc @@ -24,7 +24,9 @@ #if !defined(OS_NACL) && !defined(OS_AIX) @@ -2189,10 +2144,10 @@ index c1a705e..146a7d9 100644 // On linux we can get the thread names to show up in the debugger by setting // the process name for the LWP. We don't want to do this for the main // thread because that would rename the process, causing tools like killall -diff --git a/src/3rdparty/chromium/base/threading/platform_thread_posix.cc b/src/3rdparty/chromium/base/threading/platform_thread_posix.cc +diff --git a/chromium/base/threading/platform_thread_posix.cc b/chromium/base/threading/platform_thread_posix.cc index 550454c..9d57348 100644 ---- a/src/3rdparty/chromium/base/threading/platform_thread_posix.cc -+++ b/src/3rdparty/chromium/base/threading/platform_thread_posix.cc +--- a/chromium/base/threading/platform_thread_posix.cc ++++ b/chromium/base/threading/platform_thread_posix.cc @@ -66,7 +66,7 @@ void* ThreadFunc(void* params) { if (!thread_params->joinable) base::ThreadRestrictions::SetSingletonAllowed(false); @@ -2220,10 +2175,10 @@ index 550454c..9d57348 100644 NOTIMPLEMENTED(); return ThreadPriority::NORMAL; #else -diff --git a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc +diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc index c327f48..1b90c08 100644 ---- a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc -+++ b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc +--- a/chromium/base/trace_event/malloc_dump_provider.cc ++++ b/chromium/base/trace_event/malloc_dump_provider.cc @@ -130,7 +130,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, allocated_objects_size = main_heap_info.allocated_size; allocated_objects_count = main_heap_info.block_count; @@ -2233,10 +2188,10 @@ index c327f48..1b90c08 100644 // TODO(fuchsia): Port, see https://crbug.com/706592. #else struct mallinfo info = mallinfo(); -diff --git a/src/3rdparty/chromium/base/trace_event/process_memory_dump.cc b/src/3rdparty/chromium/base/trace_event/process_memory_dump.cc +diff --git a/chromium/base/trace_event/process_memory_dump.cc b/chromium/base/trace_event/process_memory_dump.cc index b757168..95c2088 100644 ---- a/src/3rdparty/chromium/base/trace_event/process_memory_dump.cc -+++ b/src/3rdparty/chromium/base/trace_event/process_memory_dump.cc +--- a/chromium/base/trace_event/process_memory_dump.cc ++++ b/chromium/base/trace_event/process_memory_dump.cc @@ -117,7 +117,7 @@ size_t ProcessMemoryDump::CountResidentBytes(void* start_address, for (size_t i = 0; i < page_count; i++) @@ -2246,10 +2201,10 @@ index b757168..95c2088 100644 // TODO(fuchsia): Port, see https://crbug.com/706592. ALLOW_UNUSED_LOCAL(chunk_start); ALLOW_UNUSED_LOCAL(page_count); -diff --git a/src/3rdparty/chromium/build/build_config.h b/src/3rdparty/chromium/build/build_config.h +diff --git a/chromium/build/build_config.h b/chromium/build/build_config.h index 2c3e81e..f0e1ded 100644 ---- a/src/3rdparty/chromium/build/build_config.h -+++ b/src/3rdparty/chromium/build/build_config.h +--- a/chromium/build/build_config.h ++++ b/chromium/build/build_config.h @@ -86,6 +86,8 @@ #define OS_AIX 1 #elif defined(__asmjs__) || defined(__wasm__) @@ -2268,10 +2223,10 @@ index 2c3e81e..f0e1ded 100644 #define OS_POSIX 1 #endif -diff --git a/src/3rdparty/chromium/build/config/BUILD.gn b/src/3rdparty/chromium/build/config/BUILD.gn +diff --git a/chromium/build/config/BUILD.gn b/chromium/build/config/BUILD.gn index f88c691..df87c89 100644 ---- a/src/3rdparty/chromium/build/config/BUILD.gn -+++ b/src/3rdparty/chromium/build/config/BUILD.gn +--- a/chromium/build/config/BUILD.gn ++++ b/chromium/build/config/BUILD.gn @@ -233,7 +233,7 @@ config("default_libs") { "CoreText.framework", "Foundation.framework", @@ -2281,10 +2236,10 @@ index f88c691..df87c89 100644 libs = [ "dl", "pthread", -diff --git a/src/3rdparty/chromium/build/config/BUILDCONFIG.gn b/src/3rdparty/chromium/build/config/BUILDCONFIG.gn +diff --git a/chromium/build/config/BUILDCONFIG.gn b/chromium/build/config/BUILDCONFIG.gn index 3815dd6..2dc0602 100644 ---- a/src/3rdparty/chromium/build/config/BUILDCONFIG.gn -+++ b/src/3rdparty/chromium/build/config/BUILDCONFIG.gn +--- a/chromium/build/config/BUILDCONFIG.gn ++++ b/chromium/build/config/BUILDCONFIG.gn @@ -131,13 +131,13 @@ declare_args() { is_official_build = false @@ -2344,10 +2299,10 @@ index 3815dd6..2dc0602 100644 is_apple = is_ios || is_mac is_posix = !is_win && !is_fuchsia -diff --git a/src/3rdparty/chromium/build/config/compiler/BUILD.gn b/src/3rdparty/chromium/build/config/compiler/BUILD.gn +diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn index b511a58..49f2a71 100644 ---- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn -+++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn +--- a/chromium/build/config/compiler/BUILD.gn ++++ b/chromium/build/config/compiler/BUILD.gn @@ -256,6 +256,8 @@ config("compiler") { configs += [ "//build/config/fuchsia:compiler" ] } else if (current_os == "aix") { @@ -2404,10 +2359,10 @@ index b511a58..49f2a71 100644 ldflags = [ "-rdynamic" ] } } -diff --git a/src/3rdparty/chromium/build/config/crypto.gni b/src/3rdparty/chromium/build/config/crypto.gni +diff --git a/chromium/build/config/crypto.gni b/chromium/build/config/crypto.gni index 093c353..74a776f 100644 ---- a/src/3rdparty/chromium/build/config/crypto.gni -+++ b/src/3rdparty/chromium/build/config/crypto.gni +--- a/chromium/build/config/crypto.gni ++++ b/chromium/build/config/crypto.gni @@ -13,5 +13,5 @@ declare_args() { @@ -2415,10 +2370,10 @@ index 093c353..74a776f 100644 - use_nss_certs = is_linux || is_chromeos + use_nss_certs = is_linux || is_chromeos || is_haiku } -diff --git a/src/3rdparty/chromium/build/config/features.gni b/src/3rdparty/chromium/build/config/features.gni +diff --git a/chromium/build/config/features.gni b/chromium/build/config/features.gni index 95c766f..24b7d16 100644 ---- a/src/3rdparty/chromium/build/config/features.gni -+++ b/src/3rdparty/chromium/build/config/features.gni +--- a/chromium/build/config/features.gni ++++ b/chromium/build/config/features.gni @@ -26,11 +26,11 @@ declare_args() { proprietary_codecs = is_chrome_branded || is_chromecast @@ -2434,10 +2389,10 @@ index 95c766f..24b7d16 100644 use_qt = false } -diff --git a/src/3rdparty/chromium/build/config/gcc/BUILD.gn b/src/3rdparty/chromium/build/config/gcc/BUILD.gn +diff --git a/chromium/build/config/gcc/BUILD.gn b/chromium/build/config/gcc/BUILD.gn index 154b259..d917146 100644 ---- a/src/3rdparty/chromium/build/config/gcc/BUILD.gn -+++ b/src/3rdparty/chromium/build/config/gcc/BUILD.gn +--- a/chromium/build/config/gcc/BUILD.gn ++++ b/chromium/build/config/gcc/BUILD.gn @@ -91,7 +91,10 @@ if (is_component_build && !is_android) { # Settings for executables. config("executable_config") { @@ -2450,11 +2405,11 @@ index 154b259..d917146 100644 if (is_android) { ldflags += [ "-Bdynamic", -diff --git a/src/3rdparty/chromium/build/config/haiku/BUILD.gn b/src/3rdparty/chromium/build/config/haiku/BUILD.gn +diff --git a/chromium/build/config/haiku/BUILD.gn b/chromium/build/config/haiku/BUILD.gn new file mode 100644 index 0000000..95fed9d --- /dev/null -+++ b/src/3rdparty/chromium/build/config/haiku/BUILD.gn ++++ b/chromium/build/config/haiku/BUILD.gn @@ -0,0 +1,37 @@ +# Copyright (c) 2013 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be @@ -2493,10 +2448,10 @@ index 0000000..95fed9d + } +} + -diff --git a/src/3rdparty/chromium/build/config/linux/pkg-config.py b/src/3rdparty/chromium/build/config/linux/pkg-config.py +diff --git a/chromium/build/config/linux/pkg-config.py b/chromium/build/config/linux/pkg-config.py index 5adf70c..520e970 100755 ---- a/src/3rdparty/chromium/build/config/linux/pkg-config.py -+++ b/src/3rdparty/chromium/build/config/linux/pkg-config.py +--- a/chromium/build/config/linux/pkg-config.py ++++ b/chromium/build/config/linux/pkg-config.py @@ -109,7 +109,7 @@ def main(): # If this is run on non-Linux platforms, just return nothing and indicate # success. This allows us to "kind of emulate" a Linux build from other @@ -2506,10 +2461,10 @@ index 5adf70c..520e970 100755 print("[[],[],[],[],[]]") return 0 -diff --git a/src/3rdparty/chromium/build/config/logging.gni b/src/3rdparty/chromium/build/config/logging.gni +diff --git a/chromium/build/config/logging.gni b/chromium/build/config/logging.gni index b0ae9e8..7c4a0bc 100644 ---- a/src/3rdparty/chromium/build/config/logging.gni -+++ b/src/3rdparty/chromium/build/config/logging.gni +--- a/chromium/build/config/logging.gni ++++ b/chromium/build/config/logging.gni @@ -6,5 +6,5 @@ import("//build/config/dcheck_always_on.gni") declare_args() { @@ -2517,10 +2472,10 @@ index b0ae9e8..7c4a0bc 100644 - enable_log_error_not_reached = is_chromeos && !(is_debug || dcheck_always_on) + enable_log_error_not_reached = is_haiku || is_chromeos && !(is_debug || dcheck_always_on) } -diff --git a/src/3rdparty/chromium/build/config/ui.gni b/src/3rdparty/chromium/build/config/ui.gni +diff --git a/chromium/build/config/ui.gni b/chromium/build/config/ui.gni index a67d5a4..3ed9b6f 100644 ---- a/src/3rdparty/chromium/build/config/ui.gni -+++ b/src/3rdparty/chromium/build/config/ui.gni +--- a/chromium/build/config/ui.gni ++++ b/chromium/build/config/ui.gni @@ -35,7 +35,7 @@ declare_args() { # Indicates if Aura is enabled. Aura is a low-level windowing library, sort @@ -2530,11 +2485,11 @@ index a67d5a4..3ed9b6f 100644 } declare_args() { -diff --git a/src/3rdparty/chromium/build/toolchain/haiku/BUILD.gn b/src/3rdparty/chromium/build/toolchain/haiku/BUILD.gn +diff --git a/chromium/build/toolchain/haiku/BUILD.gn b/chromium/build/toolchain/haiku/BUILD.gn new file mode 100644 index 0000000..2e3d230 --- /dev/null -+++ b/src/3rdparty/chromium/build/toolchain/haiku/BUILD.gn ++++ b/chromium/build/toolchain/haiku/BUILD.gn @@ -0,0 +1,54 @@ +# Copyright 2013 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be @@ -2590,10 +2545,10 @@ index 0000000..2e3d230 + is_clang = false + } +} -diff --git a/src/3rdparty/chromium/chrome/browser/BUILD.gn b/src/3rdparty/chromium/chrome/browser/BUILD.gn +diff --git a/chromium/chrome/browser/BUILD.gn b/chromium/chrome/browser/BUILD.gn index 8b31283..7b306fc 100644 ---- a/src/3rdparty/chromium/chrome/browser/BUILD.gn -+++ b/src/3rdparty/chromium/chrome/browser/BUILD.gn +--- a/chromium/chrome/browser/BUILD.gn ++++ b/chromium/chrome/browser/BUILD.gn @@ -4938,7 +4938,7 @@ static_library("browser") { ] } @@ -2603,10 +2558,10 @@ index 8b31283..7b306fc 100644 # TODO(crbug.com / 753619): Enable crash reporting on Fuchsia. sources += [ "//chrome/app/chrome_crash_reporter_client.cc", -diff --git a/src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc b/src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc +diff --git a/chromium/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc b/chromium/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc index 59cc5e1..7ede6cd 100644 ---- a/src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc -+++ b/src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc +--- a/chromium/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc ++++ b/chromium/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc @@ -42,6 +42,8 @@ const char kProduct[] = "Chrome_Mac"; const char kProduct[] = "Chrome_ChromeOS"; #elif defined(OS_LINUX) @@ -2616,10 +2571,10 @@ index 59cc5e1..7ede6cd 100644 #elif defined(OS_ANDROID) const char kProduct[] = "Chrome_Android"; #else -diff --git a/src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_log_uploader.cc +diff --git a/chromium/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chromium/chrome/browser/media/webrtc/webrtc_log_uploader.cc index a96250c..9cc616d 100644 ---- a/src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_log_uploader.cc -+++ b/src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_log_uploader.cc +--- a/chromium/chrome/browser/media/webrtc/webrtc_log_uploader.cc ++++ b/chromium/chrome/browser/media/webrtc/webrtc_log_uploader.cc @@ -359,6 +359,8 @@ void WebRtcLogUploader::SetupMultipart( const char product[] = "Chrome_Android"; #elif defined(OS_CHROMEOS) @@ -2629,10 +2584,10 @@ index a96250c..9cc616d 100644 #else #error Platform not supported. #endif -diff --git a/src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.cc b/src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.cc +diff --git a/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.cc b/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.cc index 2e29002..b67a659 100644 ---- a/src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.cc -+++ b/src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.cc +--- a/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.cc ++++ b/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.cc @@ -23,10 +23,10 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/render_process_host.h" @@ -2664,10 +2619,10 @@ index 2e29002..b67a659 100644 void WebRtcLoggingController::OnRtpPacket( std::unique_ptr packet_header, -diff --git a/src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.h b/src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.h +diff --git a/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.h b/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.h index cb235c9..1106677 100644 ---- a/src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.h -+++ b/src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.h +--- a/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.h ++++ b/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.h @@ -133,13 +133,13 @@ class WebRtcLoggingController size_t web_app_id, const StartEventLoggingCallback& callback); @@ -2702,10 +2657,10 @@ index cb235c9..1106677 100644 static base::FilePath GetLogDirectoryAndEnsureExists( const base::FilePath& browser_context_directory_path); -diff --git a/src/3rdparty/chromium/chrome/common/webui_url_constants.cc b/src/3rdparty/chromium/chrome/common/webui_url_constants.cc +diff --git a/chromium/chrome/common/webui_url_constants.cc b/chromium/chrome/common/webui_url_constants.cc index 2584f68..25a04b6 100644 ---- a/src/3rdparty/chromium/chrome/common/webui_url_constants.cc -+++ b/src/3rdparty/chromium/chrome/common/webui_url_constants.cc +--- a/chromium/chrome/common/webui_url_constants.cc ++++ b/chromium/chrome/common/webui_url_constants.cc @@ -341,7 +341,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { #endif // defined(OS_CHROMEOS) @@ -2736,10 +2691,10 @@ index 2584f68..25a04b6 100644 defined(USE_AURA) const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; #endif -diff --git a/src/3rdparty/chromium/chrome/common/webui_url_constants.h b/src/3rdparty/chromium/chrome/common/webui_url_constants.h +diff --git a/chromium/chrome/common/webui_url_constants.h b/chromium/chrome/common/webui_url_constants.h index a72ca75..585a062 100644 ---- a/src/3rdparty/chromium/chrome/common/webui_url_constants.h -+++ b/src/3rdparty/chromium/chrome/common/webui_url_constants.h +--- a/chromium/chrome/common/webui_url_constants.h ++++ b/chromium/chrome/common/webui_url_constants.h @@ -292,7 +292,7 @@ bool IsSystemWebUIHost(base::StringPiece host); #endif // defined(OS_CHROMEOS) @@ -2770,10 +2725,10 @@ index a72ca75..585a062 100644 defined(USE_AURA) extern const char kChromeUITabModalConfirmDialogHost[]; #endif -diff --git a/src/3rdparty/chromium/chrome/test/BUILD.gn b/src/3rdparty/chromium/chrome/test/BUILD.gn +diff --git a/chromium/chrome/test/BUILD.gn b/chromium/chrome/test/BUILD.gn index 1a369fa..3c53323 100644 ---- a/src/3rdparty/chromium/chrome/test/BUILD.gn -+++ b/src/3rdparty/chromium/chrome/test/BUILD.gn +--- a/chromium/chrome/test/BUILD.gn ++++ b/chromium/chrome/test/BUILD.gn @@ -6606,7 +6606,7 @@ test("chrome_app_unittests") { "//components/safe_browsing:buildflags", "//pdf:pdf_ppapi", @@ -2783,10 +2738,10 @@ index 1a369fa..3c53323 100644 # TODO(crbug.com/753619): Enable crash reporting on Fuchsia. deps += [ "//third_party/breakpad:client" ] } -diff --git a/src/3rdparty/chromium/components/BUILD.gn b/src/3rdparty/chromium/components/BUILD.gn +diff --git a/chromium/components/BUILD.gn b/chromium/components/BUILD.gn index 830a35c..2f15af0 100644 ---- a/src/3rdparty/chromium/components/BUILD.gn -+++ b/src/3rdparty/chromium/components/BUILD.gn +--- a/chromium/components/BUILD.gn ++++ b/chromium/components/BUILD.gn @@ -312,7 +312,7 @@ test("components_unittests") { ] } @@ -2796,10 +2751,10 @@ index 830a35c..2f15af0 100644 deps += [ "//components/crash/content/browser:unit_tests", "//components/crash/content/browser/error_reporting:unit_tests", -diff --git a/src/3rdparty/chromium/components/crash/content/browser/BUILD.gn b/src/3rdparty/chromium/components/crash/content/browser/BUILD.gn +diff --git a/chromium/components/crash/content/browser/BUILD.gn b/chromium/components/crash/content/browser/BUILD.gn index efc8041..35aab55 100644 ---- a/src/3rdparty/chromium/components/crash/content/browser/BUILD.gn -+++ b/src/3rdparty/chromium/components/crash/content/browser/BUILD.gn +--- a/chromium/components/crash/content/browser/BUILD.gn ++++ b/chromium/components/crash/content/browser/BUILD.gn @@ -14,7 +14,7 @@ import("//build/config/deprecated_default_sources_assignment_filter.gni") set_sources_assignment_filter(deprecated_default_sources_assignment_filter) @@ -2834,10 +2789,10 @@ index efc8041..35aab55 100644 configs += [ "//third_party/breakpad:client_config" ] public_configs = [ "//third_party/breakpad:client_config" ] } -diff --git a/src/3rdparty/chromium/components/crash/core/common/BUILD.gn b/src/3rdparty/chromium/components/crash/core/common/BUILD.gn +diff --git a/chromium/components/crash/core/common/BUILD.gn b/chromium/components/crash/core/common/BUILD.gn index 6dbaaea..e0ca272 100644 ---- a/src/3rdparty/chromium/components/crash/core/common/BUILD.gn -+++ b/src/3rdparty/chromium/components/crash/core/common/BUILD.gn +--- a/chromium/components/crash/core/common/BUILD.gn ++++ b/chromium/components/crash/core/common/BUILD.gn @@ -7,7 +7,7 @@ import("//components/gwp_asan/buildflags/buildflags.gni") declare_args() { @@ -2867,10 +2822,10 @@ index 6dbaaea..e0ca272 100644 include_dirs = [ "//third_party/breakpad/breakpad/src/" ] sources += [ "crash_key_breakpad_unittest.cc" ] } -diff --git a/src/3rdparty/chromium/components/metrics/BUILD.gn b/src/3rdparty/chromium/components/metrics/BUILD.gn +diff --git a/chromium/components/metrics/BUILD.gn b/chromium/components/metrics/BUILD.gn index dd63573..93cdccc 100644 ---- a/src/3rdparty/chromium/components/metrics/BUILD.gn -+++ b/src/3rdparty/chromium/components/metrics/BUILD.gn +--- a/chromium/components/metrics/BUILD.gn ++++ b/chromium/components/metrics/BUILD.gn @@ -190,6 +190,9 @@ jumbo_static_library("metrics") { if (is_fuchsia) { sources += [ "drive_metrics_provider_fuchsia.cc" ] @@ -2881,10 +2836,10 @@ index dd63573..93cdccc 100644 } if (is_android) { -diff --git a/src/3rdparty/chromium/components/os_crypt/os_crypt.h b/src/3rdparty/chromium/components/os_crypt/os_crypt.h +diff --git a/chromium/components/os_crypt/os_crypt.h b/chromium/components/os_crypt/os_crypt.h index a061ca2..8cc834e 100644 ---- a/src/3rdparty/chromium/components/os_crypt/os_crypt.h -+++ b/src/3rdparty/chromium/components/os_crypt/os_crypt.h +--- a/chromium/components/os_crypt/os_crypt.h ++++ b/chromium/components/os_crypt/os_crypt.h @@ -15,7 +15,7 @@ #include "base/strings/string16.h" #include "build/build_config.h" @@ -2919,10 +2874,10 @@ index a061ca2..8cc834e 100644 // For unit testing purposes, inject methods to be used. // |get_key_storage_mock| provides the desired |KeyStorage| implementation. // If the provider returns |nullptr|, a hardcoded password will be used. -diff --git a/src/3rdparty/chromium/components/os_crypt/os_crypt_unittest.cc b/src/3rdparty/chromium/components/os_crypt/os_crypt_unittest.cc +diff --git a/chromium/components/os_crypt/os_crypt_unittest.cc b/chromium/components/os_crypt/os_crypt_unittest.cc index 44bb54c..04b97dc 100644 ---- a/src/3rdparty/chromium/components/os_crypt/os_crypt_unittest.cc -+++ b/src/3rdparty/chromium/components/os_crypt/os_crypt_unittest.cc +--- a/chromium/components/os_crypt/os_crypt_unittest.cc ++++ b/chromium/components/os_crypt/os_crypt_unittest.cc @@ -18,7 +18,7 @@ #include "components/os_crypt/os_crypt_mocker.h" #include "testing/gtest/include/gtest/gtest.h" @@ -2932,10 +2887,10 @@ index 44bb54c..04b97dc 100644 #include "components/os_crypt/os_crypt_mocker_linux.h" #endif -diff --git a/src/3rdparty/chromium/components/system_media_controls/linux/buildflags/buildflags.gni b/src/3rdparty/chromium/components/system_media_controls/linux/buildflags/buildflags.gni +diff --git a/chromium/components/system_media_controls/linux/buildflags/buildflags.gni b/chromium/components/system_media_controls/linux/buildflags/buildflags.gni index cc386df..3f6de76 100644 ---- a/src/3rdparty/chromium/components/system_media_controls/linux/buildflags/buildflags.gni -+++ b/src/3rdparty/chromium/components/system_media_controls/linux/buildflags/buildflags.gni +--- a/chromium/components/system_media_controls/linux/buildflags/buildflags.gni ++++ b/chromium/components/system_media_controls/linux/buildflags/buildflags.gni @@ -7,5 +7,5 @@ import("//build/config/features.gni") declare_args() { # Enables Chromium implementation of the MPRIS D-Bus interface for controlling @@ -2943,10 +2898,10 @@ index cc386df..3f6de76 100644 - use_mpris = is_desktop_linux && use_dbus + use_mpris = is_desktop_linux && use_dbus && !is_haiku } -diff --git a/src/3rdparty/chromium/components/variations/client_filterable_state.cc b/src/3rdparty/chromium/components/variations/client_filterable_state.cc +diff --git a/chromium/components/variations/client_filterable_state.cc b/chromium/components/variations/client_filterable_state.cc index 42c57b4..f3846e2 100644 ---- a/src/3rdparty/chromium/components/variations/client_filterable_state.cc -+++ b/src/3rdparty/chromium/components/variations/client_filterable_state.cc +--- a/chromium/components/variations/client_filterable_state.cc ++++ b/chromium/components/variations/client_filterable_state.cc @@ -25,7 +25,7 @@ Study::Platform ClientFilterableState::GetCurrentPlatform() { return Study::PLATFORM_ANDROID; #elif defined(OS_FUCHSIA) @@ -2956,10 +2911,10 @@ index 42c57b4..f3846e2 100644 // Default BSD and SOLARIS to Linux to not break those builds, although these // platforms are not officially supported by Chrome. return Study::PLATFORM_LINUX; -diff --git a/src/3rdparty/chromium/content/app/content_main_runner_impl.cc b/src/3rdparty/chromium/content/app/content_main_runner_impl.cc +diff --git a/chromium/content/app/content_main_runner_impl.cc b/chromium/content/app/content_main_runner_impl.cc index a8c7d44..fdfc614 100644 ---- a/src/3rdparty/chromium/content/app/content_main_runner_impl.cc -+++ b/src/3rdparty/chromium/content/app/content_main_runner_impl.cc +--- a/chromium/content/app/content_main_runner_impl.cc ++++ b/chromium/content/app/content_main_runner_impl.cc @@ -461,7 +461,9 @@ int RunZygote(ContentMainDelegate* delegate) { }; @@ -2980,11 +2935,11 @@ index a8c7d44..fdfc614 100644 // Zygote::HandleForkRequest may have reallocated the command // line so update it here with the new version. -diff --git a/src/3rdparty/chromium/content/browser/BUILD.gn b/src/3rdparty/chromium/content/browser/BUILD.gn -index 1466f33..e9e1d56 100644 ---- a/src/3rdparty/chromium/content/browser/BUILD.gn -+++ b/src/3rdparty/chromium/content/browser/BUILD.gn -@@ -2067,7 +2067,7 @@ jumbo_static_library("browser") { +diff --git a/chromium/content/browser/BUILD.gn b/chromium/content/browser/BUILD.gn +index ae459c2..43533cd 100644 +--- a/chromium/content/browser/BUILD.gn ++++ b/chromium/content/browser/BUILD.gn +@@ -2068,7 +2068,7 @@ jumbo_static_library("browser") { deps += [ "//ui/events" ] } @@ -2993,10 +2948,10 @@ index 1466f33..e9e1d56 100644 sources += [ "font_access/font_enumeration_cache_fontconfig.cc", "font_access/font_enumeration_cache_fontconfig.h", -diff --git a/src/3rdparty/chromium/content/browser/child_process_launcher_helper_linux.cc b/src/3rdparty/chromium/content/browser/child_process_launcher_helper_linux.cc +diff --git a/chromium/content/browser/child_process_launcher_helper_linux.cc b/chromium/content/browser/child_process_launcher_helper_linux.cc index f3d40b6..16c5cc1 100644 ---- a/src/3rdparty/chromium/content/browser/child_process_launcher_helper_linux.cc -+++ b/src/3rdparty/chromium/content/browser/child_process_launcher_helper_linux.cc +--- a/chromium/content/browser/child_process_launcher_helper_linux.cc ++++ b/chromium/content/browser/child_process_launcher_helper_linux.cc @@ -19,7 +19,9 @@ #include "content/public/common/result_codes.h" #include "content/public/common/sandboxed_process_launcher_delegate.h" @@ -3084,10 +3039,10 @@ index f3d40b6..16c5cc1 100644 } void ChildProcessLauncherHelper::SetProcessPriorityOnLauncherThread( -diff --git a/src/3rdparty/chromium/content/browser/compositor/viz_process_transport_factory.cc b/src/3rdparty/chromium/content/browser/compositor/viz_process_transport_factory.cc +diff --git a/chromium/content/browser/compositor/viz_process_transport_factory.cc b/chromium/content/browser/compositor/viz_process_transport_factory.cc index 4d64a50..a105c69 100644 ---- a/src/3rdparty/chromium/content/browser/compositor/viz_process_transport_factory.cc -+++ b/src/3rdparty/chromium/content/browser/compositor/viz_process_transport_factory.cc +--- a/chromium/content/browser/compositor/viz_process_transport_factory.cc ++++ b/chromium/content/browser/compositor/viz_process_transport_factory.cc @@ -108,7 +108,7 @@ class HostDisplayClient : public viz::HostDisplayClient { HostDisplayClient& operator=(const HostDisplayClient&) = delete; @@ -3097,10 +3052,10 @@ index 4d64a50..a105c69 100644 void DidCompleteSwapWithNewSize(const gfx::Size& size) override { compositor_->OnCompleteSwapWithNewSize(size); } -diff --git a/src/3rdparty/chromium/content/browser/gpu/gpu_process_host.cc b/src/3rdparty/chromium/content/browser/gpu/gpu_process_host.cc +diff --git a/chromium/content/browser/gpu/gpu_process_host.cc b/chromium/content/browser/gpu/gpu_process_host.cc index eec6c13..90fe57e 100644 ---- a/src/3rdparty/chromium/content/browser/gpu/gpu_process_host.cc -+++ b/src/3rdparty/chromium/content/browser/gpu/gpu_process_host.cc +--- a/chromium/content/browser/gpu/gpu_process_host.cc ++++ b/chromium/content/browser/gpu/gpu_process_host.cc @@ -226,7 +226,7 @@ static const char* const kSwitchNames[] = { sandbox::policy::switches::kGpuSandboxFailuresFatal, sandbox::policy::switches::kDisableGpuSandbox, @@ -3110,10 +3065,10 @@ index eec6c13..90fe57e 100644 switches::kDisableDevShmUsage, #endif #if defined(OS_WIN) -diff --git a/src/3rdparty/chromium/content/browser/memory/swap_metrics_driver_impl_linux.cc b/src/3rdparty/chromium/content/browser/memory/swap_metrics_driver_impl_linux.cc +diff --git a/chromium/content/browser/memory/swap_metrics_driver_impl_linux.cc b/chromium/content/browser/memory/swap_metrics_driver_impl_linux.cc index 1b04510..6754828 100644 ---- a/src/3rdparty/chromium/content/browser/memory/swap_metrics_driver_impl_linux.cc -+++ b/src/3rdparty/chromium/content/browser/memory/swap_metrics_driver_impl_linux.cc +--- a/chromium/content/browser/memory/swap_metrics_driver_impl_linux.cc ++++ b/chromium/content/browser/memory/swap_metrics_driver_impl_linux.cc @@ -43,6 +43,7 @@ SwapMetricsDriverImplLinux::~SwapMetricsDriverImplLinux() = default; SwapMetricsDriver::SwapMetricsUpdateResult @@ -3132,10 +3087,10 @@ index 1b04510..6754828 100644 } } // namespace content -diff --git a/src/3rdparty/chromium/content/browser/renderer_host/render_message_filter.cc b/src/3rdparty/chromium/content/browser/renderer_host/render_message_filter.cc +diff --git a/chromium/content/browser/renderer_host/render_message_filter.cc b/chromium/content/browser/renderer_host/render_message_filter.cc index 758ed53..b481c29 100644 ---- a/src/3rdparty/chromium/content/browser/renderer_host/render_message_filter.cc -+++ b/src/3rdparty/chromium/content/browser/renderer_host/render_message_filter.cc +--- a/chromium/content/browser/renderer_host/render_message_filter.cc ++++ b/chromium/content/browser/renderer_host/render_message_filter.cc @@ -70,7 +70,7 @@ #if defined(OS_MAC) #include "ui/accelerated_widget_mac/window_resize_helper_mac.h" @@ -3163,10 +3118,10 @@ index 758ed53..b481c29 100644 void RenderMessageFilter::SetThreadPriority(int32_t ns_tid, base::ThreadPriority priority) { constexpr base::TaskTraits kTraits = { -diff --git a/src/3rdparty/chromium/content/browser/renderer_host/render_message_filter.h b/src/3rdparty/chromium/content/browser/renderer_host/render_message_filter.h +diff --git a/chromium/content/browser/renderer_host/render_message_filter.h b/chromium/content/browser/renderer_host/render_message_filter.h index 0528188..d6ed752 100644 ---- a/src/3rdparty/chromium/content/browser/renderer_host/render_message_filter.h -+++ b/src/3rdparty/chromium/content/browser/renderer_host/render_message_filter.h +--- a/chromium/content/browser/renderer_host/render_message_filter.h ++++ b/chromium/content/browser/renderer_host/render_message_filter.h @@ -79,14 +79,14 @@ class CONTENT_EXPORT RenderMessageFilter // mojom::RenderMessageFilter: void GenerateRoutingID(GenerateRoutingIDCallback routing_id) override; @@ -3184,10 +3139,10 @@ index 0528188..d6ed752 100644 void SetThreadPriorityOnFileThread(base::PlatformThreadId ns_tid, base::ThreadPriority priority); #endif -diff --git a/src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.cc b/src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.cc +diff --git a/chromium/content/browser/renderer_host/render_process_host_impl.cc b/chromium/content/browser/renderer_host/render_process_host_impl.cc index 5c19edf..f007384 100644 ---- a/src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.cc -+++ b/src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.cc +--- a/chromium/content/browser/renderer_host/render_process_host_impl.cc ++++ b/chromium/content/browser/renderer_host/render_process_host_impl.cc @@ -234,7 +234,7 @@ #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" #endif @@ -3224,10 +3179,10 @@ index 5c19edf..f007384 100644 switches::kDisableDevShmUsage, #endif #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) -diff --git a/src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.h b/src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.h +diff --git a/chromium/content/browser/renderer_host/render_process_host_impl.h b/chromium/content/browser/renderer_host/render_process_host_impl.h index dd0774b..57dbbb1 100644 ---- a/src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.h -+++ b/src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.h +--- a/chromium/content/browser/renderer_host/render_process_host_impl.h ++++ b/chromium/content/browser/renderer_host/render_process_host_impl.h @@ -477,10 +477,10 @@ class CONTENT_EXPORT RenderProcessHostImpl is_for_guests_only_ = is_for_guests_only; } @@ -3241,10 +3196,10 @@ index dd0774b..57dbbb1 100644 // Called when a video capture stream or an audio stream is added or removed // and used to determine if the process should be backgrounded or not. -diff --git a/src/3rdparty/chromium/content/browser/utility_process_host.cc b/src/3rdparty/chromium/content/browser/utility_process_host.cc +diff --git a/chromium/content/browser/utility_process_host.cc b/chromium/content/browser/utility_process_host.cc index 09c7b69..0af6eba 100644 ---- a/src/3rdparty/chromium/content/browser/utility_process_host.cc -+++ b/src/3rdparty/chromium/content/browser/utility_process_host.cc +--- a/chromium/content/browser/utility_process_host.cc ++++ b/chromium/content/browser/utility_process_host.cc @@ -230,7 +230,7 @@ bool UtilityProcessHost::StartProcess() { network::switches::kNetLogCaptureMode, network::switches::kExplicitlyAllowedPorts, @@ -3254,10 +3209,10 @@ index 09c7b69..0af6eba 100644 switches::kDisableDevShmUsage, #endif #if defined(OS_MAC) -diff --git a/src/3rdparty/chromium/content/child/BUILD.gn b/src/3rdparty/chromium/content/child/BUILD.gn +diff --git a/chromium/content/child/BUILD.gn b/chromium/content/child/BUILD.gn index cdaf2b2..a914951 100644 ---- a/src/3rdparty/chromium/content/child/BUILD.gn -+++ b/src/3rdparty/chromium/content/child/BUILD.gn +--- a/chromium/content/child/BUILD.gn ++++ b/chromium/content/child/BUILD.gn @@ -155,6 +155,11 @@ target(link_target_type, "child") { "//components/services/font/public/cpp", "//components/services/font/public/mojom", @@ -3270,10 +3225,10 @@ index cdaf2b2..a914951 100644 } if (is_win) { -diff --git a/src/3rdparty/chromium/content/common/common_sandbox_support_linux.cc b/src/3rdparty/chromium/content/common/common_sandbox_support_linux.cc +diff --git a/chromium/content/common/common_sandbox_support_linux.cc b/chromium/content/common/common_sandbox_support_linux.cc index 507c355..c4f32af 100644 ---- a/src/3rdparty/chromium/content/common/common_sandbox_support_linux.cc -+++ b/src/3rdparty/chromium/content/common/common_sandbox_support_linux.cc +--- a/chromium/content/common/common_sandbox_support_linux.cc ++++ b/chromium/content/common/common_sandbox_support_linux.cc @@ -5,6 +5,7 @@ #include "content/public/common/common_sandbox_support_linux.h" @@ -3282,10 +3237,10 @@ index 507c355..c4f32af 100644 #include #include -diff --git a/src/3rdparty/chromium/content/common/set_process_title.cc b/src/3rdparty/chromium/content/common/set_process_title.cc +diff --git a/chromium/content/common/set_process_title.cc b/chromium/content/common/set_process_title.cc index 8b829a4..c813423 100644 ---- a/src/3rdparty/chromium/content/common/set_process_title.cc -+++ b/src/3rdparty/chromium/content/common/set_process_title.cc +--- a/chromium/content/common/set_process_title.cc ++++ b/chromium/content/common/set_process_title.cc @@ -44,7 +44,7 @@ namespace content { // TODO(jrg): Find out if setproctitle or equivalent is available on Android. @@ -3295,10 +3250,10 @@ index 8b829a4..c813423 100644 void SetProcessTitleFromCommandLine(const char** main_argv) { // Build a single string which consists of all the arguments separated -diff --git a/src/3rdparty/chromium/content/gpu/BUILD.gn b/src/3rdparty/chromium/content/gpu/BUILD.gn +diff --git a/chromium/content/gpu/BUILD.gn b/chromium/content/gpu/BUILD.gn index 2c2c1e8..bc93e0a 100644 ---- a/src/3rdparty/chromium/content/gpu/BUILD.gn -+++ b/src/3rdparty/chromium/content/gpu/BUILD.gn +--- a/chromium/content/gpu/BUILD.gn ++++ b/chromium/content/gpu/BUILD.gn @@ -132,7 +132,7 @@ target(link_target_type, "gpu_sources") { # Use DRI on desktop Linux builds. @@ -3308,10 +3263,10 @@ index 2c2c1e8..bc93e0a 100644 configs += [ "//build/config/linux/dri" ] } } -diff --git a/src/3rdparty/chromium/content/gpu/gpu_sandbox_hook_linux.cc b/src/3rdparty/chromium/content/gpu/gpu_sandbox_hook_linux.cc +diff --git a/chromium/content/gpu/gpu_sandbox_hook_linux.cc b/chromium/content/gpu/gpu_sandbox_hook_linux.cc index eb69d52..aac94fa 100644 ---- a/src/3rdparty/chromium/content/gpu/gpu_sandbox_hook_linux.cc -+++ b/src/3rdparty/chromium/content/gpu/gpu_sandbox_hook_linux.cc +--- a/chromium/content/gpu/gpu_sandbox_hook_linux.cc ++++ b/chromium/content/gpu/gpu_sandbox_hook_linux.cc @@ -98,8 +98,9 @@ static const char kLibV4lEncPluginPath[] = "/usr/lib/libv4l/plugins/libv4l-encplugin.so"; #endif @@ -3362,10 +3317,10 @@ index eb69d52..aac94fa 100644 } } // namespace content -diff --git a/src/3rdparty/chromium/content/public/common/child_process_host.h b/src/3rdparty/chromium/content/public/common/child_process_host.h +diff --git a/chromium/content/public/common/child_process_host.h b/chromium/content/public/common/child_process_host.h index f7c4add..795419d 100644 ---- a/src/3rdparty/chromium/content/public/common/child_process_host.h -+++ b/src/3rdparty/chromium/content/public/common/child_process_host.h +--- a/chromium/content/public/common/child_process_host.h ++++ b/chromium/content/public/common/child_process_host.h @@ -81,7 +81,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Sender { // No special behavior requested. CHILD_NORMAL = 0, @@ -3375,20 +3330,20 @@ index f7c4add..795419d 100644 // Indicates that the child execed after forking may be execced from // /proc/self/exe rather than using the "real" app path. This prevents // autoupdate from confusing us if it changes the file out from under us. -diff --git a/src/3rdparty/chromium/content/public/common/zygote/features.gni b/src/3rdparty/chromium/content/public/common/zygote/features.gni +diff --git a/chromium/content/public/common/zygote/features.gni b/chromium/content/public/common/zygote/features.gni index c7580b3..ae0c131 100644 ---- a/src/3rdparty/chromium/content/public/common/zygote/features.gni -+++ b/src/3rdparty/chromium/content/public/common/zygote/features.gni +--- a/chromium/content/public/common/zygote/features.gni ++++ b/chromium/content/public/common/zygote/features.gni @@ -2,4 +2,4 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -use_zygote_handle = is_posix && !is_android && !is_mac +use_zygote_handle = is_posix && !is_android && !is_mac && !is_haiku -diff --git a/src/3rdparty/chromium/content/renderer/render_process_impl.cc b/src/3rdparty/chromium/content/renderer/render_process_impl.cc +diff --git a/chromium/content/renderer/render_process_impl.cc b/chromium/content/renderer/render_process_impl.cc index ab0a696..566d324 100644 ---- a/src/3rdparty/chromium/content/renderer/render_process_impl.cc -+++ b/src/3rdparty/chromium/content/renderer/render_process_impl.cc +--- a/chromium/content/renderer/render_process_impl.cc ++++ b/chromium/content/renderer/render_process_impl.cc @@ -44,7 +44,7 @@ #if defined(OS_WIN) #include "base/win/win_util.h" @@ -3407,10 +3362,10 @@ index ab0a696..566d324 100644 if (base::FeatureList::IsEnabled(features::kWebAssemblyTrapHandler)) { base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); if (!command_line->HasSwitch(switches::kDisableInProcessStackTraces)) { -diff --git a/src/3rdparty/chromium/content/renderer/render_thread_impl.cc b/src/3rdparty/chromium/content/renderer/render_thread_impl.cc +diff --git a/chromium/content/renderer/render_thread_impl.cc b/chromium/content/renderer/render_thread_impl.cc index 6f2c8c5..04da65b 100644 ---- a/src/3rdparty/chromium/content/renderer/render_thread_impl.cc -+++ b/src/3rdparty/chromium/content/renderer/render_thread_impl.cc +--- a/chromium/content/renderer/render_thread_impl.cc ++++ b/chromium/content/renderer/render_thread_impl.cc @@ -715,7 +715,7 @@ void RenderThreadImpl::Init() { DCHECK(parsed_num_raster_threads) << string_value; DCHECK_GT(num_raster_threads, 0); @@ -3429,10 +3384,10 @@ index 6f2c8c5..04da65b 100644 if (base::FeatureList::IsEnabled( blink::features::kBlinkCompositorUseDisplayThreadPriority)) { render_message_filter()->SetThreadPriority( -diff --git a/src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.cc b/src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.cc +diff --git a/chromium/content/renderer/renderer_blink_platform_impl.cc b/chromium/content/renderer/renderer_blink_platform_impl.cc index 119e70d..7c056d3 100644 ---- a/src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.cc -+++ b/src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.cc +--- a/chromium/content/renderer/renderer_blink_platform_impl.cc ++++ b/chromium/content/renderer/renderer_blink_platform_impl.cc @@ -97,7 +97,7 @@ #if defined(OS_MAC) @@ -3478,10 +3433,10 @@ index 119e70d..7c056d3 100644 return sandbox_support_.get(); #else // These platforms do not require sandbox support. -diff --git a/src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.h b/src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.h +diff --git a/chromium/content/renderer/renderer_blink_platform_impl.h b/chromium/content/renderer/renderer_blink_platform_impl.h index 823ae98..2ddf57f 100644 ---- a/src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.h -+++ b/src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.h +--- a/chromium/content/renderer/renderer_blink_platform_impl.h ++++ b/chromium/content/renderer/renderer_blink_platform_impl.h @@ -30,7 +30,7 @@ #include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom.h" #include "third_party/blink/public/mojom/loader/code_cache.mojom.h" @@ -3509,10 +3464,10 @@ index 823ae98..2ddf57f 100644 sk_sp font_loader_; #endif -diff --git a/src/3rdparty/chromium/content/renderer/renderer_main_platform_delegate_linux.cc b/src/3rdparty/chromium/content/renderer/renderer_main_platform_delegate_linux.cc +diff --git a/chromium/content/renderer/renderer_main_platform_delegate_linux.cc b/chromium/content/renderer/renderer_main_platform_delegate_linux.cc index e97f908..3bfc65b 100644 ---- a/src/3rdparty/chromium/content/renderer/renderer_main_platform_delegate_linux.cc -+++ b/src/3rdparty/chromium/content/renderer/renderer_main_platform_delegate_linux.cc +--- a/chromium/content/renderer/renderer_main_platform_delegate_linux.cc ++++ b/chromium/content/renderer/renderer_main_platform_delegate_linux.cc @@ -30,6 +30,7 @@ void RendererMainPlatformDelegate::PlatformUninitialize() { } @@ -3529,10 +3484,10 @@ index e97f908..3bfc65b 100644 return true; } -diff --git a/src/3rdparty/chromium/content/shell/BUILD.gn b/src/3rdparty/chromium/content/shell/BUILD.gn +diff --git a/chromium/content/shell/BUILD.gn b/chromium/content/shell/BUILD.gn index 56c0e8b..f7a0c95 100644 ---- a/src/3rdparty/chromium/content/shell/BUILD.gn -+++ b/src/3rdparty/chromium/content/shell/BUILD.gn +--- a/chromium/content/shell/BUILD.gn ++++ b/chromium/content/shell/BUILD.gn @@ -94,7 +94,7 @@ static_library("content_shell_app") { "//content/web_test:web_test_renderer", ] @@ -3573,10 +3528,10 @@ index 56c0e8b..f7a0c95 100644 data_deps += [ "//third_party/breakpad:dump_syms", "//third_party/breakpad:minidump_stackwalk", -diff --git a/src/3rdparty/chromium/content/utility/BUILD.gn b/src/3rdparty/chromium/content/utility/BUILD.gn +diff --git a/chromium/content/utility/BUILD.gn b/chromium/content/utility/BUILD.gn index 69b834c..d94d0f0 100644 ---- a/src/3rdparty/chromium/content/utility/BUILD.gn -+++ b/src/3rdparty/chromium/content/utility/BUILD.gn +--- a/chromium/content/utility/BUILD.gn ++++ b/chromium/content/utility/BUILD.gn @@ -85,7 +85,7 @@ jumbo_source_set("utility") { deps += [ "//services/proxy_resolver:lib" ] } @@ -3586,10 +3541,10 @@ index 69b834c..d94d0f0 100644 deps += [ "//content/utility/speech:speech_recognition_sandbox_hook" ] } -diff --git a/src/3rdparty/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.cc b/src/3rdparty/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.cc +diff --git a/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.cc b/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.cc index f61fcf8..0f123ab 100644 ---- a/src/3rdparty/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.cc -+++ b/src/3rdparty/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.cc +--- a/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.cc ++++ b/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.cc @@ -9,7 +9,7 @@ #if defined(OS_MAC) @@ -3617,10 +3572,10 @@ index f61fcf8..0f123ab 100644 return sandbox_support_.get(); #else return nullptr; -diff --git a/src/3rdparty/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.h b/src/3rdparty/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.h +diff --git a/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.h b/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.h index fcba9fe..e07bc53 100644 ---- a/src/3rdparty/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.h -+++ b/src/3rdparty/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.h +--- a/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.h ++++ b/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.h @@ -11,7 +11,7 @@ #include "build/build_config.h" #include "third_party/blink/public/platform/platform.h" @@ -3643,10 +3598,10 @@ index fcba9fe..e07bc53 100644 sk_sp font_loader_; #endif -diff --git a/src/3rdparty/chromium/content/zygote/zygote_main_linux.cc b/src/3rdparty/chromium/content/zygote/zygote_main_linux.cc +diff --git a/chromium/content/zygote/zygote_main_linux.cc b/chromium/content/zygote/zygote_main_linux.cc index bbffdd4..5f3b018 100644 ---- a/src/3rdparty/chromium/content/zygote/zygote_main_linux.cc -+++ b/src/3rdparty/chromium/content/zygote/zygote_main_linux.cc +--- a/chromium/content/zygote/zygote_main_linux.cc ++++ b/chromium/content/zygote/zygote_main_linux.cc @@ -11,7 +11,9 @@ #include #include @@ -3693,10 +3648,10 @@ index bbffdd4..5f3b018 100644 } } // namespace content -diff --git a/src/3rdparty/chromium/device/bluetooth/BUILD.gn b/src/3rdparty/chromium/device/bluetooth/BUILD.gn +diff --git a/chromium/device/bluetooth/BUILD.gn b/chromium/device/bluetooth/BUILD.gn index 5f7d3f3..6e37cde 100644 ---- a/src/3rdparty/chromium/device/bluetooth/BUILD.gn -+++ b/src/3rdparty/chromium/device/bluetooth/BUILD.gn +--- a/chromium/device/bluetooth/BUILD.gn ++++ b/chromium/device/bluetooth/BUILD.gn @@ -295,7 +295,7 @@ component("bluetooth") { ] } @@ -3706,10 +3661,10 @@ index 5f7d3f3..6e37cde 100644 if (use_dbus && is_chromeos) { # This crap uses ChromeOS specific system API sources += [ -diff --git a/src/3rdparty/chromium/device/gamepad/gamepad_provider.cc b/src/3rdparty/chromium/device/gamepad/gamepad_provider.cc +diff --git a/chromium/device/gamepad/gamepad_provider.cc b/chromium/device/gamepad/gamepad_provider.cc index ecc5837..4aa6a6ff 100644 ---- a/src/3rdparty/chromium/device/gamepad/gamepad_provider.cc -+++ b/src/3rdparty/chromium/device/gamepad/gamepad_provider.cc +--- a/chromium/device/gamepad/gamepad_provider.cc ++++ b/chromium/device/gamepad/gamepad_provider.cc @@ -149,7 +149,7 @@ void GamepadProvider::Initialize(std::unique_ptr fetcher) { if (!polling_thread_) @@ -3719,10 +3674,10 @@ index ecc5837..4aa6a6ff 100644 // On Linux, the data fetcher needs to watch file descriptors, so the message // loop needs to be a libevent loop. const base::MessagePumpType kMessageLoopType = base::MessagePumpType::IO; -diff --git a/src/3rdparty/chromium/device/gamepad/hid_writer_linux.cc b/src/3rdparty/chromium/device/gamepad/hid_writer_linux.cc +diff --git a/chromium/device/gamepad/hid_writer_linux.cc b/chromium/device/gamepad/hid_writer_linux.cc index eb87897..77d4180 100644 ---- a/src/3rdparty/chromium/device/gamepad/hid_writer_linux.cc -+++ b/src/3rdparty/chromium/device/gamepad/hid_writer_linux.cc +--- a/chromium/device/gamepad/hid_writer_linux.cc ++++ b/chromium/device/gamepad/hid_writer_linux.cc @@ -4,6 +4,8 @@ #include "device/gamepad/hid_writer_linux.h" @@ -3732,10 +3687,10 @@ index eb87897..77d4180 100644 #include "base/posix/eintr_wrapper.h" namespace device { -diff --git a/src/3rdparty/chromium/gpu/command_buffer/common/gpu_memory_buffer_support.cc b/src/3rdparty/chromium/gpu/command_buffer/common/gpu_memory_buffer_support.cc +diff --git a/chromium/gpu/command_buffer/common/gpu_memory_buffer_support.cc b/chromium/gpu/command_buffer/common/gpu_memory_buffer_support.cc index 388de9f..dc8efe6 100644 ---- a/src/3rdparty/chromium/gpu/command_buffer/common/gpu_memory_buffer_support.cc -+++ b/src/3rdparty/chromium/gpu/command_buffer/common/gpu_memory_buffer_support.cc +--- a/chromium/gpu/command_buffer/common/gpu_memory_buffer_support.cc ++++ b/chromium/gpu/command_buffer/common/gpu_memory_buffer_support.cc @@ -57,7 +57,7 @@ uint32_t GetPlatformSpecificTextureTarget() { return macos_specific_texture_target; #elif defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) @@ -3754,10 +3709,10 @@ index 388de9f..dc8efe6 100644 // Always use GL_TEXTURE_2D as the target for RGB textures. // https://crbug.com/916728 if (format == gfx::BufferFormat::R_8 || format == gfx::BufferFormat::RG_88 || -diff --git a/src/3rdparty/chromium/gpu/config/gpu_test_config.cc b/src/3rdparty/chromium/gpu/config/gpu_test_config.cc +diff --git a/chromium/gpu/config/gpu_test_config.cc b/chromium/gpu/config/gpu_test_config.cc index 49219e4..c7e860d 100644 ---- a/src/3rdparty/chromium/gpu/config/gpu_test_config.cc -+++ b/src/3rdparty/chromium/gpu/config/gpu_test_config.cc +--- a/chromium/gpu/config/gpu_test_config.cc ++++ b/chromium/gpu/config/gpu_test_config.cc @@ -27,7 +27,7 @@ namespace { GPUTestConfig::OS GetCurrentOS() { #if defined(OS_CHROMEOS) @@ -3767,10 +3722,10 @@ index 49219e4..c7e860d 100644 return GPUTestConfig::kOsLinux; #elif defined(OS_WIN) int32_t major_version = 0; -diff --git a/src/3rdparty/chromium/gpu/ipc/common/gpu_memory_buffer_support.cc b/src/3rdparty/chromium/gpu/ipc/common/gpu_memory_buffer_support.cc +diff --git a/chromium/gpu/ipc/common/gpu_memory_buffer_support.cc b/chromium/gpu/ipc/common/gpu_memory_buffer_support.cc index 19c1f56..82ef91b 100644 ---- a/src/3rdparty/chromium/gpu/ipc/common/gpu_memory_buffer_support.cc -+++ b/src/3rdparty/chromium/gpu/ipc/common/gpu_memory_buffer_support.cc +--- a/chromium/gpu/ipc/common/gpu_memory_buffer_support.cc ++++ b/chromium/gpu/ipc/common/gpu_memory_buffer_support.cc @@ -16,7 +16,7 @@ #include "gpu/ipc/common/gpu_memory_buffer_impl_io_surface.h" #endif @@ -3789,10 +3744,10 @@ index 19c1f56..82ef91b 100644 #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h" #endif -diff --git a/src/3rdparty/chromium/gpu/ipc/common/surface_handle.h b/src/3rdparty/chromium/gpu/ipc/common/surface_handle.h +diff --git a/chromium/gpu/ipc/common/surface_handle.h b/chromium/gpu/ipc/common/surface_handle.h index 64c4e12..b30c372 100644 ---- a/src/3rdparty/chromium/gpu/ipc/common/surface_handle.h -+++ b/src/3rdparty/chromium/gpu/ipc/common/surface_handle.h +--- a/chromium/gpu/ipc/common/surface_handle.h ++++ b/chromium/gpu/ipc/common/surface_handle.h @@ -11,7 +11,7 @@ #if (defined(OS_MAC) || defined(OS_WIN) || defined(USE_X11) || \ @@ -3812,10 +3767,10 @@ index 64c4e12..b30c372 100644 using SurfaceHandle = int32_t; constexpr SurfaceHandle kNullSurfaceHandle = 0; #else -diff --git a/src/3rdparty/chromium/gpu/vulkan/features.gni b/src/3rdparty/chromium/gpu/vulkan/features.gni +diff --git a/chromium/gpu/vulkan/features.gni b/chromium/gpu/vulkan/features.gni index 7a98011..74a043d 100644 ---- a/src/3rdparty/chromium/gpu/vulkan/features.gni -+++ b/src/3rdparty/chromium/gpu/vulkan/features.gni +--- a/chromium/gpu/vulkan/features.gni ++++ b/chromium/gpu/vulkan/features.gni @@ -8,7 +8,7 @@ import("//build/config/ui.gni") # For details see declare_args() in build/config/BUILDCONFIG.gn. declare_args() { @@ -3825,10 +3780,10 @@ index 7a98011..74a043d 100644 # Enable swiftshader vulkan. Disabling it can save build time, however # --use-vulkan=swiftshader and some tests which use swiftshader vulkan will -diff --git a/src/3rdparty/chromium/headless/BUILD.gn b/src/3rdparty/chromium/headless/BUILD.gn +diff --git a/chromium/headless/BUILD.gn b/chromium/headless/BUILD.gn index d2ab76a..fb3cfde 100644 ---- a/src/3rdparty/chromium/headless/BUILD.gn -+++ b/src/3rdparty/chromium/headless/BUILD.gn +--- a/chromium/headless/BUILD.gn ++++ b/chromium/headless/BUILD.gn @@ -275,7 +275,7 @@ source_set("headless_shared_sources") { sources += generated_devtools_api sources += get_target_outputs(":protocol_sources") @@ -3865,10 +3820,10 @@ index d2ab76a..fb3cfde 100644 deps += [ "//components/crash/content/browser" ] } -diff --git a/src/3rdparty/chromium/ipc/ipc_channel.h b/src/3rdparty/chromium/ipc/ipc_channel.h +diff --git a/chromium/ipc/ipc_channel.h b/chromium/ipc/ipc_channel.h index 72e130e..4704cbc 100644 ---- a/src/3rdparty/chromium/ipc/ipc_channel.h -+++ b/src/3rdparty/chromium/ipc/ipc_channel.h +--- a/chromium/ipc/ipc_channel.h ++++ b/chromium/ipc/ipc_channel.h @@ -245,7 +245,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender { static std::string GenerateUniqueRandomChannelID(); #endif @@ -3878,10 +3833,10 @@ index 72e130e..4704cbc 100644 // Sandboxed processes live in a PID namespace, so when sending the IPC hello // message from client to server we need to send the PID from the global // PID namespace. -diff --git a/src/3rdparty/chromium/ipc/ipc_channel_common.cc b/src/3rdparty/chromium/ipc/ipc_channel_common.cc +diff --git a/chromium/ipc/ipc_channel_common.cc b/chromium/ipc/ipc_channel_common.cc index 8990eee..db4cac4 100644 ---- a/src/3rdparty/chromium/ipc/ipc_channel_common.cc -+++ b/src/3rdparty/chromium/ipc/ipc_channel_common.cc +--- a/chromium/ipc/ipc_channel_common.cc ++++ b/chromium/ipc/ipc_channel_common.cc @@ -10,7 +10,7 @@ namespace IPC { @@ -3900,10 +3855,10 @@ index 8990eee..db4cac4 100644 // static std::unique_ptr Channel::CreateClient( -diff --git a/src/3rdparty/chromium/ipc/ipc_channel_mojo.cc b/src/3rdparty/chromium/ipc/ipc_channel_mojo.cc +diff --git a/chromium/ipc/ipc_channel_mojo.cc b/chromium/ipc/ipc_channel_mojo.cc index 798172a..74bb4d1 100644 ---- a/src/3rdparty/chromium/ipc/ipc_channel_mojo.cc -+++ b/src/3rdparty/chromium/ipc/ipc_channel_mojo.cc +--- a/chromium/ipc/ipc_channel_mojo.cc ++++ b/chromium/ipc/ipc_channel_mojo.cc @@ -74,10 +74,10 @@ class MojoChannelFactory : public ChannelFactory { }; @@ -3917,10 +3872,10 @@ index 798172a..74bb4d1 100644 #if defined(OS_NACL) return -1; #else -diff --git a/src/3rdparty/chromium/ipc/ipc_message_utils.cc b/src/3rdparty/chromium/ipc/ipc_message_utils.cc +diff --git a/chromium/ipc/ipc_message_utils.cc b/chromium/ipc/ipc_message_utils.cc index 54d49ec..46c9dea 100644 ---- a/src/3rdparty/chromium/ipc/ipc_message_utils.cc -+++ b/src/3rdparty/chromium/ipc/ipc_message_utils.cc +--- a/chromium/ipc/ipc_message_utils.cc ++++ b/chromium/ipc/ipc_message_utils.cc @@ -357,7 +357,7 @@ void ParamTraits::Log(const param_type& p, std::string* l) { } @@ -3930,10 +3885,10 @@ index 54d49ec..46c9dea 100644 void ParamTraits::Log(const param_type& p, std::string* l) { l->append(base::NumberToString(p)); } -diff --git a/src/3rdparty/chromium/ipc/ipc_message_utils.h b/src/3rdparty/chromium/ipc/ipc_message_utils.h +diff --git a/chromium/ipc/ipc_message_utils.h b/chromium/ipc/ipc_message_utils.h index ad2596a..97f6415 100644 ---- a/src/3rdparty/chromium/ipc/ipc_message_utils.h -+++ b/src/3rdparty/chromium/ipc/ipc_message_utils.h +--- a/chromium/ipc/ipc_message_utils.h ++++ b/chromium/ipc/ipc_message_utils.h @@ -210,7 +210,7 @@ struct ParamTraits { // Since we want to support Android 32<>64 bit IPC, as long as we don't have // these traits for 32 bit ARM then that'll catch any errors. @@ -3943,10 +3898,10 @@ index ad2596a..97f6415 100644 template <> struct ParamTraits { typedef long param_type; -diff --git a/src/3rdparty/chromium/media/audio/BUILD.gn b/src/3rdparty/chromium/media/audio/BUILD.gn +diff --git a/chromium/media/audio/BUILD.gn b/chromium/media/audio/BUILD.gn index 63dce70..12b1c1c 100644 ---- a/src/3rdparty/chromium/media/audio/BUILD.gn -+++ b/src/3rdparty/chromium/media/audio/BUILD.gn +--- a/chromium/media/audio/BUILD.gn ++++ b/chromium/media/audio/BUILD.gn @@ -234,7 +234,7 @@ source_set("audio") { ] } @@ -3978,11 +3933,11 @@ index 63dce70..12b1c1c 100644 if (enable_webrtc) { sources += [ "audio_input_stream_data_interceptor.cc", -diff --git a/src/3rdparty/chromium/media/audio/haiku/audio_input_stream_haiku.cc b/src/3rdparty/chromium/media/audio/haiku/audio_input_stream_haiku.cc +diff --git a/chromium/media/audio/haiku/audio_input_stream_haiku.cc b/chromium/media/audio/haiku/audio_input_stream_haiku.cc new file mode 100644 index 0000000..944023f --- /dev/null -+++ b/src/3rdparty/chromium/media/audio/haiku/audio_input_stream_haiku.cc ++++ b/chromium/media/audio/haiku/audio_input_stream_haiku.cc @@ -0,0 +1,309 @@ +// Copyright 2021 Gerasim Troeglazov. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be @@ -4293,11 +4248,11 @@ index 0000000..944023f +} + +} // namespace media -diff --git a/src/3rdparty/chromium/media/audio/haiku/audio_input_stream_haiku.h b/src/3rdparty/chromium/media/audio/haiku/audio_input_stream_haiku.h +diff --git a/chromium/media/audio/haiku/audio_input_stream_haiku.h b/chromium/media/audio/haiku/audio_input_stream_haiku.h new file mode 100644 index 0000000..2cd96dc --- /dev/null -+++ b/src/3rdparty/chromium/media/audio/haiku/audio_input_stream_haiku.h ++++ b/chromium/media/audio/haiku/audio_input_stream_haiku.h @@ -0,0 +1,112 @@ +// Copyright 2021 Gerasim Troeglazov. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be @@ -4411,11 +4366,11 @@ index 0000000..2cd96dc +} // namespace media + +#endif // MEDIA_AUDIO_HAIKU_AUDIO_INPUT_STREAM_HAIKU_H_ -diff --git a/src/3rdparty/chromium/media/audio/haiku/audio_manager_haiku.cc b/src/3rdparty/chromium/media/audio/haiku/audio_manager_haiku.cc +diff --git a/chromium/media/audio/haiku/audio_manager_haiku.cc b/chromium/media/audio/haiku/audio_manager_haiku.cc new file mode 100644 index 0000000..186319c --- /dev/null -+++ b/src/3rdparty/chromium/media/audio/haiku/audio_manager_haiku.cc ++++ b/chromium/media/audio/haiku/audio_manager_haiku.cc @@ -0,0 +1,103 @@ +// Copyright 2021 Gerasim Troeglazov. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be @@ -4520,11 +4475,11 @@ index 0000000..186319c +} + +} // namespace media -diff --git a/src/3rdparty/chromium/media/audio/haiku/audio_manager_haiku.h b/src/3rdparty/chromium/media/audio/haiku/audio_manager_haiku.h +diff --git a/chromium/media/audio/haiku/audio_manager_haiku.h b/chromium/media/audio/haiku/audio_manager_haiku.h new file mode 100644 index 0000000..2a3eba9 --- /dev/null -+++ b/src/3rdparty/chromium/media/audio/haiku/audio_manager_haiku.h ++++ b/chromium/media/audio/haiku/audio_manager_haiku.h @@ -0,0 +1,55 @@ +// Copyright 2021 Gerasim Troeglazov. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be @@ -4581,11 +4536,11 @@ index 0000000..2a3eba9 +} // namespace media + +#endif // MEDIA_AUDIO_HAIKU_AUDIO_MANAGER_HAIKU_H_ -diff --git a/src/3rdparty/chromium/media/audio/haiku/audio_output_stream_haiku.cc b/src/3rdparty/chromium/media/audio/haiku/audio_output_stream_haiku.cc +diff --git a/chromium/media/audio/haiku/audio_output_stream_haiku.cc b/chromium/media/audio/haiku/audio_output_stream_haiku.cc new file mode 100644 index 0000000..c4e3c97 --- /dev/null -+++ b/src/3rdparty/chromium/media/audio/haiku/audio_output_stream_haiku.cc ++++ b/chromium/media/audio/haiku/audio_output_stream_haiku.cc @@ -0,0 +1,94 @@ +// Copyright 2021 Gerasim Troeglazov. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be @@ -4681,11 +4636,11 @@ index 0000000..c4e3c97 +} + +} // namespace media -diff --git a/src/3rdparty/chromium/media/audio/haiku/audio_output_stream_haiku.h b/src/3rdparty/chromium/media/audio/haiku/audio_output_stream_haiku.h +diff --git a/chromium/media/audio/haiku/audio_output_stream_haiku.h b/chromium/media/audio/haiku/audio_output_stream_haiku.h new file mode 100644 index 0000000..0e97029 --- /dev/null -+++ b/src/3rdparty/chromium/media/audio/haiku/audio_output_stream_haiku.h ++++ b/chromium/media/audio/haiku/audio_output_stream_haiku.h @@ -0,0 +1,64 @@ +// Copyright 2021 Gerasim Troeglazov. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be @@ -4751,10 +4706,10 @@ index 0000000..0e97029 +} // namespace media + +#endif // MEDIA_AUDIO_HAIKU_AUDIO_OUTPUT_STREAM_HAIKU_H_ -diff --git a/src/3rdparty/chromium/media/base/scopedfd_helper.h b/src/3rdparty/chromium/media/base/scopedfd_helper.h +diff --git a/chromium/media/base/scopedfd_helper.h b/chromium/media/base/scopedfd_helper.h index 5cc8086..295586e 100644 ---- a/src/3rdparty/chromium/media/base/scopedfd_helper.h -+++ b/src/3rdparty/chromium/media/base/scopedfd_helper.h +--- a/chromium/media/base/scopedfd_helper.h ++++ b/chromium/media/base/scopedfd_helper.h @@ -14,14 +14,14 @@ namespace media { // since the only current user is V4L2 we are limiting the scope to OS_LINUX so // the binary size does not inflate on non-using systems. Feel free to adapt @@ -4772,10 +4727,10 @@ index 5cc8086..295586e 100644 } // namespace media -diff --git a/src/3rdparty/chromium/media/capture/BUILD.gn b/src/3rdparty/chromium/media/capture/BUILD.gn +diff --git a/chromium/media/capture/BUILD.gn b/chromium/media/capture/BUILD.gn index c9986f3..ad19c64 100644 ---- a/src/3rdparty/chromium/media/capture/BUILD.gn -+++ b/src/3rdparty/chromium/media/capture/BUILD.gn +--- a/chromium/media/capture/BUILD.gn ++++ b/chromium/media/capture/BUILD.gn @@ -250,7 +250,7 @@ jumbo_component("capture_lib") { # This includes the case of ChromeOS # TODO: As we move to separately version Chrome from ChromeOS, we may need to split @@ -4806,10 +4761,10 @@ index c9986f3..ad19c64 100644 } source_set("test_support") { -diff --git a/src/3rdparty/chromium/media/capture/video/create_video_capture_device_factory.cc b/src/3rdparty/chromium/media/capture/video/create_video_capture_device_factory.cc +diff --git a/chromium/media/capture/video/create_video_capture_device_factory.cc b/chromium/media/capture/video/create_video_capture_device_factory.cc index 8d0f977..5d6e232 100644 ---- a/src/3rdparty/chromium/media/capture/video/create_video_capture_device_factory.cc -+++ b/src/3rdparty/chromium/media/capture/video/create_video_capture_device_factory.cc +--- a/chromium/media/capture/video/create_video_capture_device_factory.cc ++++ b/chromium/media/capture/video/create_video_capture_device_factory.cc @@ -25,6 +25,8 @@ #include "media/capture/video/android/video_capture_device_factory_android.h" #elif defined(OS_FUCHSIA) @@ -4828,10 +4783,10 @@ index 8d0f977..5d6e232 100644 #else NOTIMPLEMENTED(); return nullptr; -diff --git a/src/3rdparty/chromium/media/capture/video/fake_video_capture_device_factory.cc b/src/3rdparty/chromium/media/capture/video/fake_video_capture_device_factory.cc +diff --git a/chromium/media/capture/video/fake_video_capture_device_factory.cc b/chromium/media/capture/video/fake_video_capture_device_factory.cc index b96840f..6233375 100644 ---- a/src/3rdparty/chromium/media/capture/video/fake_video_capture_device_factory.cc -+++ b/src/3rdparty/chromium/media/capture/video/fake_video_capture_device_factory.cc +--- a/chromium/media/capture/video/fake_video_capture_device_factory.cc ++++ b/chromium/media/capture/video/fake_video_capture_device_factory.cc @@ -218,6 +218,8 @@ void FakeVideoCaptureDeviceFactory::GetDevicesInfo( VideoCaptureApi::ANDROID_API2_LEGACY; #elif defined(OS_FUCHSIA) @@ -4841,10 +4796,10 @@ index b96840f..6233375 100644 #else #error Unsupported platform #endif -diff --git a/src/3rdparty/chromium/media/capture/video/file_video_capture_device_factory.cc b/src/3rdparty/chromium/media/capture/video/file_video_capture_device_factory.cc +diff --git a/chromium/media/capture/video/file_video_capture_device_factory.cc b/chromium/media/capture/video/file_video_capture_device_factory.cc index d899c50..9417271 100644 ---- a/src/3rdparty/chromium/media/capture/video/file_video_capture_device_factory.cc -+++ b/src/3rdparty/chromium/media/capture/video/file_video_capture_device_factory.cc +--- a/chromium/media/capture/video/file_video_capture_device_factory.cc ++++ b/chromium/media/capture/video/file_video_capture_device_factory.cc @@ -54,6 +54,8 @@ void FileVideoCaptureDeviceFactory::GetDevicesInfo( VideoCaptureApi::MACOSX_AVFOUNDATION; #elif defined(OS_LINUX) || defined(OS_CHROMEOS) @@ -4854,11 +4809,11 @@ index d899c50..9417271 100644 #else VideoCaptureApi::UNKNOWN; #endif -diff --git a/src/3rdparty/chromium/media/capture/video/haiku/video_capture_device_consumer_haiku.cc b/src/3rdparty/chromium/media/capture/video/haiku/video_capture_device_consumer_haiku.cc +diff --git a/chromium/media/capture/video/haiku/video_capture_device_consumer_haiku.cc b/chromium/media/capture/video/haiku/video_capture_device_consumer_haiku.cc new file mode 100644 index 0000000..8419d99 --- /dev/null -+++ b/src/3rdparty/chromium/media/capture/video/haiku/video_capture_device_consumer_haiku.cc ++++ b/chromium/media/capture/video/haiku/video_capture_device_consumer_haiku.cc @@ -0,0 +1,485 @@ +// Copyright 2021-2023 Gerasim Troeglazov. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be @@ -5345,11 +5300,11 @@ index 0000000..8419d99 +} + +} //namespace media -diff --git a/src/3rdparty/chromium/media/capture/video/haiku/video_capture_device_consumer_haiku.h b/src/3rdparty/chromium/media/capture/video/haiku/video_capture_device_consumer_haiku.h +diff --git a/chromium/media/capture/video/haiku/video_capture_device_consumer_haiku.h b/chromium/media/capture/video/haiku/video_capture_device_consumer_haiku.h new file mode 100644 index 0000000..45cff12 --- /dev/null -+++ b/src/3rdparty/chromium/media/capture/video/haiku/video_capture_device_consumer_haiku.h ++++ b/chromium/media/capture/video/haiku/video_capture_device_consumer_haiku.h @@ -0,0 +1,117 @@ +// Copyright 2021-2023 Gerasim Troeglazov. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be @@ -5468,11 +5423,11 @@ index 0000000..45cff12 +} // namespace media + +#endif // MEDIA_CAPTURE_VIDEO_HAIKU_VIDEO_CAPTURE_DEVICE_CONSUMER_HAIKU_H_ -diff --git a/src/3rdparty/chromium/media/capture/video/haiku/video_capture_device_factory_haiku.cc b/src/3rdparty/chromium/media/capture/video/haiku/video_capture_device_factory_haiku.cc +diff --git a/chromium/media/capture/video/haiku/video_capture_device_factory_haiku.cc b/chromium/media/capture/video/haiku/video_capture_device_factory_haiku.cc new file mode 100644 index 0000000..9df67fe --- /dev/null -+++ b/src/3rdparty/chromium/media/capture/video/haiku/video_capture_device_factory_haiku.cc ++++ b/chromium/media/capture/video/haiku/video_capture_device_factory_haiku.cc @@ -0,0 +1,96 @@ +// Copyright 2021-2023 Gerasim Troeglazov. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be @@ -5570,11 +5525,11 @@ index 0000000..9df67fe +} + +} // namespace media -diff --git a/src/3rdparty/chromium/media/capture/video/haiku/video_capture_device_factory_haiku.h b/src/3rdparty/chromium/media/capture/video/haiku/video_capture_device_factory_haiku.h +diff --git a/chromium/media/capture/video/haiku/video_capture_device_factory_haiku.h b/chromium/media/capture/video/haiku/video_capture_device_factory_haiku.h new file mode 100644 index 0000000..1560e74 --- /dev/null -+++ b/src/3rdparty/chromium/media/capture/video/haiku/video_capture_device_factory_haiku.h ++++ b/chromium/media/capture/video/haiku/video_capture_device_factory_haiku.h @@ -0,0 +1,44 @@ +// Copyright 2021-2023 Gerasim Troeglazov. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be @@ -5620,11 +5575,11 @@ index 0000000..1560e74 +} // namespace media + +#endif // MEDIA_CAPTURE_VIDEO_HAIKU_VIDEO_CAPTURE_DEVICE_FACTORY_HAIKU_H_ -diff --git a/src/3rdparty/chromium/media/capture/video/haiku/video_capture_device_haiku.cc b/src/3rdparty/chromium/media/capture/video/haiku/video_capture_device_haiku.cc +diff --git a/chromium/media/capture/video/haiku/video_capture_device_haiku.cc b/chromium/media/capture/video/haiku/video_capture_device_haiku.cc new file mode 100644 index 0000000..8502fb2 --- /dev/null -+++ b/src/3rdparty/chromium/media/capture/video/haiku/video_capture_device_haiku.cc ++++ b/chromium/media/capture/video/haiku/video_capture_device_haiku.cc @@ -0,0 +1,59 @@ +// Copyright 2021-2023 Gerasim Troeglazov. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be @@ -5685,11 +5640,11 @@ index 0000000..8502fb2 +} + +} // namespace media -diff --git a/src/3rdparty/chromium/media/capture/video/haiku/video_capture_device_haiku.h b/src/3rdparty/chromium/media/capture/video/haiku/video_capture_device_haiku.h +diff --git a/chromium/media/capture/video/haiku/video_capture_device_haiku.h b/chromium/media/capture/video/haiku/video_capture_device_haiku.h new file mode 100644 index 0000000..a78bf16 --- /dev/null -+++ b/src/3rdparty/chromium/media/capture/video/haiku/video_capture_device_haiku.h ++++ b/chromium/media/capture/video/haiku/video_capture_device_haiku.h @@ -0,0 +1,109 @@ +// Copyright 2021-2023 Gerasim Troeglazov. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be @@ -5800,10 +5755,10 @@ index 0000000..a78bf16 +} // namespace media + +#endif // MEDIA_CAPTURE_VIDEO_HAIKU_VIDEO_CAPTURE_DEVICE_HAIKU_H_ -diff --git a/src/3rdparty/chromium/media/capture/video/video_capture_device_descriptor.cc b/src/3rdparty/chromium/media/capture/video/video_capture_device_descriptor.cc +diff --git a/chromium/media/capture/video/video_capture_device_descriptor.cc b/chromium/media/capture/video/video_capture_device_descriptor.cc index e044b4e..d5a0700 100644 ---- a/src/3rdparty/chromium/media/capture/video/video_capture_device_descriptor.cc -+++ b/src/3rdparty/chromium/media/capture/video/video_capture_device_descriptor.cc +--- a/chromium/media/capture/video/video_capture_device_descriptor.cc ++++ b/chromium/media/capture/video/video_capture_device_descriptor.cc @@ -95,6 +95,8 @@ const char* VideoCaptureDeviceDescriptor::GetCaptureApiTypeString() const { return "Camera API2 Limited"; case VideoCaptureApi::FUCHSIA_CAMERA3: @@ -5813,10 +5768,10 @@ index e044b4e..d5a0700 100644 case VideoCaptureApi::VIRTUAL_DEVICE: return "Virtual Device"; case VideoCaptureApi::UNKNOWN: -diff --git a/src/3rdparty/chromium/media/capture/video/video_capture_device_descriptor.h b/src/3rdparty/chromium/media/capture/video/video_capture_device_descriptor.h +diff --git a/chromium/media/capture/video/video_capture_device_descriptor.h b/chromium/media/capture/video/video_capture_device_descriptor.h index f73d893..1548d95 100644 ---- a/src/3rdparty/chromium/media/capture/video/video_capture_device_descriptor.h -+++ b/src/3rdparty/chromium/media/capture/video/video_capture_device_descriptor.h +--- a/chromium/media/capture/video/video_capture_device_descriptor.h ++++ b/chromium/media/capture/video/video_capture_device_descriptor.h @@ -28,6 +28,7 @@ enum class VideoCaptureApi { ANDROID_API2_FULL, ANDROID_API2_LIMITED, @@ -5825,10 +5780,10 @@ index f73d893..1548d95 100644 VIRTUAL_DEVICE, UNKNOWN }; -diff --git a/src/3rdparty/chromium/media/filters/audio_file_reader.cc b/src/3rdparty/chromium/media/filters/audio_file_reader.cc +diff --git a/chromium/media/filters/audio_file_reader.cc b/chromium/media/filters/audio_file_reader.cc index cb81d92..bd73908 100644 ---- a/src/3rdparty/chromium/media/filters/audio_file_reader.cc -+++ b/src/3rdparty/chromium/media/filters/audio_file_reader.cc +--- a/chromium/media/filters/audio_file_reader.cc ++++ b/chromium/media/filters/audio_file_reader.cc @@ -85,7 +85,7 @@ bool AudioFileReader::OpenDemuxer() { } @@ -5838,10 +5793,10 @@ index cb81d92..bd73908 100644 if (codec) { // MP3 decodes to S16P which we don't support, tell it to use S16 instead. if (codec_context_->sample_fmt == AV_SAMPLE_FMT_S16P) -diff --git a/src/3rdparty/chromium/net/BUILD.gn b/src/3rdparty/chromium/net/BUILD.gn +diff --git a/chromium/net/BUILD.gn b/chromium/net/BUILD.gn index c399590..b01504d 100644 ---- a/src/3rdparty/chromium/net/BUILD.gn -+++ b/src/3rdparty/chromium/net/BUILD.gn +--- a/chromium/net/BUILD.gn ++++ b/chromium/net/BUILD.gn @@ -99,7 +99,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", ] @@ -5886,10 +5841,10 @@ index c399590..b01504d 100644 sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", -diff --git a/src/3rdparty/chromium/net/base/address_tracker_linux.cc b/src/3rdparty/chromium/net/base/address_tracker_linux.cc +diff --git a/chromium/net/base/address_tracker_linux.cc b/chromium/net/base/address_tracker_linux.cc index 2daccb4..8796a77 100644 ---- a/src/3rdparty/chromium/net/base/address_tracker_linux.cc -+++ b/src/3rdparty/chromium/net/base/address_tracker_linux.cc +--- a/chromium/net/base/address_tracker_linux.cc ++++ b/chromium/net/base/address_tracker_linux.cc @@ -5,7 +5,9 @@ #include "net/base/address_tracker_linux.h" @@ -5968,10 +5923,10 @@ index 2daccb4..8796a77 100644 } int AddressTrackerLinux::GetThreadsWaitingForConnectionTypeInitForTesting() { -diff --git a/src/3rdparty/chromium/net/base/address_tracker_linux.h b/src/3rdparty/chromium/net/base/address_tracker_linux.h +diff --git a/chromium/net/base/address_tracker_linux.h b/chromium/net/base/address_tracker_linux.h index a18450d..45cf157 100644 ---- a/src/3rdparty/chromium/net/base/address_tracker_linux.h -+++ b/src/3rdparty/chromium/net/base/address_tracker_linux.h +--- a/chromium/net/base/address_tracker_linux.h ++++ b/chromium/net/base/address_tracker_linux.h @@ -7,9 +7,6 @@ #include // Needed to include netlink. @@ -5982,10 +5937,10 @@ index a18450d..45cf157 100644 #include #include -diff --git a/src/3rdparty/chromium/net/base/net_errors_posix.cc b/src/3rdparty/chromium/net/base/net_errors_posix.cc +diff --git a/chromium/net/base/net_errors_posix.cc b/chromium/net/base/net_errors_posix.cc index 2e4fd24..21d4211 100644 ---- a/src/3rdparty/chromium/net/base/net_errors_posix.cc -+++ b/src/3rdparty/chromium/net/base/net_errors_posix.cc +--- a/chromium/net/base/net_errors_posix.cc ++++ b/chromium/net/base/net_errors_posix.cc @@ -107,8 +107,10 @@ Error MapSystemError(logging::SystemErrorCode os_error) { return ERR_ACCESS_DENIED; case ETXTBSY: // Text file busy. @@ -5997,10 +5952,10 @@ index 2e4fd24..21d4211 100644 case EMFILE: // Too many open files. return ERR_INSUFFICIENT_RESOURCES; case ENOPROTOOPT: // Protocol option not supported. -diff --git a/src/3rdparty/chromium/net/base/network_interfaces_getifaddrs.cc b/src/3rdparty/chromium/net/base/network_interfaces_getifaddrs.cc +diff --git a/chromium/net/base/network_interfaces_getifaddrs.cc b/chromium/net/base/network_interfaces_getifaddrs.cc index a848dec..10a3925 100644 ---- a/src/3rdparty/chromium/net/base/network_interfaces_getifaddrs.cc -+++ b/src/3rdparty/chromium/net/base/network_interfaces_getifaddrs.cc +--- a/chromium/net/base/network_interfaces_getifaddrs.cc ++++ b/chromium/net/base/network_interfaces_getifaddrs.cc @@ -30,6 +30,10 @@ #include #endif // !OS_IOS @@ -6012,10 +5967,10 @@ index a848dec..10a3925 100644 #if defined(OS_ANDROID) #include "base/android/build_info.h" // Declare getifaddrs() and freeifaddrs() weakly as they're only available -diff --git a/src/3rdparty/chromium/net/cert/cert_verifier.cc b/src/3rdparty/chromium/net/cert/cert_verifier.cc +diff --git a/chromium/net/cert/cert_verifier.cc b/chromium/net/cert/cert_verifier.cc index 6504721..e151f7e 100644 ---- a/src/3rdparty/chromium/net/cert/cert_verifier.cc -+++ b/src/3rdparty/chromium/net/cert/cert_verifier.cc +--- a/chromium/net/cert/cert_verifier.cc ++++ b/chromium/net/cert/cert_verifier.cc @@ -87,7 +87,7 @@ std::unique_ptr CertVerifier::CreateDefaultWithoutCaching( return std::unique_ptr(); #else @@ -6025,10 +5980,10 @@ index 6504721..e151f7e 100644 verify_proc = CertVerifyProc::CreateBuiltinVerifyProc(std::move(cert_net_fetcher)); #elif BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED) -diff --git a/src/3rdparty/chromium/net/cert/cert_verify_proc.cc b/src/3rdparty/chromium/net/cert/cert_verify_proc.cc +diff --git a/chromium/net/cert/cert_verify_proc.cc b/chromium/net/cert/cert_verify_proc.cc index 10cd48b..7350662 100644 ---- a/src/3rdparty/chromium/net/cert/cert_verify_proc.cc -+++ b/src/3rdparty/chromium/net/cert/cert_verify_proc.cc +--- a/chromium/net/cert/cert_verify_proc.cc ++++ b/chromium/net/cert/cert_verify_proc.cc @@ -493,7 +493,7 @@ base::Value CertVerifyParams(X509Certificate* cert, } // namespace @@ -6038,10 +5993,10 @@ index 10cd48b..7350662 100644 // static scoped_refptr CertVerifyProc::CreateSystemVerifyProc( scoped_refptr cert_net_fetcher) { -diff --git a/src/3rdparty/chromium/net/cert/test_root_certs.h b/src/3rdparty/chromium/net/cert/test_root_certs.h +diff --git a/chromium/net/cert/test_root_certs.h b/chromium/net/cert/test_root_certs.h index 836f29f..c475e76 100644 ---- a/src/3rdparty/chromium/net/cert/test_root_certs.h -+++ b/src/3rdparty/chromium/net/cert/test_root_certs.h +--- a/chromium/net/cert/test_root_certs.h ++++ b/chromium/net/cert/test_root_certs.h @@ -75,7 +75,7 @@ class NET_EXPORT TestRootCerts { // engine is appropriate. The caller is responsible for freeing the // returned HCERTCHAINENGINE. @@ -6066,10 +6021,10 @@ index 836f29f..c475e76 100644 // True if there are no temporarily trusted root certificates. bool empty_ = true; #endif -diff --git a/src/3rdparty/chromium/net/proxy_resolution/proxy_config_service_linux.cc b/src/3rdparty/chromium/net/proxy_resolution/proxy_config_service_linux.cc +diff --git a/chromium/net/proxy_resolution/proxy_config_service_linux.cc b/chromium/net/proxy_resolution/proxy_config_service_linux.cc index c11685f..6990a4c 100644 ---- a/src/3rdparty/chromium/net/proxy_resolution/proxy_config_service_linux.cc -+++ b/src/3rdparty/chromium/net/proxy_resolution/proxy_config_service_linux.cc +--- a/chromium/net/proxy_resolution/proxy_config_service_linux.cc ++++ b/chromium/net/proxy_resolution/proxy_config_service_linux.cc @@ -6,7 +6,9 @@ #include @@ -6106,10 +6061,10 @@ index c11685f..6990a4c 100644 break; case base::nix::DESKTOP_ENVIRONMENT_XFCE: case base::nix::DESKTOP_ENVIRONMENT_OTHER: -diff --git a/src/3rdparty/chromium/net/socket/udp_socket_posix.cc b/src/3rdparty/chromium/net/socket/udp_socket_posix.cc +diff --git a/chromium/net/socket/udp_socket_posix.cc b/chromium/net/socket/udp_socket_posix.cc index 7126556..046a6ad 100644 ---- a/src/3rdparty/chromium/net/socket/udp_socket_posix.cc -+++ b/src/3rdparty/chromium/net/socket/udp_socket_posix.cc +--- a/chromium/net/socket/udp_socket_posix.cc ++++ b/chromium/net/socket/udp_socket_posix.cc @@ -51,6 +51,12 @@ #include "base/strings/utf_string_conversions.h" #endif // defined(OS_ANDROID) @@ -6233,10 +6188,10 @@ index 7126556..046a6ad 100644 memcpy(&mreq.imr_multiaddr, group_address.bytes().data(), IPAddress::kIPv4AddressSize); int rv = setsockopt(socket_, IPPROTO_IP, IP_DROP_MEMBERSHIP, -diff --git a/src/3rdparty/chromium/net/socket/unix_domain_server_socket_posix.cc b/src/3rdparty/chromium/net/socket/unix_domain_server_socket_posix.cc +diff --git a/chromium/net/socket/unix_domain_server_socket_posix.cc b/chromium/net/socket/unix_domain_server_socket_posix.cc index 8b2e29b..353f2d1 100644 ---- a/src/3rdparty/chromium/net/socket/unix_domain_server_socket_posix.cc -+++ b/src/3rdparty/chromium/net/socket/unix_domain_server_socket_posix.cc +--- a/chromium/net/socket/unix_domain_server_socket_posix.cc ++++ b/chromium/net/socket/unix_domain_server_socket_posix.cc @@ -34,7 +34,7 @@ UnixDomainServerSocket::~UnixDomainServerSocket() = default; bool UnixDomainServerSocket::GetPeerCredentials(SocketDescriptor socket, Credentials* credentials) { @@ -6246,10 +6201,10 @@ index 8b2e29b..353f2d1 100644 struct ucred user_cred; socklen_t len = sizeof(user_cred); if (getsockopt(socket, SOL_SOCKET, SO_PEERCRED, &user_cred, &len) < 0) -diff --git a/src/3rdparty/chromium/net/socket/unix_domain_server_socket_posix.h b/src/3rdparty/chromium/net/socket/unix_domain_server_socket_posix.h +diff --git a/chromium/net/socket/unix_domain_server_socket_posix.h b/chromium/net/socket/unix_domain_server_socket_posix.h index 9da6bc0..340b861 100644 ---- a/src/3rdparty/chromium/net/socket/unix_domain_server_socket_posix.h -+++ b/src/3rdparty/chromium/net/socket/unix_domain_server_socket_posix.h +--- a/chromium/net/socket/unix_domain_server_socket_posix.h ++++ b/chromium/net/socket/unix_domain_server_socket_posix.h @@ -30,7 +30,7 @@ class NET_EXPORT UnixDomainServerSocket : public ServerSocket { // Credentials of a peer process connected to the socket. struct NET_EXPORT Credentials { @@ -6259,10 +6214,10 @@ index 9da6bc0..340b861 100644 // Linux and Fuchsia provide more information about the connected peer // than Windows/OS X. It's useful for permission-based authorization on // Android. -diff --git a/src/3rdparty/chromium/net/tools/cert_verify_tool/cert_verify_tool.cc b/src/3rdparty/chromium/net/tools/cert_verify_tool/cert_verify_tool.cc +diff --git a/chromium/net/tools/cert_verify_tool/cert_verify_tool.cc b/chromium/net/tools/cert_verify_tool/cert_verify_tool.cc index 88f5ee4..c0d5f71 100644 ---- a/src/3rdparty/chromium/net/tools/cert_verify_tool/cert_verify_tool.cc -+++ b/src/3rdparty/chromium/net/tools/cert_verify_tool/cert_verify_tool.cc +--- a/chromium/net/tools/cert_verify_tool/cert_verify_tool.cc ++++ b/chromium/net/tools/cert_verify_tool/cert_verify_tool.cc @@ -29,7 +29,7 @@ #include "net/url_request/url_request_context_builder.h" #include "net/url_request/url_request_context_getter.h" @@ -6281,10 +6236,10 @@ index 88f5ee4..c0d5f71 100644 // On Linux, use a fixed ProxyConfigService, since the default one // depends on glib. // -diff --git a/src/3rdparty/chromium/sandbox/features.gni b/src/3rdparty/chromium/sandbox/features.gni +diff --git a/chromium/sandbox/features.gni b/chromium/sandbox/features.gni index db30ae6..68985ed 100644 ---- a/src/3rdparty/chromium/sandbox/features.gni -+++ b/src/3rdparty/chromium/sandbox/features.gni +--- a/chromium/sandbox/features.gni ++++ b/chromium/sandbox/features.gni @@ -8,7 +8,7 @@ import("//build/config/nacl/config.gni") # currently. # Do not disable seccomp_bpf anywhere without talking to @@ -6294,10 +6249,10 @@ index db30ae6..68985ed 100644 (current_cpu == "x86" || current_cpu == "x64" || current_cpu == "arm" || current_cpu == "arm64" || current_cpu == "mipsel" || current_cpu == "mips64el") -diff --git a/src/3rdparty/chromium/sandbox/linux/BUILD.gn b/src/3rdparty/chromium/sandbox/linux/BUILD.gn +diff --git a/chromium/sandbox/linux/BUILD.gn b/chromium/sandbox/linux/BUILD.gn index 1d080c0..2015d06 100644 ---- a/src/3rdparty/chromium/sandbox/linux/BUILD.gn -+++ b/src/3rdparty/chromium/sandbox/linux/BUILD.gn +--- a/chromium/sandbox/linux/BUILD.gn ++++ b/chromium/sandbox/linux/BUILD.gn @@ -19,12 +19,12 @@ import("//build/config/deprecated_default_sources_assignment_filter.gni") set_sources_assignment_filter(deprecated_default_sources_assignment_filter) @@ -6346,10 +6301,10 @@ index 1d080c0..2015d06 100644 } else if (!is_android) { sources += [ "services/libc_interceptor.cc", -diff --git a/src/3rdparty/chromium/sandbox/linux/services/libc_interceptor.cc b/src/3rdparty/chromium/sandbox/linux/services/libc_interceptor.cc +diff --git a/chromium/sandbox/linux/services/libc_interceptor.cc b/chromium/sandbox/linux/services/libc_interceptor.cc index 7c73b7e..91f79f5 100644 ---- a/src/3rdparty/chromium/sandbox/linux/services/libc_interceptor.cc -+++ b/src/3rdparty/chromium/sandbox/linux/services/libc_interceptor.cc +--- a/chromium/sandbox/linux/services/libc_interceptor.cc ++++ b/chromium/sandbox/linux/services/libc_interceptor.cc @@ -11,7 +11,9 @@ #include #include @@ -6369,10 +6324,10 @@ index 7c73b7e..91f79f5 100644 } return true; -diff --git a/src/3rdparty/chromium/sandbox/policy/BUILD.gn b/src/3rdparty/chromium/sandbox/policy/BUILD.gn +diff --git a/chromium/sandbox/policy/BUILD.gn b/chromium/sandbox/policy/BUILD.gn index ccb1bd1..db1fa75 100644 ---- a/src/3rdparty/chromium/sandbox/policy/BUILD.gn -+++ b/src/3rdparty/chromium/sandbox/policy/BUILD.gn +--- a/chromium/sandbox/policy/BUILD.gn ++++ b/chromium/sandbox/policy/BUILD.gn @@ -27,7 +27,7 @@ component("policy") { "//sandbox:common", ] @@ -6382,10 +6337,10 @@ index ccb1bd1..db1fa75 100644 sources += [ "linux/bpf_audio_policy_linux.cc", "linux/bpf_audio_policy_linux.h", -diff --git a/src/3rdparty/chromium/sandbox/policy/switches.cc b/src/3rdparty/chromium/sandbox/policy/switches.cc +diff --git a/chromium/sandbox/policy/switches.cc b/chromium/sandbox/policy/switches.cc index 3afb876..2c8efbe 100644 ---- a/src/3rdparty/chromium/sandbox/policy/switches.cc -+++ b/src/3rdparty/chromium/sandbox/policy/switches.cc +--- a/chromium/sandbox/policy/switches.cc ++++ b/chromium/sandbox/policy/switches.cc @@ -81,7 +81,7 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-failures-fatal"; // Meant to be used as a browser-level switch for testing purposes only. const char kNoSandbox[] = "no-sandbox"; @@ -6395,10 +6350,10 @@ index 3afb876..2c8efbe 100644 // Instructs the zygote to launch without a sandbox. Processes forked from this // type of zygote will apply their own custom sandboxes later. const char kNoZygoteSandbox[] = "no-zygote-sandbox"; -diff --git a/src/3rdparty/chromium/sandbox/policy/switches.h b/src/3rdparty/chromium/sandbox/policy/switches.h +diff --git a/chromium/sandbox/policy/switches.h b/chromium/sandbox/policy/switches.h index e096e96..6d25e2c 100644 ---- a/src/3rdparty/chromium/sandbox/policy/switches.h -+++ b/src/3rdparty/chromium/sandbox/policy/switches.h +--- a/chromium/sandbox/policy/switches.h ++++ b/chromium/sandbox/policy/switches.h @@ -53,7 +53,7 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuidSandbox[]; SANDBOX_POLICY_EXPORT extern const char kGpuSandboxAllowSysVShm[]; SANDBOX_POLICY_EXPORT extern const char kGpuSandboxFailuresFatal[]; @@ -6408,10 +6363,10 @@ index e096e96..6d25e2c 100644 SANDBOX_POLICY_EXPORT extern const char kNoZygoteSandbox[]; #endif #if defined(OS_WIN) -diff --git a/src/3rdparty/chromium/services/audio/BUILD.gn b/src/3rdparty/chromium/services/audio/BUILD.gn +diff --git a/chromium/services/audio/BUILD.gn b/chromium/services/audio/BUILD.gn index 84b197a..865fca1 100644 ---- a/src/3rdparty/chromium/services/audio/BUILD.gn -+++ b/src/3rdparty/chromium/services/audio/BUILD.gn +--- a/chromium/services/audio/BUILD.gn ++++ b/chromium/services/audio/BUILD.gn @@ -73,7 +73,7 @@ source_set("audio") { "//services/audio/public/mojom", ] @@ -6421,10 +6376,10 @@ index 84b197a..865fca1 100644 sources += [ "audio_sandbox_hook_linux.cc", "audio_sandbox_hook_linux.h", -diff --git a/src/3rdparty/chromium/services/device/geolocation/location_arbitrator.cc b/src/3rdparty/chromium/services/device/geolocation/location_arbitrator.cc +diff --git a/chromium/services/device/geolocation/location_arbitrator.cc b/chromium/services/device/geolocation/location_arbitrator.cc index 7da9b47..fd4d3ca 100644 ---- a/src/3rdparty/chromium/services/device/geolocation/location_arbitrator.cc -+++ b/src/3rdparty/chromium/services/device/geolocation/location_arbitrator.cc +--- a/chromium/services/device/geolocation/location_arbitrator.cc ++++ b/chromium/services/device/geolocation/location_arbitrator.cc @@ -159,7 +159,7 @@ LocationArbitrator::NewNetworkLocationProvider( std::unique_ptr @@ -6434,10 +6389,10 @@ index 7da9b47..fd4d3ca 100644 return nullptr; #else return device::NewSystemLocationProvider(); -diff --git a/src/3rdparty/chromium/services/device/usb/BUILD.gn b/src/3rdparty/chromium/services/device/usb/BUILD.gn +diff --git a/chromium/services/device/usb/BUILD.gn b/chromium/services/device/usb/BUILD.gn index f2d4524..50bb41c 100644 ---- a/src/3rdparty/chromium/services/device/usb/BUILD.gn -+++ b/src/3rdparty/chromium/services/device/usb/BUILD.gn +--- a/chromium/services/device/usb/BUILD.gn ++++ b/chromium/services/device/usb/BUILD.gn @@ -125,7 +125,7 @@ static_library("usb") { deps += [ "//third_party/re2" ] } @@ -6447,10 +6402,10 @@ index f2d4524..50bb41c 100644 sources += [ "usb_device_handle_usbfs.cc", "usb_device_handle_usbfs.h", -diff --git a/src/3rdparty/chromium/services/network/BUILD.gn b/src/3rdparty/chromium/services/network/BUILD.gn +diff --git a/chromium/services/network/BUILD.gn b/chromium/services/network/BUILD.gn index da00765..691c791 100644 ---- a/src/3rdparty/chromium/services/network/BUILD.gn -+++ b/src/3rdparty/chromium/services/network/BUILD.gn +--- a/chromium/services/network/BUILD.gn ++++ b/chromium/services/network/BUILD.gn @@ -268,6 +268,11 @@ jumbo_component("network_service") { "//sandbox/policy", ] @@ -6463,10 +6418,10 @@ index da00765..691c791 100644 if (is_android) { deps += [ -diff --git a/src/3rdparty/chromium/services/network/network_context.cc b/src/3rdparty/chromium/services/network/network_context.cc +diff --git a/chromium/services/network/network_context.cc b/chromium/services/network/network_context.cc index 035ee94..7b57b5d 100644 ---- a/src/3rdparty/chromium/services/network/network_context.cc -+++ b/src/3rdparty/chromium/services/network/network_context.cc +--- a/chromium/services/network/network_context.cc ++++ b/chromium/services/network/network_context.cc @@ -1932,7 +1932,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( net::CookieCryptoDelegate* crypto_delegate = nullptr; @@ -6476,10 +6431,10 @@ index 035ee94..7b57b5d 100644 DCHECK(network_service_->os_crypt_config_set()) << "NetworkService::SetCryptConfig must be called before creating a " "NetworkContext with encrypted cookies."; -diff --git a/src/3rdparty/chromium/services/network/network_sandbox_hook_linux.cc b/src/3rdparty/chromium/services/network/network_sandbox_hook_linux.cc +diff --git a/chromium/services/network/network_sandbox_hook_linux.cc b/chromium/services/network/network_sandbox_hook_linux.cc index feb61a7..0a1950f 100644 ---- a/src/3rdparty/chromium/services/network/network_sandbox_hook_linux.cc -+++ b/src/3rdparty/chromium/services/network/network_sandbox_hook_linux.cc +--- a/chromium/services/network/network_sandbox_hook_linux.cc ++++ b/chromium/services/network/network_sandbox_hook_linux.cc @@ -14,6 +14,7 @@ using sandbox::syscall_broker::MakeBrokerCommandSet; namespace network { @@ -6496,10 +6451,10 @@ index feb61a7..0a1950f 100644 return true; } -diff --git a/src/3rdparty/chromium/services/network/network_service.cc b/src/3rdparty/chromium/services/network/network_service.cc +diff --git a/chromium/services/network/network_service.cc b/chromium/services/network/network_service.cc index ed5edbf..0eb3727 100644 ---- a/src/3rdparty/chromium/services/network/network_service.cc -+++ b/src/3rdparty/chromium/services/network/network_service.cc +--- a/chromium/services/network/network_service.cc ++++ b/chromium/services/network/network_service.cc @@ -70,7 +70,7 @@ #include "third_party/boringssl/src/include/openssl/cpu.h" #endif @@ -6518,10 +6473,10 @@ index ed5edbf..0eb3727 100644 void NetworkService::SetCryptConfig(mojom::CryptConfigPtr crypt_config) { #if !BUILDFLAG(IS_CHROMECAST) && !defined(TOOLKIT_QT) DCHECK(!os_crypt_config_set_); -diff --git a/src/3rdparty/chromium/services/network/network_service.h b/src/3rdparty/chromium/services/network/network_service.h +diff --git a/chromium/services/network/network_service.h b/chromium/services/network/network_service.h index 21b8da7..3f92e23 100644 ---- a/src/3rdparty/chromium/services/network/network_service.h -+++ b/src/3rdparty/chromium/services/network/network_service.h +--- a/chromium/services/network/network_service.h ++++ b/chromium/services/network/network_service.h @@ -196,7 +196,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService base::span config, mojom::NetworkService::UpdateLegacyTLSConfigCallback callback) override; @@ -6531,10 +6486,10 @@ index 21b8da7..3f92e23 100644 void SetCryptConfig(mojom::CryptConfigPtr crypt_config) override; #endif #if defined(OS_WIN) || defined(OS_MAC) -diff --git a/src/3rdparty/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h b/src/3rdparty/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h +diff --git a/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h b/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h index 1fdd28f..2f2b0fa 100644 ---- a/src/3rdparty/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h -+++ b/src/3rdparty/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h +--- a/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h ++++ b/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h @@ -45,9 +45,9 @@ class COMPONENT_EXPORT( mojom::RawOSMemDump*); static std::vector GetProcessMemoryMaps(base::ProcessId); @@ -6565,10 +6520,10 @@ index 1fdd28f..2f2b0fa 100644 }; } // namespace memory_instrumentation -diff --git a/src/3rdparty/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc b/src/3rdparty/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc +diff --git a/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc b/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc index 9c329cb..e598c3d 100644 ---- a/src/3rdparty/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc -+++ b/src/3rdparty/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc +--- a/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc ++++ b/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc @@ -5,7 +5,6 @@ #include #include @@ -6693,10 +6648,10 @@ index 9c329cb..e598c3d 100644 } // static -diff --git a/src/3rdparty/chromium/services/service_manager/public/cpp/service_executable/BUILD.gn b/src/3rdparty/chromium/services/service_manager/public/cpp/service_executable/BUILD.gn +diff --git a/chromium/services/service_manager/public/cpp/service_executable/BUILD.gn b/chromium/services/service_manager/public/cpp/service_executable/BUILD.gn index 4c1c496..85897a8 100644 ---- a/src/3rdparty/chromium/services/service_manager/public/cpp/service_executable/BUILD.gn -+++ b/src/3rdparty/chromium/services/service_manager/public/cpp/service_executable/BUILD.gn +--- a/chromium/services/service_manager/public/cpp/service_executable/BUILD.gn ++++ b/chromium/services/service_manager/public/cpp/service_executable/BUILD.gn @@ -29,6 +29,12 @@ source_set("support") { "//sandbox/linux:seccomp_bpf", ] @@ -6710,10 +6665,10 @@ index 4c1c496..85897a8 100644 } source_set("switches") { -diff --git a/src/3rdparty/chromium/skia/ext/platform_canvas.h b/src/3rdparty/chromium/skia/ext/platform_canvas.h +diff --git a/chromium/skia/ext/platform_canvas.h b/chromium/skia/ext/platform_canvas.h index dd6d354..1269913 100644 ---- a/src/3rdparty/chromium/skia/ext/platform_canvas.h -+++ b/src/3rdparty/chromium/skia/ext/platform_canvas.h +--- a/chromium/skia/ext/platform_canvas.h ++++ b/chromium/skia/ext/platform_canvas.h @@ -58,7 +58,7 @@ SK_API HDC GetNativeDrawingContext(SkCanvas* canvas); #elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || \ @@ -6723,10 +6678,10 @@ index dd6d354..1269913 100644 // Construct a canvas from the given memory region. The memory is not cleared // first. @data must be, at least, @height * StrideForWidth(@width) bytes. SK_API std::unique_ptr CreatePlatformCanvasWithPixels( -diff --git a/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/config.h b/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/config.h +diff --git a/chromium/third_party/abseil-cpp/absl/base/config.h b/chromium/third_party/abseil-cpp/absl/base/config.h index 84fa893..62c0989 100644 ---- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/config.h -+++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/config.h +--- a/chromium/third_party/abseil-cpp/absl/base/config.h ++++ b/chromium/third_party/abseil-cpp/absl/base/config.h @@ -377,7 +377,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' || #elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || \ defined(__ros__) || defined(__native_client__) || defined(__asmjs__) || \ @@ -6736,10 +6691,10 @@ index 84fa893..62c0989 100644 #define ABSL_HAVE_MMAP 1 #endif -diff --git a/src/3rdparty/chromium/third_party/angle/BUILD.gn b/src/3rdparty/chromium/third_party/angle/BUILD.gn +diff --git a/chromium/third_party/angle/BUILD.gn b/chromium/third_party/angle/BUILD.gn index fb57176..6079c31 100644 ---- a/src/3rdparty/chromium/third_party/angle/BUILD.gn -+++ b/src/3rdparty/chromium/third_party/angle/BUILD.gn +--- a/chromium/third_party/angle/BUILD.gn ++++ b/chromium/third_party/angle/BUILD.gn @@ -272,8 +272,8 @@ config("angle_no_cfi_unrelated_cast") { angle_source_set("angle_system_utils") { @@ -6751,10 +6706,10 @@ index fb57176..6079c31 100644 } } -diff --git a/src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/driver_utils.cpp b/src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/driver_utils.cpp +diff --git a/chromium/third_party/angle/src/libANGLE/renderer/driver_utils.cpp b/chromium/third_party/angle/src/libANGLE/renderer/driver_utils.cpp index 5db5784..035e011 100644 ---- a/src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/driver_utils.cpp -+++ b/src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/driver_utils.cpp +--- a/chromium/third_party/angle/src/libANGLE/renderer/driver_utils.cpp ++++ b/chromium/third_party/angle/src/libANGLE/renderer/driver_utils.cpp @@ -17,7 +17,7 @@ # include #endif @@ -6796,10 +6751,10 @@ index 5db5784..035e011 100644 return true; } #endif -diff --git a/src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/driver_utils.h b/src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/driver_utils.h +diff --git a/chromium/third_party/angle/src/libANGLE/renderer/driver_utils.h b/chromium/third_party/angle/src/libANGLE/renderer/driver_utils.h index 054a8a9..8b0ce4d 100644 ---- a/src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/driver_utils.h -+++ b/src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/driver_utils.h +--- a/chromium/third_party/angle/src/libANGLE/renderer/driver_utils.h ++++ b/chromium/third_party/angle/src/libANGLE/renderer/driver_utils.h @@ -145,7 +145,7 @@ inline bool IsWindows() inline bool IsLinux() @@ -6809,10 +6764,10 @@ index 054a8a9..8b0ce4d 100644 return true; #else return false; -diff --git a/src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h b/src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h +diff --git a/chromium/third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h b/chromium/third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h index 21e36a7..7565f55 100644 ---- a/src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h -+++ b/src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h +--- a/chromium/third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h ++++ b/chromium/third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h @@ -19,10 +19,10 @@ bool IsVulkanWin32DisplayAvailable(); DisplayImpl *CreateVulkanWin32Display(const egl::DisplayState &state); #endif // defined(ANGLE_PLATFORM_WINDOWS) @@ -6826,10 +6781,10 @@ index 21e36a7..7565f55 100644 #if defined(ANGLE_PLATFORM_ANDROID) bool IsVulkanAndroidDisplayAvailable(); -diff --git a/src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/loader/loader.c b/src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/loader/loader.c +diff --git a/chromium/third_party/angle/third_party/vulkan-loader/src/loader/loader.c b/chromium/third_party/angle/third_party/vulkan-loader/src/loader/loader.c index 4d8865e..589c674 100644 ---- a/src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/loader/loader.c -+++ b/src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/loader/loader.c +--- a/chromium/third_party/angle/third_party/vulkan-loader/src/loader/loader.c ++++ b/chromium/third_party/angle/third_party/vulkan-loader/src/loader/loader.c @@ -250,7 +250,7 @@ void *loader_device_heap_realloc(const struct loader_device *device, void *pMemo } @@ -6839,10 +6794,10 @@ index 4d8865e..589c674 100644 static inline bool IsHighIntegrity() { return geteuid() != getuid() || getegid() != getgid(); -diff --git a/src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/loader/vk_loader_platform.h b/src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/loader/vk_loader_platform.h +diff --git a/chromium/third_party/angle/third_party/vulkan-loader/src/loader/vk_loader_platform.h b/chromium/third_party/angle/third_party/vulkan-loader/src/loader/vk_loader_platform.h index e227bf0..a7a03d8 100644 ---- a/src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/loader/vk_loader_platform.h -+++ b/src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/loader/vk_loader_platform.h +--- a/chromium/third_party/angle/third_party/vulkan-loader/src/loader/vk_loader_platform.h ++++ b/chromium/third_party/angle/third_party/vulkan-loader/src/loader/vk_loader_platform.h @@ -31,7 +31,7 @@ #include "vulkan/vk_platform.h" #include "vulkan/vk_sdk_platform.h" @@ -6852,10 +6807,10 @@ index e227bf0..a7a03d8 100644 /* Linux-specific common code: */ // Headers: -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/BUILD.gn b/src/3rdparty/chromium/third_party/blink/renderer/BUILD.gn +diff --git a/chromium/third_party/blink/renderer/BUILD.gn b/chromium/third_party/blink/renderer/BUILD.gn index d36c9cd..00a1ed7 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/BUILD.gn -+++ b/src/3rdparty/chromium/third_party/blink/renderer/BUILD.gn +--- a/chromium/third_party/blink/renderer/BUILD.gn ++++ b/chromium/third_party/blink/renderer/BUILD.gn @@ -55,8 +55,8 @@ config("inside_blink") { "-Wconversion", "-Wno-float-conversion", @@ -6867,10 +6822,10 @@ index d36c9cd..00a1ed7 100644 ] if (!is_chromeos || default_toolchain != "//build/toolchain/cros:target") { -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/bindings/core/v8/v8_script_runner.cc b/src/3rdparty/chromium/third_party/blink/renderer/bindings/core/v8/v8_script_runner.cc +diff --git a/chromium/third_party/blink/renderer/bindings/core/v8/v8_script_runner.cc b/chromium/third_party/blink/renderer/bindings/core/v8/v8_script_runner.cc index ec7bcf3..f5f761a 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/bindings/core/v8/v8_script_runner.cc -+++ b/src/3rdparty/chromium/third_party/blink/renderer/bindings/core/v8/v8_script_runner.cc +--- a/chromium/third_party/blink/renderer/bindings/core/v8/v8_script_runner.cc ++++ b/chromium/third_party/blink/renderer/bindings/core/v8/v8_script_runner.cc @@ -438,9 +438,11 @@ ScriptEvaluationResult V8ScriptRunner::CompileAndRunScript( .ToLocal(&script)) { maybe_result = @@ -6883,10 +6838,10 @@ index ec7bcf3..f5f761a 100644 } // TODO(crbug/1114601): Investigate whether to check CanContinue() in other -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py -index dc3493c..f37b40a 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py -+++ b/src/3rdparty/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py +index 017d3d4..899a85e 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py @@ -29,6 +29,9 @@ def init(root_src_dir): elif sys.platform.startswith(("cygwin", "win")): platform = "win" @@ -6897,10 +6852,10 @@ index dc3493c..f37b40a 100644 else: assert False, "Unknown platform: {}".format(sys.platform) buildtools_platform_dir = os.path.join(root_src_dir, "buildtools", -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/controller/blink_initializer.cc b/src/3rdparty/chromium/third_party/blink/renderer/controller/blink_initializer.cc +diff --git a/chromium/third_party/blink/renderer/controller/blink_initializer.cc b/chromium/third_party/blink/renderer/controller/blink_initializer.cc index 0231bcf..dee9523 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/controller/blink_initializer.cc -+++ b/src/3rdparty/chromium/third_party/blink/renderer/controller/blink_initializer.cc +--- a/chromium/third_party/blink/renderer/controller/blink_initializer.cc ++++ b/chromium/third_party/blink/renderer/controller/blink_initializer.cc @@ -68,11 +68,12 @@ #include "third_party/blink/renderer/controller/oom_intervention_impl.h" #endif @@ -6934,10 +6889,10 @@ index 0231bcf..dee9523 100644 binders.Add(ConvertToBaseRepeatingCallback( CrossThreadBindRepeating(&MemoryUsageMonitorPosix::Bind)), main_thread->GetTaskRunner()); -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/controller/memory_usage_monitor_posix.cc b/src/3rdparty/chromium/third_party/blink/renderer/controller/memory_usage_monitor_posix.cc +diff --git a/chromium/third_party/blink/renderer/controller/memory_usage_monitor_posix.cc b/chromium/third_party/blink/renderer/controller/memory_usage_monitor_posix.cc index 27b6056..f437dea 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/controller/memory_usage_monitor_posix.cc -+++ b/src/3rdparty/chromium/third_party/blink/renderer/controller/memory_usage_monitor_posix.cc +--- a/chromium/third_party/blink/renderer/controller/memory_usage_monitor_posix.cc ++++ b/chromium/third_party/blink/renderer/controller/memory_usage_monitor_posix.cc @@ -134,7 +134,7 @@ void MemoryUsageMonitorPosix::SetProcFiles(base::File statm_file, status_fd_.reset(status_file.TakePlatformFile()); } @@ -6947,10 +6902,10 @@ index 27b6056..f437dea 100644 // static void MemoryUsageMonitorPosix::Bind( mojo::PendingReceiver receiver) { -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/controller/memory_usage_monitor_posix.h b/src/3rdparty/chromium/third_party/blink/renderer/controller/memory_usage_monitor_posix.h +diff --git a/chromium/third_party/blink/renderer/controller/memory_usage_monitor_posix.h b/chromium/third_party/blink/renderer/controller/memory_usage_monitor_posix.h index 5e338d6..4165132 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/controller/memory_usage_monitor_posix.h -+++ b/src/3rdparty/chromium/third_party/blink/renderer/controller/memory_usage_monitor_posix.h +--- a/chromium/third_party/blink/renderer/controller/memory_usage_monitor_posix.h ++++ b/chromium/third_party/blink/renderer/controller/memory_usage_monitor_posix.h @@ -12,7 +12,7 @@ #include "third_party/blink/renderer/controller/controller_export.h" #include "third_party/blink/renderer/controller/memory_usage_monitor.h" @@ -6996,10 +6951,10 @@ index 5e338d6..4165132 100644 mojo::Receiver receiver_{this}; #endif }; -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/core/editing/editing_behavior.cc b/src/3rdparty/chromium/third_party/blink/renderer/core/editing/editing_behavior.cc +diff --git a/chromium/third_party/blink/renderer/core/editing/editing_behavior.cc b/chromium/third_party/blink/renderer/core/editing/editing_behavior.cc index f1406f4..bf47396 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/core/editing/editing_behavior.cc -+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/editing/editing_behavior.cc +--- a/chromium/third_party/blink/renderer/core/editing/editing_behavior.cc ++++ b/chromium/third_party/blink/renderer/core/editing/editing_behavior.cc @@ -274,7 +274,7 @@ bool EditingBehavior::ShouldInsertCharacter(const KeyboardEvent& event) const { // unexpected behaviour if (ch < ' ') @@ -7009,10 +6964,10 @@ index f1406f4..bf47396 100644 // According to XKB map no keyboard combinations with ctrl key are mapped to // printable characters, however we need the filter as the DomKey/text could // contain printable characters. -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc b/src/3rdparty/chromium/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc +diff --git a/chromium/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc b/chromium/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc index 9b16d60..b98ca1a 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc -+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc +--- a/chromium/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc ++++ b/chromium/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc @@ -44,7 +44,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadline = /* The value is based on user statistics on Nov 2017. */ @@ -7022,10 +6977,10 @@ index 9b16d60..b98ca1a 100644 const double kIdleTaskStartTimeoutDelayMs = 1000.0; #else const double kIdleTaskStartTimeoutDelayMs = 4000.0; // For ChromeOS, Mobile -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/core/html/forms/internal_popup_menu.cc b/src/3rdparty/chromium/third_party/blink/renderer/core/html/forms/internal_popup_menu.cc +diff --git a/chromium/third_party/blink/renderer/core/html/forms/internal_popup_menu.cc b/chromium/third_party/blink/renderer/core/html/forms/internal_popup_menu.cc index 49400d6..3ea2e10 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/core/html/forms/internal_popup_menu.cc -+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/html/forms/internal_popup_menu.cc +--- a/chromium/third_party/blink/renderer/core/html/forms/internal_popup_menu.cc ++++ b/chromium/third_party/blink/renderer/core/html/forms/internal_popup_menu.cc @@ -155,7 +155,7 @@ class InternalPopupMenu::ItemIterationContext { is_in_group_(false), buffer_(buffer) { @@ -7035,10 +6990,10 @@ index 49400d6..3ea2e10 100644 // On other platforms, the