From 982db23286f072162db5e5b9c3eb42440bc5e6d3 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Wed, 8 Apr 2020 00:19:48 +0000 Subject: [PATCH] extra/chromium to 81.0.4044.92-1 --- extra/chromium/PKGBUILD | 40 +-- ...ch-service-Include-cmath-for-std-pow.patch | 35 --- .../fix-building-with-system-zlib.patch | 32 --- .../fix-building-with-unbundled-libxml.patch | 127 ---------- ...eader-generation-when-unbundling-ICU.patch | 50 ---- .../move-RemoteTreeNode-declaration.patch | 237 ------------------ ...ogging-in-local-unique-font-matching.patch | 33 --- .../sync-enable-USSPasswords-by-default.patch | 28 --- 8 files changed, 3 insertions(+), 579 deletions(-) delete mode 100644 extra/chromium/cros-search-service-Include-cmath-for-std-pow.patch delete mode 100644 extra/chromium/fix-building-with-system-zlib.patch delete mode 100644 extra/chromium/fix-building-with-unbundled-libxml.patch delete mode 100644 extra/chromium/fix-shim-header-generation-when-unbundling-ICU.patch delete mode 100644 extra/chromium/move-RemoteTreeNode-declaration.patch delete mode 100644 extra/chromium/remove-verbose-logging-in-local-unique-font-matching.patch delete mode 100644 extra/chromium/sync-enable-USSPasswords-by-default.patch diff --git a/extra/chromium/PKGBUILD b/extra/chromium/PKGBUILD index 9b5862ea7..ebc319d90 100644 --- a/extra/chromium/PKGBUILD +++ b/extra/chromium/PKGBUILD @@ -15,7 +15,7 @@ buildarch=12 highmem=1 pkgname=chromium -pkgver=80.0.3987.163 +pkgver=81.0.4044.92 pkgrel=1 _launcher_ver=6 pkgdesc="A web browser built for speed, simplicity, and security" @@ -34,27 +34,13 @@ optdepends=('libpipewire02: WebRTC desktop sharing under Wayland' install=chromium.install source=(https://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.xz chromium-launcher-$_launcher_ver.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver.tar.gz - cros-search-service-Include-cmath-for-std-pow.patch - move-RemoteTreeNode-declaration.patch - sync-enable-USSPasswords-by-default.patch - fix-shim-header-generation-when-unbundling-ICU.patch - fix-building-with-system-zlib.patch - remove-verbose-logging-in-local-unique-font-matching.patch - fix-building-with-unbundled-libxml.patch rename-Relayout-in-DesktopWindowTreeHostPlatform.patch rebuild-Linux-frame-button-cache-when-activation.patch chromium-widevine.patch chromium-skia-harmony.patch 0001-crashpad-include-limits.patch) -sha256sums=('b6ddefa9434877a9b923631b7525f7f2f80118dd986ecdac87f2c9f11f237346' +sha256sums=('a2cf3fd07a66330b189724cdcb4549ddac72705fba6adb33020bc6444efb1a44' '04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1' - '0a8d1af2a3734b5f99ea8462940e332db4acee7130fe436ad3e4b7ad133e5ae5' - '21f631851cdcb347f40793485b168cb5d0da65ae26ae39ba58d624c66197d0a5' - '08ef82476780e0864b5bf7f20eb19db320e73b9a5d4f595351e12e97dda8746f' - 'e477aa48a11ca4d53927f66a9593567fcd053325fb38af30ac3508465f1dd1f6' - '18276e65c68a0c328601b12fefb7e8bfc632346f34b87e64944c9de8c95c5cfa' - '5bc775c0ece84d67855f51b30eadcf96fa8163b416d2036e9f9ba19072f54dfe' - 'e530d1b39504c2ab247e16f1602359c484e9e8be4ef6d4824d68b14d29a7f60b' 'ae3bf107834bd8eda9a3ec7899fe35fde62e6111062e5def7d24bf49b53db3db' '46f7fc9768730c460b27681ccf3dc2685c7e1fd22d70d3a82d9e57e3389bb014' '709e2fddba3c1f2ed4deb3a239fc0479bfa50c46e054e7f32db4fb1365fed070' @@ -84,8 +70,7 @@ declare -gA _system_libs=( [zlib]=minizip ) _unwanted_bundled_libs=( - ${!_system_libs[@]} - ${_system_libs[libjpeg]+libjpeg_turbo} + $(printf "%s\n" ${!_system_libs[@]} | sed 's/^libjpeg$/&_turbo/') ) depends+=(${_system_libs[@]}) @@ -119,25 +104,6 @@ prepare() { third_party/blink/renderer/core/xml/parser/xml_document_parser.cc \ third_party/libxml/chromium/*.cc - # https://crbug.com/957519 - patch -Np1 -i ../cros-search-service-Include-cmath-for-std-pow.patch - patch -Np1 -i ../move-RemoteTreeNode-declaration.patch - - # https://crbug.com/1027929 - patch -Np1 -i ../sync-enable-USSPasswords-by-default.patch - - # https://crbug.com/989153 - patch -Np1 -i ../fix-shim-header-generation-when-unbundling-ICU.patch - - # https://crbug.com/977964 - patch -Np1 -i ../fix-building-with-system-zlib.patch - - # https://crbug.com/1005508 - patch -Np1 -i ../remove-verbose-logging-in-local-unique-font-matching.patch - - # https://crbug.com/1043042 - patch -Np1 -i ../fix-building-with-unbundled-libxml.patch - # https://crbug.com/1049258 patch -Np1 -i ../rename-Relayout-in-DesktopWindowTreeHostPlatform.patch patch -Np1 -i ../rebuild-Linux-frame-button-cache-when-activation.patch diff --git a/extra/chromium/cros-search-service-Include-cmath-for-std-pow.patch b/extra/chromium/cros-search-service-Include-cmath-for-std-pow.patch deleted file mode 100644 index 410b968d0..000000000 --- a/extra/chromium/cros-search-service-Include-cmath-for-std-pow.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 8273f4d3130e06fd8b6bef87b07c936304b971d9 Mon Sep 17 00:00:00 2001 -From: Raphael Kubo da Costa -Date: Tue, 10 Dec 2019 20:59:57 +0000 -Subject: [PATCH] [cros search service]: Include for std::pow() - -IWYU. Follow up to commit 2b2ea3c09b ("[cros search service] Move shared -string matching functions to //chrome"), which broke the libstdc++ build: - - ../../chrome/common/string_matching/fuzzy_tokenized_string_match.cc:199:14: error: no member named 'pow' in namespace 'std' - std::pow(partial_match_penalty_rate, long_start - current - 1); - ~~~~~^ - -Bug: 957519 -Change-Id: I66f61cb4f93cfa0bfa3d1b00ba391ddd8f31a7fb -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1960310 -Auto-Submit: Raphael Kubo da Costa -Reviewed-by: Jia Meng -Commit-Queue: Raphael Kubo da Costa -Cr-Commit-Position: refs/heads/master@{#723499} ---- - chrome/common/string_matching/fuzzy_tokenized_string_match.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/chrome/common/string_matching/fuzzy_tokenized_string_match.cc b/chrome/common/string_matching/fuzzy_tokenized_string_match.cc -index 8351fa701e4..884ef638c61 100644 ---- a/chrome/common/string_matching/fuzzy_tokenized_string_match.cc -+++ b/chrome/common/string_matching/fuzzy_tokenized_string_match.cc -@@ -5,6 +5,7 @@ - #include "chrome/common/string_matching/fuzzy_tokenized_string_match.h" - - #include -+#include - #include - - #include "base/i18n/case_conversion.h" diff --git a/extra/chromium/fix-building-with-system-zlib.patch b/extra/chromium/fix-building-with-system-zlib.patch deleted file mode 100644 index d488ac20f..000000000 --- a/extra/chromium/fix-building-with-system-zlib.patch +++ /dev/null @@ -1,32 +0,0 @@ -From cda86e34ddadba5f08dea764881bbb6c8ec01e8a Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann -Date: Sat, 25 Jan 2020 02:00:43 +0000 -Subject: [PATCH] Fix building with system zlib - -Add zlib_config target because perfetto depends on it. - -Bug: 977964 -Change-Id: I2aac5c3704f1274f932a61264d1c26a05f2db55e -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2019035 -Reviewed-by: Thomas Anderson -Commit-Queue: Thomas Anderson -Cr-Commit-Position: refs/heads/master@{#735201} ---- - build/linux/unbundle/zlib.gn | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/build/linux/unbundle/zlib.gn b/build/linux/unbundle/zlib.gn -index 1fdd472f35e..97d6aebe6d5 100644 ---- a/build/linux/unbundle/zlib.gn -+++ b/build/linux/unbundle/zlib.gn -@@ -13,6 +13,10 @@ config("system_zlib") { - defines = [ "USE_SYSTEM_ZLIB=1" ] - } - -+config("zlib_config") { -+ configs = [ ":system_zlib" ] -+} -+ - source_set("zlib") { - deps = [ ":zlib_shim" ] - libs = [ "z" ] diff --git a/extra/chromium/fix-building-with-unbundled-libxml.patch b/extra/chromium/fix-building-with-unbundled-libxml.patch deleted file mode 100644 index 7b934376e..000000000 --- a/extra/chromium/fix-building-with-unbundled-libxml.patch +++ /dev/null @@ -1,127 +0,0 @@ -From d3afade220ddb307e16a6dd4f2b0ec88b2af91e7 Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann -Date: Tue, 28 Jan 2020 18:16:54 +0000 -Subject: [PATCH] Fix building with unbundled libxml - -Add new targets to libxml.gn that were added in - https://chromium-review.googlesource.com/c/chromium/src/+/1894877 -Adjust includes to use system libxml headers too - -Bug: 1043042 -Change-Id: I948c063e212e49b9e7f42fed2b8bf7f4af042ca7 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2007110 -Reviewed-by: Robert Sesek -Reviewed-by: Daniel Cheng -Reviewed-by: Nico Weber -Commit-Queue: Robert Sesek -Cr-Commit-Position: refs/heads/master@{#735957} ---- - build/linux/unbundle/libxml.gn | 41 ++++++++++++++++++++-- - third_party/libxml/chromium/libxml_utils.h | 4 +-- - third_party/libxml/chromium/xml_reader.cc | 3 +- - third_party/libxml/chromium/xml_writer.cc | 3 +- - 4 files changed, 45 insertions(+), 6 deletions(-) - -diff --git a/build/linux/unbundle/libxml.gn b/build/linux/unbundle/libxml.gn -index c481bd3547b..3587881eea8 100644 ---- a/build/linux/unbundle/libxml.gn -+++ b/build/linux/unbundle/libxml.gn -@@ -8,11 +8,48 @@ pkg_config("system_libxml") { - packages = [ "libxml-2.0" ] - } - --static_library("libxml") { -+source_set("libxml") { -+ public_configs = [ ":system_libxml" ] -+} -+ -+static_library("libxml_utils") { -+ # Do not expand this visibility list without first consulting with the -+ # Security Team. -+ visibility = [ -+ ":xml_reader", -+ ":xml_writer", -+ "//base/test:test_support", -+ "//services/data_decoder:xml_parser_fuzzer", -+ ] - sources = [ - "chromium/libxml_utils.cc", - "chromium/libxml_utils.h", - ] -- - public_configs = [ ":system_libxml" ] - } -+ -+static_library("xml_reader") { -+ # Do not expand this visibility list without first consulting with the -+ # Security Team. -+ visibility = [ -+ "//base/test:test_support", -+ "//components/policy/core/common:unit_tests", -+ "//services/data_decoder:*", -+ "//tools/traffic_annotation/auditor:auditor_sources", -+ ] -+ sources = [ -+ "chromium/xml_reader.cc", -+ "chromium/xml_reader.h", -+ ] -+ deps = [ ":libxml_utils" ] -+} -+ -+static_library("xml_writer") { -+ # The XmlWriter is considered safe to use from any target. -+ visibility = [ "*" ] -+ sources = [ -+ "chromium/xml_writer.cc", -+ "chromium/xml_writer.h", -+ ] -+ deps = [ ":libxml_utils" ] -+} -diff --git a/third_party/libxml/chromium/libxml_utils.h b/third_party/libxml/chromium/libxml_utils.h -index ff969fab540..8b2383f9c8b 100644 ---- a/third_party/libxml/chromium/libxml_utils.h -+++ b/third_party/libxml/chromium/libxml_utils.h -@@ -5,9 +5,9 @@ - #ifndef THIRD_PARTY_LIBXML_CHROMIUM_LIBXML_UTILS_H_ - #define THIRD_PARTY_LIBXML_CHROMIUM_LIBXML_UTILS_H_ - --#include -+#include - --#include "third_party/libxml/src/include/libxml/xmlreader.h" -+#include - - // libxml uses a global error function pointer for reporting errors. - // A ScopedXmlErrorFunc object lets you change the global error pointer -diff --git a/third_party/libxml/chromium/xml_reader.cc b/third_party/libxml/chromium/xml_reader.cc -index 92464f4cbcc..899ccefb7c8 100644 ---- a/third_party/libxml/chromium/xml_reader.cc -+++ b/third_party/libxml/chromium/xml_reader.cc -@@ -4,10 +4,11 @@ - - #include "third_party/libxml/chromium/xml_reader.h" - -+#include -+ - #include - - #include "third_party/libxml/chromium/libxml_utils.h" --#include "third_party/libxml/src/include/libxml/xmlreader.h" - - using internal::XmlStringToStdString; - -diff --git a/third_party/libxml/chromium/xml_writer.cc b/third_party/libxml/chromium/xml_writer.cc -index 51fce8ebeb1..7c58031fe2d 100644 ---- a/third_party/libxml/chromium/xml_writer.cc -+++ b/third_party/libxml/chromium/xml_writer.cc -@@ -4,8 +4,9 @@ - - #include "third_party/libxml/chromium/xml_writer.h" - -+#include -+ - #include "third_party/libxml/chromium/libxml_utils.h" --#include "third_party/libxml/src/include/libxml/xmlwriter.h" - - XmlWriter::XmlWriter() : writer_(nullptr), buffer_(nullptr) {} - diff --git a/extra/chromium/fix-shim-header-generation-when-unbundling-ICU.patch b/extra/chromium/fix-shim-header-generation-when-unbundling-ICU.patch deleted file mode 100644 index 04f1ecd3b..000000000 --- a/extra/chromium/fix-shim-header-generation-when-unbundling-ICU.patch +++ /dev/null @@ -1,50 +0,0 @@ -From dcad5af090528018599277dc5d7e160fb6b2d68e Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann -Date: Wed, 15 Jan 2020 20:26:40 +0000 -Subject: [PATCH] Fix shim header generation when unbundling ICU - -listformatter.h was moved from icuuc to icui18n - -Bug: 989153 -Change-Id: I9fcb56f6d5af7787f34ea99b737e2ed8fe741c84 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2000142 -Reviewed-by: Lei Zhang -Commit-Queue: Lei Zhang -Cr-Commit-Position: refs/heads/master@{#732114} ---- - AUTHORS | 1 + - build/linux/unbundle/icu.gn | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/AUTHORS b/AUTHORS -index 7523e483aae..1618fddc633 100644 ---- a/AUTHORS -+++ b/AUTHORS -@@ -891,6 +891,7 @@ Soren Dreijer - Sreerenj Balachandran - Srirama Chandra Sekhar Mogali - Staphany Park -+Stephan Hartmann - Stephen Searles - Steve Sanders - Steven Pennington -diff --git a/build/linux/unbundle/icu.gn b/build/linux/unbundle/icu.gn -index 923bd7f5ac3..e77bc43db87 100644 ---- a/build/linux/unbundle/icu.gn -+++ b/build/linux/unbundle/icu.gn -@@ -92,6 +92,7 @@ shim_headers("icui18n_shim") { - "unicode/fpositer.h", - "unicode/gender.h", - "unicode/gregocal.h", -+ "unicode/listformatter.h", - "unicode/measfmt.h", - "unicode/measunit.h", - "unicode/measure.h", -@@ -174,7 +175,6 @@ shim_headers("icuuc_shim") { - "unicode/icudataver.h", - "unicode/icuplug.h", - "unicode/idna.h", -- "unicode/listformatter.h", - "unicode/localpointer.h", - "unicode/locdspnm.h", - "unicode/locid.h", diff --git a/extra/chromium/move-RemoteTreeNode-declaration.patch b/extra/chromium/move-RemoteTreeNode-declaration.patch deleted file mode 100644 index 50fc78cdb..000000000 --- a/extra/chromium/move-RemoteTreeNode-declaration.patch +++ /dev/null @@ -1,237 +0,0 @@ -From cdf3e81ff49b200213d67d65558f2919222b60ab Mon Sep 17 00:00:00 2001 -From: Raphael Kubo da Costa -Date: Mon, 16 Dec 2019 11:39:11 +0000 -Subject: [PATCH] BookmarkModelMerger: Move RemoteTreeNode declaration to - header. - -This fixes the build with libstdc++ after commit 8f5dad93e58 ("Fix CHECK -failure due to untracked local nodes"): - -/usr/lib/gcc/x86_64-redhat-linux/9/../../../../include/c++/9/bits/stl_pair.h:215:11: error: field has incomplete type 'sync_bookmarks::BookmarkModelMerger::RemoteTreeNode' - _T2 second; /// @c second is a copy of the second object - ^ -/usr/lib/gcc/x86_64-redhat-linux/9/../../../../include/c++/9/ext/aligned_buffer.h:91:28: note: in instantiation of template class 'std::pair, sync_bookmarks::BookmarkModelMerger::RemoteTreeNode>' requested here - : std::aligned_storage - ^ -/usr/lib/gcc/x86_64-redhat-linux/9/../../../../include/c++/9/bits/hashtable_policy.h:233:43: note: in instantiation of template class '__gnu_cxx::__aligned_buffer, sync_bookmarks::BookmarkModelMerger::RemoteTreeNode> >' requested here - __gnu_cxx::__aligned_buffer<_Value> _M_storage; - ^ -/usr/lib/gcc/x86_64-redhat-linux/9/../../../../include/c++/9/bits/hashtable_policy.h:264:39: note: in instantiation of template class 'std::__detail::_Hash_node_value_base, sync_bookmarks::BookmarkModelMerger::RemoteTreeNode> >' requested here - struct _Hash_node<_Value, true> : _Hash_node_value_base<_Value> - ^ -/usr/lib/gcc/x86_64-redhat-linux/9/../../../../include/c++/9/bits/hashtable_policy.h:2028:25: note: in instantiation of template class 'std::__detail::_Hash_node, sync_bookmarks::BookmarkModelMerger::RemoteTreeNode>, true>' requested here - rebind_traits; - ^ -/usr/lib/gcc/x86_64-redhat-linux/9/../../../../include/c++/9/bits/hashtable.h:184:15: note: in instantiation of template class 'std::__detail::_Hashtable_alloc, sync_bookmarks::BookmarkModelMerger::RemoteTreeNode>, true> > > -' requested here - private __detail::_Hashtable_alloc< - ^ -/usr/lib/gcc/x86_64-redhat-linux/9/../../../../include/c++/9/bits/unordered_map.h:105:18: note: in instantiation of template class 'std::_Hashtable, std::pair, sync_bookmarks::BookmarkModelMerger::RemoteTreeNode>, std::allocator, sync_bookmarks::BookmarkModelMerger::RemoteTreeNode> >, std::__detail::_Select1st, std::equal_to >, std::hash, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__deta -il::_Hashtable_traits >' requested here - _Hashtable _M_h; - ^ -../../components/sync_bookmarks/bookmark_model_merger.h:146:22: note: in instantiation of template class 'std::unordered_map, sync_bookmarks::BookmarkModelMerger::RemoteTreeNode, std::hash, std::equal_to >, std::allocator, sync_bookmarks::BookmarkModelMerger::RemoteTreeNode> > >' requested here - const RemoteForest remote_forest_; - ^ -../../components/sync_bookmarks/bookmark_model_merger.h:53:9: note: forward declaration of 'sync_bookmarks::BookmarkModelMerger::RemoteTreeNode' - class RemoteTreeNode; - ^ - -Essentially, the problem is that libstdc++'s std::unordered_map -implementation requires both T and U to be fully declared. I raised the -problem in https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92770, and GCC's -position is that we are relying on undefined behavior according to the C++ -standard (https://eel.is/c++draft/requirements#res.on.functions-2.5). - -Bug: 957519 -Change-Id: Ife7e435e516932a795bfbe05b2c910c3272878f0 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1960156 -Commit-Queue: Raphael Kubo da Costa -Reviewed-by: Mikel Astiz -Auto-Submit: Raphael Kubo da Costa -Cr-Commit-Position: refs/heads/master@{#725070} ---- - .../sync_bookmarks/bookmark_model_merger.cc | 89 +++++++------------ - .../sync_bookmarks/bookmark_model_merger.h | 48 +++++++++- - 2 files changed, 80 insertions(+), 57 deletions(-) - -diff --git a/components/sync_bookmarks/bookmark_model_merger.cc b/components/sync_bookmarks/bookmark_model_merger.cc -index eae153eff95..579848ee664 100644 ---- a/components/sync_bookmarks/bookmark_model_merger.cc -+++ b/components/sync_bookmarks/bookmark_model_merger.cc -@@ -5,7 +5,6 @@ - #include "components/sync_bookmarks/bookmark_model_merger.h" - - #include --#include - #include - #include - #include -@@ -205,66 +204,44 @@ UpdatesPerParentId GroupValidUpdatesByParentId( - - } // namespace - --class BookmarkModelMerger::RemoteTreeNode final { -- public: -- // Constructs a tree given |update| as root and recursively all descendants by -- // traversing |*updates_per_parent_id|. |update| and |updates_per_parent_id| -- // must not be null. All updates |*updates_per_parent_id| must represent valid -- // updates. Updates corresponding from descendant nodes are moved away from -- // |*updates_per_parent_id|. -- static RemoteTreeNode BuildTree( -- std::unique_ptr update, -- UpdatesPerParentId* updates_per_parent_id); -- -- ~RemoteTreeNode() = default; -- -- // Allow moves, useful during construction. -- RemoteTreeNode(RemoteTreeNode&&) = default; -- RemoteTreeNode& operator=(RemoteTreeNode&&) = default; -- -- const syncer::EntityData& entity() const { return *update_->entity; } -- int64_t response_version() const { return update_->response_version; } -- -- // Direct children nodes, sorted by ascending unique position. These are -- // guaranteed to be valid updates (e.g. IsValidBookmarkSpecifics()). -- const std::vector& children() const { return children_; } -- -- // Recursively emplaces all GUIDs (this node and descendants) into -- // |*guid_to_remote_node_map|, which must not be null. -- void EmplaceSelfAndDescendantsByGUID( -- std::unordered_map* -- guid_to_remote_node_map) const { -- DCHECK(guid_to_remote_node_map); -- -- const std::string& guid = entity().specifics.bookmark().guid(); -- if (!guid.empty()) { -- DCHECK(base::IsValidGUID(guid)); -- -- // Duplicate GUIDs have been sorted out before. -- bool success = guid_to_remote_node_map->emplace(guid, this).second; -- DCHECK(success); -- } -+BookmarkModelMerger::RemoteTreeNode::RemoteTreeNode() = default; - -- for (const RemoteTreeNode& child : children_) { -- child.EmplaceSelfAndDescendantsByGUID(guid_to_remote_node_map); -- } -- } -+BookmarkModelMerger::RemoteTreeNode::~RemoteTreeNode() = default; -+ -+BookmarkModelMerger::RemoteTreeNode::RemoteTreeNode( -+ BookmarkModelMerger::RemoteTreeNode&&) = default; -+BookmarkModelMerger::RemoteTreeNode& BookmarkModelMerger::RemoteTreeNode:: -+operator=(BookmarkModelMerger::RemoteTreeNode&&) = default; -+ -+void BookmarkModelMerger::RemoteTreeNode::EmplaceSelfAndDescendantsByGUID( -+ std::unordered_map* -+ guid_to_remote_node_map) const { -+ DCHECK(guid_to_remote_node_map); -+ -+ const std::string& guid = entity().specifics.bookmark().guid(); -+ if (!guid.empty()) { -+ DCHECK(base::IsValidGUID(guid)); - -- private: -- static bool UniquePositionLessThan(const RemoteTreeNode& lhs, -- const RemoteTreeNode& rhs) { -- const syncer::UniquePosition a_pos = -- syncer::UniquePosition::FromProto(lhs.entity().unique_position); -- const syncer::UniquePosition b_pos = -- syncer::UniquePosition::FromProto(rhs.entity().unique_position); -- return a_pos.LessThan(b_pos); -+ // Duplicate GUIDs have been sorted out before. -+ bool success = guid_to_remote_node_map->emplace(guid, this).second; -+ DCHECK(success); - } - -- RemoteTreeNode() = default; -+ for (const RemoteTreeNode& child : children_) { -+ child.EmplaceSelfAndDescendantsByGUID(guid_to_remote_node_map); -+ } -+} - -- std::unique_ptr update_; -- std::vector children_; --}; -+// static -+bool BookmarkModelMerger::RemoteTreeNode::UniquePositionLessThan( -+ const RemoteTreeNode& lhs, -+ const RemoteTreeNode& rhs) { -+ const syncer::UniquePosition a_pos = -+ syncer::UniquePosition::FromProto(lhs.entity().unique_position); -+ const syncer::UniquePosition b_pos = -+ syncer::UniquePosition::FromProto(rhs.entity().unique_position); -+ return a_pos.LessThan(b_pos); -+} - - // static - BookmarkModelMerger::RemoteTreeNode -diff --git a/components/sync_bookmarks/bookmark_model_merger.h b/components/sync_bookmarks/bookmark_model_merger.h -index 9b592000dc5..bf0783ecf8e 100644 ---- a/components/sync_bookmarks/bookmark_model_merger.h -+++ b/components/sync_bookmarks/bookmark_model_merger.h -@@ -5,6 +5,7 @@ - #ifndef COMPONENTS_SYNC_BOOKMARKS_BOOKMARK_MODEL_MERGER_H_ - #define COMPONENTS_SYNC_BOOKMARKS_BOOKMARK_MODEL_MERGER_H_ - -+#include - #include - #include - #include -@@ -50,7 +51,52 @@ class BookmarkModelMerger { - - private: - // Internal representation of a remote tree, composed of nodes. -- class RemoteTreeNode; -+ class RemoteTreeNode final { -+ private: -+ using UpdatesPerParentId = -+ std::unordered_map; -+ -+ public: -+ // Constructs a tree given |update| as root and recursively all descendants -+ // by traversing |*updates_per_parent_id|. |update| and -+ // |updates_per_parent_id| must not be null. All updates -+ // |*updates_per_parent_id| must represent valid updates. Updates -+ // corresponding from descendant nodes are moved away from -+ // |*updates_per_parent_id|. -+ static RemoteTreeNode BuildTree( -+ std::unique_ptr update, -+ UpdatesPerParentId* updates_per_parent_id); -+ -+ ~RemoteTreeNode(); -+ -+ // Allow moves, useful during construction. -+ RemoteTreeNode(RemoteTreeNode&&); -+ RemoteTreeNode& operator=(RemoteTreeNode&&); -+ -+ const syncer::EntityData& entity() const { return *update_->entity; } -+ int64_t response_version() const { return update_->response_version; } -+ -+ // Direct children nodes, sorted by ascending unique position. These are -+ // guaranteed to be valid updates (e.g. IsValidBookmarkSpecifics()). -+ const std::vector& children() const { return children_; } -+ -+ // Recursively emplaces all GUIDs (this node and descendants) into -+ // |*guid_to_remote_node_map|, which must not be null. -+ void EmplaceSelfAndDescendantsByGUID( -+ std::unordered_map* -+ guid_to_remote_node_map) const; -+ -+ private: -+ static bool UniquePositionLessThan(const RemoteTreeNode& lhs, -+ const RemoteTreeNode& rhs); -+ -+ RemoteTreeNode(); -+ -+ std::unique_ptr update_; -+ std::vector children_; -+ }; - - // A forest composed of multiple trees where the root of each tree represents - // a permanent node, keyed by server-defined unique tag of the root. diff --git a/extra/chromium/remove-verbose-logging-in-local-unique-font-matching.patch b/extra/chromium/remove-verbose-logging-in-local-unique-font-matching.patch deleted file mode 100644 index a88286181..000000000 --- a/extra/chromium/remove-verbose-logging-in-local-unique-font-matching.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 8500a125e9fba8bb84d185542155747ee7157ff8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dominik=20R=C3=B6ttsches?= -Date: Tue, 28 Jan 2020 13:48:07 +0000 -Subject: [PATCH] Remove verbose logging in local unique font matching on Linux -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixed: 1005508 -Change-Id: I97f5340c6d1881798ba51effc4a9e5c07de12e52 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2023552 -Commit-Queue: Dominik Röttsches -Commit-Queue: Kentaro Hara -Auto-Submit: Dominik Röttsches -Reviewed-by: Kentaro Hara -Cr-Commit-Position: refs/heads/master@{#735854} ---- - content/child/child_process_sandbox_support_impl_linux.cc | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/content/child/child_process_sandbox_support_impl_linux.cc b/content/child/child_process_sandbox_support_impl_linux.cc -index 693ead7f7a5..c97c8fa197b 100644 ---- a/content/child/child_process_sandbox_support_impl_linux.cc -+++ b/content/child/child_process_sandbox_support_impl_linux.cc -@@ -76,8 +76,6 @@ bool WebSandboxSupportLinux::MatchFontByPostscriptNameOrFullFontName( - std::string family_name; - if (!font_loader_->MatchFontByPostscriptNameOrFullFontName(font_unique_name, - &font_identity)) { -- LOG(ERROR) << "FontService unique font name matching request did not " -- "receive a response."; - return false; - } - diff --git a/extra/chromium/sync-enable-USSPasswords-by-default.patch b/extra/chromium/sync-enable-USSPasswords-by-default.patch deleted file mode 100644 index 7f3a7005a..000000000 --- a/extra/chromium/sync-enable-USSPasswords-by-default.patch +++ /dev/null @@ -1,28 +0,0 @@ -From eb997db5527c01fd12c321a6abc52b7cff882e50 Mon Sep 17 00:00:00 2001 -From: Mohamed Amir Yosef -Date: Thu, 9 Jan 2020 21:22:19 +0000 -Subject: [PATCH] [Sync] Enable USSPasswords by default - -Change-Id: I021cd952d7a2917a8fb7203cabdac612251193df -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1963804 -Auto-Submit: Mohamed Amir Yosef -Reviewed-by: Mikel Astiz -Commit-Queue: Mohamed Amir Yosef -Cr-Commit-Position: refs/heads/master@{#729902} ---- - components/sync/driver/sync_driver_switches.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/components/sync/driver/sync_driver_switches.cc b/components/sync/driver/sync_driver_switches.cc -index ddff8b91419..999384aa68a 100644 ---- a/components/sync/driver/sync_driver_switches.cc -+++ b/components/sync/driver/sync_driver_switches.cc -@@ -55,7 +55,7 @@ const base::Feature kStopSyncInPausedState{"StopSyncInPausedState", - - // Enable USS implementation of Passwords datatype. - const base::Feature kSyncUSSPasswords{"SyncUSSPasswords", -- base::FEATURE_DISABLED_BY_DEFAULT}; -+ base::FEATURE_ENABLED_BY_DEFAULT}; - - // Enable USS implementation of Nigori datatype. - const base::Feature kSyncUSSNigori{"SyncUSSNigori",