[neon/qt/qtwebengine/Neon/release_jammy] debian: Drop five patches that were included in the new release.
Dmitry Shachnev
null at kde.org
Wed Aug 21 09:44:48 BST 2024
Git commit f63306c559e4efc9c541ec816470efba2db39f73 by Dmitry Shachnev.
Committed on 30/06/2024 at 13:00.
Pushed by jriddell into branch 'Neon/release_jammy'.
Drop five patches that were included in the new release.
M +6 -0 debian/changelog
D +0 -1688 debian/patches/chromium-python3.patch
D +0 -64 debian/patches/ffmpeg-x86-optimization.patch
D +0 -18 debian/patches/icu74.patch
D +0 -47 debian/patches/python3.11.patch
D +0 -159 debian/patches/python3.patch
M +0 -5 debian/patches/series
https://invent.kde.org/neon/qt/qtwebengine/-/commit/f63306c559e4efc9c541ec816470efba2db39f73
diff --git a/debian/changelog b/debian/changelog
index 3ed3764..dbc6661 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,12 @@ qtwebengine-opensource-src (5.15.17+dfsg-1) UNRELEASED; urgency=medium
[ Dmitry Shachnev ]
* New upstream release.
* Update SUBMODULE_COMMIT for the new release.
+ * Drop patches, included in the new release:
+ - python3.patch
+ - chromium-python3.patch
+ - python3.11.patch
+ - ffmpeg-x86-optimization.patch
+ - icu74.patch
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 30 Jun 2024 15:40:06 +0300
diff --git a/debian/patches/chromium-python3.patch b/debian/patches/chromium-python3.patch
deleted file mode 100644
index 555107e..0000000
--- a/debian/patches/chromium-python3.patch
+++ /dev/null
@@ -1,1688 +0,0 @@
-Description: update Chromium code for compatibility with Python 3
-Forwarded: not-needed
-Origin: https://github.com/archlinux/svntogit-packages/blob/packages/qt5-webengine/trunk/qt5-webengine-chromium-python3.patch
-Last-Update: 2022-11-25
-
---- 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/python3
- # 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.
-@@ -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 python3.
- #
- # E.g. $HOME/.vpython-root/dd50d3/bin/python
- # E.g. /b/s/w/ir/cache/vpython/ab5c79/bin/python
---- 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
---- 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'))
-
-
---- 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 += [
---- 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())
---- 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.dir
- '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'
-
---- 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):
---- 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):
---- 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_module
- 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)
---- 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, de
- """
- 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_nam
- 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(blin
- """
- 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}}} = "
---- 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
- 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,
---- 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 = {}
---- 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)]))
---- 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.Formatte
- 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:
---- 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, f
- # 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'))
---- 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
---- 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(_PropEn
- 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(_PropEntr
- 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_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}->Glob
- "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}->Glob
- "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_cont
- 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_refere
- collect_callbacks(named_properties_object_callback_defs)
- collect_callbacks(cross_origin_property_callback_defs)
-
-- entry_nodes = map(
-- lambda name: TextNode("reinterpret_cast<intptr_t>({}),".format(name)),
-- filter(None, callback_names))
-+ entry_nodes = list(
-+ map(
-+ lambda name: TextNode("reinterpret_cast<intptr_t>({}),".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_pr
- 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_identif
- 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_identif
- 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_identif
- 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,
---- 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)
---- 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
-@@ -70,8 +70,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()
-
---- 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)
---- 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)
-
-
-+ at 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
-
-
---- 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
---- 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
---- 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_f
- 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(
---- 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
---- 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(Compo
-
- @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(Compo
-
-
- 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, d
- 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
---- 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, interfa
- 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_o
-
- # 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
---- 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:
---- 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):
---- 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,
- 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
---- 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())
---- 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 Ru
- 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))
-
---- 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(
---- 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':
---- 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, WithExt
- 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, WithExt
- 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, WithExt
- 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, WithExt
- 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
- ])
-
---- 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))
---- 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.
---- 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, WithExt
- 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
---- 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* i
- 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<v8::Value> {{member.v8_value}};
-@@ -147,9 +147,9 @@ bool toV8{{cpp_class}}(const {{cpp_class
- 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<v8::Value> {{member.v8_value}};
---- 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
-
- 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_)
---- 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_g
- 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)
---- 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__':
---- 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,
---- 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
---- 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(BaseRuntimeFe
- 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):
---- 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 = HashMap
-
- static {{namespace}}FunctionMap* g_{{namespace|lower}}_constructors = nullptr;
-
--{% for tag in tags|sort if not tag.noConstructor %}
-+{% for tag in tags|sort(attribute='name') if not tag.noConstructor %}
- static {{namespace}}Element* {{namespace}}{{tag.name.to_upper_camel_case()}}Constructor(
- Document& document, const CreateElementFlags flags) {
- {% if tag.runtimeEnabled %}
-@@ -52,7 +52,7 @@ static void Create{{namespace}}FunctionM
- // Empty array initializer lists are illegal [dcl.init.aggr] and will not
- // compile in MSVC. If tags list is empty, add check to skip this.
- static const Create{{namespace}}FunctionMapData data[] = {
-- {% for tag in tags|sort if not tag.noConstructor %}
-+ {% for tag in tags|sort(attribute='name') if not tag.noConstructor %}
- { {{cpp_namespace}}::{{tag|symbol}}Tag, {{namespace}}{{tag.name.to_upper_camel_case()}}Constructor },
- {% endfor %}
- };
---- a/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.cc.tmpl
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.cc.tmpl
-@@ -22,7 +22,7 @@ HTMLTypeMap CreateHTMLTypeMap() {
- const char* name;
- HTMLElementType type;
- } kTags[] = {
-- {% for tag in tags|sort %}
-+ {% for tag in tags|sort(attribute='name') %}
- { "{{tag.name}}", HTMLElementType::k{{tag.js_interface}} },
- {% endfor %}
- };
-@@ -42,7 +42,7 @@ HTMLElementType htmlElementTypeForTag(co
- if (it == html_type_map.end())
- return HTMLElementType::kHTMLUnknownElement;
-
-- {% for tag in tags|sort %}
-+ {% for tag in tags|sort(attribute='name') %}
- {% if tag.runtimeEnabled %}
- if (tagName == "{{tag.name}}") {
- if (!RuntimeEnabledFeatures::{{tag.runtimeEnabled}}Enabled(document->GetExecutionContext())) {
---- 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 {{tag.interface}}>(const Node& node) {
---- 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 %}
---- 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 %}
-
---- 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_di
-
- 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):
---- 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")
---- 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, file
- ['--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)
---- 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())
-
---- 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'))
-
-
---- 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):
---- 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
---- 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
-
-
---- 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_cons
- } // 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, platfor
- 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()
---- 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_platfor
-
- """
-
-+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/debian/patches/ffmpeg-x86-optimization.patch b/debian/patches/ffmpeg-x86-optimization.patch
deleted file mode 100644
index cff8df9..0000000
--- a/debian/patches/ffmpeg-x86-optimization.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Description: avcodec/x86/mathops: clip constants used with shift instructions within inline assembly
- Fixes assembling with gas from binutils >= 2.41.
-Origin: upstream, https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/effadce6c756247e
-Bug: https://bugs.debian.org/1038132
-Last-Update: 2023-07-21
-
---- a/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
-+++ b/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
-@@ -35,12 +35,20 @@
- static av_always_inline av_const int MULL(int a, int b, unsigned shift)
- {
- int rt, dummy;
-+ if (__builtin_constant_p(shift))
- __asm__ (
- "imull %3 \n\t"
- "shrdl %4, %%edx, %%eax \n\t"
- :"=a"(rt), "=d"(dummy)
-- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
-+ :"a"(a), "rm"(b), "i"(shift & 0x1F)
- );
-+ else
-+ __asm__ (
-+ "imull %3 \n\t"
-+ "shrdl %4, %%edx, %%eax \n\t"
-+ :"=a"(rt), "=d"(dummy)
-+ :"a"(a), "rm"(b), "c"((uint8_t)shift)
-+ );
- return rt;
- }
-
-@@ -113,19 +121,31 @@ __asm__ volatile(\
- // avoid +32 for shift optimization (gcc should do that ...)
- #define NEG_SSR32 NEG_SSR32
- static inline int32_t NEG_SSR32( int32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("sarl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("sarl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
- #define NEG_USR32 NEG_USR32
- static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("shrl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("shrl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
diff --git a/debian/patches/icu74.patch b/debian/patches/icu74.patch
deleted file mode 100644
index efd4f21..0000000
--- a/debian/patches/icu74.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: fix static_assert failure with ICU 74
-Forwarded: not-needed
-Origin: Gentoo, https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch
-Last-Update: 2023-12-25
-
---- a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc
-@@ -162,7 +162,9 @@ static const unsigned char kAsciiLineBre
- };
- // clang-format on
-
--#if U_ICU_VERSION_MAJOR_NUM >= 58
-+#if U_ICU_VERSION_MAJOR_NUM >= 74
-+#define BA_LB_COUNT (U_LB_COUNT - 8)
-+#elif U_ICU_VERSION_MAJOR_NUM >= 58
- #define BA_LB_COUNT (U_LB_COUNT - 3)
- #else
- #define BA_LB_COUNT U_LB_COUNT
diff --git a/debian/patches/python3.11.patch b/debian/patches/python3.11.patch
deleted file mode 100644
index d35d601..0000000
--- a/debian/patches/python3.11.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Description: fix build with Python 3.11
-Author: Dmitry Shachnev <mitya57 at debian.org>
-Forwarded: not-needed
-Last-Update: 2023-01-08
-
---- a/src/3rdparty/chromium/tools/grit/grit/util.py
-+++ b/src/3rdparty/chromium/tools/grit/grit/util.py
-@@ -211,7 +211,7 @@ def ReadFile(filename, encoding):
- mode = 'rb'
- encoding = None
- else:
-- mode = 'rU'
-+ mode = 'r'
-
- with io.open(abs(filename), mode, encoding=encoding) as f:
- return f.read()
---- a/src/3rdparty/chromium/tools/metrics/structured/model.py
-+++ b/src/3rdparty/chromium/tools/metrics/structured/model.py
-@@ -26,7 +26,7 @@ _METRIC_TYPE = models.ObjectNodeType(
- 'metric',
- attributes=[
- ('name', unicode, r'^[A-Za-z0-9_.]+$'),
-- ('kind', unicode, r'^(?i)(|hashed-string|int)$'),
-+ ('kind', unicode, r'(?i)^(|hashed-string|int)$'),
- ],
- alphabetization=[
- (_OBSOLETE_TYPE.tag, lambda _: 1),
---- a/src/3rdparty/chromium/tools/metrics/ukm/ukm_model.py
-+++ b/src/3rdparty/chromium/tools/metrics/ukm/ukm_model.py
-@@ -42,7 +42,7 @@ _INDEX_TYPE = models.ObjectNodeType(
- _STATISTICS_TYPE = models.ObjectNodeType(
- 'statistics',
- attributes=[
-- ('export', str, r'^(?i)(|true|false)$'),
-+ ('export', str, r'(?i)^(|true|false)$'),
- ],
- children=[
- models.ChildType(_QUANTILES_TYPE.tag, _QUANTILES_TYPE, multiple=False),
-@@ -94,7 +94,7 @@ _EVENT_TYPE = models.ObjectNodeType(
- 'event',
- attributes=[
- ('name', str, r'^[A-Za-z0-9.]+$'),
-- ('singular', str, r'^(?i)(|true|false)$'),
-+ ('singular', str, r'(?i)^(|true|false)$'),
- ],
- alphabetization=[
- (_OBSOLETE_TYPE.tag, _KEEP_ORDER),
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
deleted file mode 100644
index 9088789..0000000
--- a/debian/patches/python3.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-Description: replace Python 2 with Python 3 in the build system
-Author: Dmitry Shachnev <mitya57 at debian.org>
-Last-Update: 2022-11-25
-Forwarded: not-needed
-
---- a/configure.pri
-+++ b/configure.pri
-@@ -6,23 +6,6 @@ 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)
--}
--
- defineTest(qtConfTest_detectJumboBuild) {
- mergeLimit = $$eval(config.input.merge_limit)
- mergeLimit = $$find(mergeLimit, "\\d")
-@@ -52,22 +35,18 @@ defineTest(qtConfReport_jumboBuild) {
- qtConfReportPadded($${1}, $$mergeLimit)
- }
-
--defineTest(qtConfTest_detectPython2) {
-- python = $$qtConfFindInPath("python2$$EXE_SUFFIX")
-+defineTest(qtConfTest_detectPython3) {
-+ python = $$qtConfFindInPath("python3$$EXE_SUFFIX")
- isEmpty(python) {
-- qtLog("'python2$$EXE_SUFFIX' not found in PATH. Checking for 'python$$EXE_SUFFIX'.")
-+ qtLog("'python3$$EXE_SUFFIX' not found in PATH. Checking for 'python$$EXE_SUFFIX'.")
- python = $$qtConfFindInPath("python$$EXE_SUFFIX")
- }
- isEmpty(python) {
- qtLog("'python$$EXE_SUFFIX' not found in PATH. Giving up.")
- return(false)
- }
-- !isPythonVersionSupported($$python) {
-- qtLog("A suitable Python 2 executable could not be located.")
-- return(false)
-- }
-
-- # Make tests.python2.location available in configure.json.
-+ # Make tests.python3.location available in configure.json.
- $${1}.location = $$clean_path($$python)
- export($${1}.location)
- $${1}.cache += location
---- a/mkspecs/features/functions.prf
-+++ b/mkspecs/features/functions.prf
-@@ -44,11 +44,11 @@ defineReplace(which) {
-
- # Returns the unquoted path to the python executable.
- defineReplace(pythonPath) {
-- isEmpty(QMAKE_PYTHON2) {
-+ isEmpty(QMAKE_PYTHON3) {
- # Fallback for building QtWebEngine with Qt < 5.8
-- QMAKE_PYTHON2 = python
-+ QMAKE_PYTHON3 = python
- }
-- return($$QMAKE_PYTHON2)
-+ return($$QMAKE_PYTHON3)
- }
-
- # Returns the python executable for use with shell / make targets.
---- a/src/buildtools/config/support.pri
-+++ b/src/buildtools/config/support.pri
-@@ -21,7 +21,7 @@ defineReplace(qtwebengine_checkWebEngine
- !qtwebengine_checkForGperf(QtWebEngine):return(false)
- !qtwebengine_checkForBison(QtWebEngine):return(false)
- !qtwebengine_checkForFlex(QtWebEngine):return(false)
-- !qtwebengine_checkForPython2(QtWebEngine):return(false)
-+ !qtwebengine_checkForPython3(QtWebEngine):return(false)
- !qtwebengine_checkForNodejs(QtWebEngine):return(false)
- !qtwebengine_checkForSanitizer(QtWebEngine):return(false)
- linux:!qtwebengine_checkForPkgCfg(QtWebEngine):return(false)
-@@ -51,7 +51,7 @@ defineReplace(qtwebengine_checkPdfError)
- !qtwebengine_checkForGperf(QtPdf):return(false)
- !qtwebengine_checkForBison(QtPdf):return(false)
- !qtwebengine_checkForFlex(QtPdf):return(false)
-- !qtwebengine_checkForPython2(QtPdf):return(false)
-+ !qtwebengine_checkForPython3(QtPdf):return(false)
- !qtwebengine_checkForSanitizer(QtPdf):return(false)
- linux:!qtwebengine_checkForPkgCfg(QtPdf):return(false)
- linux:!qtwebengine_checkForHostPkgCfg(QtPdf):return(false)
-@@ -143,10 +143,10 @@ defineTest(qtwebengine_checkForFlex) {
- return(true)
- }
-
--defineTest(qtwebengine_checkForPython2) {
-+defineTest(qtwebengine_checkForPython3) {
- module = $$1
-- !qtConfig(webengine-python2) {
-- qtwebengine_skipBuild("Python version 2 (2.7.5 or later) is required to build $${module}.")
-+ !qtConfig(webengine-python3) {
-+ qtwebengine_skipBuild("Python version 3 is required to build $${module}.")
- return(false)
- }
- return(true)
---- a/src/buildtools/configure.json
-+++ b/src/buildtools/configure.json
-@@ -322,9 +322,9 @@
- "label": "system ninja",
- "type": "detectNinja"
- },
-- "webengine-python2": {
-- "label": "python2",
-- "type": "detectPython2",
-+ "webengine-python3": {
-+ "label": "python3",
-+ "type": "detectPython3",
- "log": "location"
- },
- "webengine-winversion": {
-@@ -401,7 +401,7 @@
- && features.webengine-gperf
- && features.webengine-bison
- && features.webengine-flex
-- && features.webengine-python2
-+ && features.webengine-python3
- && features.webengine-nodejs
- && (!config.sanitizer || features.webengine-sanitizer)
- && (!config.linux || features.pkg-config)
-@@ -427,7 +427,7 @@
- && features.webengine-gperf
- && features.webengine-bison
- && features.webengine-flex
-- && features.webengine-python2
-+ && features.webengine-python3
- && (!config.sanitizer || features.webengine-sanitizer)
- && (!config.linux || features.pkg-config)
- && (!config.linux || features.webengine-host-pkg-config)
-@@ -450,12 +450,12 @@
- "autoDetect": "features.private_tests",
- "output": [ "privateFeature" ]
- },
-- "webengine-python2": {
-- "label": "python2",
-- "condition": "tests.webengine-python2",
-+ "webengine-python3": {
-+ "label": "python3",
-+ "condition": "tests.webengine-python3",
- "output": [
- "privateFeature",
-- { "type": "varAssign", "name": "QMAKE_PYTHON2", "value": "tests.webengine-python2.location" }
-+ { "type": "varAssign", "name": "QMAKE_PYTHON3", "value": "tests.webengine-python3.location" }
- ]
- },
- "webengine-gperf": {
diff --git a/debian/patches/series b/debian/patches/series
index d0c1a9e..cb14ee2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,9 +5,6 @@ system-nspr-prtime.patch
system-icu-utf.patch
# Fix python problems.
-python3.patch
-chromium-python3.patch
-python3.11.patch
python3.12-imp.patch
python3.12-six.patch
@@ -24,8 +21,6 @@ mips64el-kernel_stat64.patch
armhf-no-thumb.patch
disable-catapult.patch
pipewire-0.3.patch
-ffmpeg-x86-optimization.patch
fix-example-pro-files.patch
-icu74.patch
build-with-c++17.patch
ninja-1.12.patch
More information about the Neon-commits
mailing list