+ libavcodec/mlp_parse.h \

+ libavutil/tx_priv.h \

+ libavutil/tx_template.c \

+../../third_party/blink/renderer/core/editing/commands/delete_selection_command.cc: In member function 'void blink::DeleteSelectionCommand::InitializePositionData(blink::EditingState*)':

+../../third_party/blink/renderer/core/editing/commands/delete_selection_command.cc:256:59: error: no matching function for call to 'EnclosingNodeOfType(blink::Position&, <unresolved overloaded function type>)'

+ 256 | EnclosingNodeOfType(start, &IsA<HTMLTableRowElement>));

+ | ^

+In file included from ../../third_party/blink/renderer/core/editing/commands/delete_selection_command.cc:34:

+../../third_party/blink/renderer/core/editing/editing_utilities.h:112:19: note: candidate: 'blink::Node* blink::EnclosingNodeOfType(const Position&, bool (*)(const blink::Node*), blink::EditingBoundaryCrossingRule)'

+ 112 | CORE_EXPORT Node* EnclosingNodeOfType(

+ | ^~~~~~~~~~~~~~~~~~~

+../../third_party/blink/renderer/core/editing/editing_utilities.h:114:12: note: no known conversion for argument 2 from '<unresolved overloaded function type>' to 'bool (*)(const blink::Node*)'

+ 114 | bool (*node_is_of_type)(const Node*),

+ | ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+../../third_party/blink/renderer/core/editing/editing_utilities.h:116:19: note: candidate: 'blink::Node* blink::EnclosingNodeOfType(const PositionInFlatTree&, bool (*)(const blink::Node*), blink::EditingBoundaryCrossingRule)'

+ 116 | CORE_EXPORT Node* EnclosingNodeOfType(

+ | ^~~~~~~~~~~~~~~~~~~

+../../third_party/blink/renderer/core/editing/editing_utilities.h:117:5: note: no known conversion for argument 1 from 'blink::Position' {aka 'blink::PositionTemplate<blink::EditingAlgorithm<blink::NodeTraversal> >'} to 'const PositionInFlatTree&' {aka 'const blink::PositionTemplate<blink::EditingAlgorithm<blink::FlatTreeTraversal> >&'}

+ 117 | const PositionInFlatTree&,

+ | ^~~~~~~~~~~~~~~~~~~~~~~~~

+

+diff --git a/third_party/blink/renderer/core/editing/commands/delete_selection_command.cc b/third_party/blink/renderer/core/editing/commands/delete_selection_command.cc

+index 6ff6906..dd531ae 100644

+--- a/third_party/blink/renderer/core/editing/commands/delete_selection_command.cc

++++ b/third_party/blink/renderer/core/editing/commands/delete_selection_command.cc

+@@ -224,6 +224,10 @@ static Position TrailingWhitespacePosition(const Position& position,

+ return Position();

+ }

+

++static bool IsAHTMLTableRowElement(const Node* node) {

++ return IsA<HTMLTableRowElement>(node);

++}

++

+ void DeleteSelectionCommand::InitializePositionData(

+ EditingState* editing_state) {

+ DCHECK(!GetDocument().NeedsLayoutTreeUpdate());

+@@ -253,9 +257,9 @@ void DeleteSelectionCommand::InitializePositionData(

+ end_root_ = RootEditableElementOf(end);

+

+ start_table_row_ = To<HTMLTableRowElement>(

+- EnclosingNodeOfType(start, &IsA<HTMLTableRowElement>));

++ EnclosingNodeOfType(start, &IsAHTMLTableRowElement));

+ end_table_row_ = To<HTMLTableRowElement>(

+- EnclosingNodeOfType(end, &IsA<HTMLTableRowElement>));

++ EnclosingNodeOfType(end, &IsAHTMLTableRowElement));

+

+ // Don't move content out of a table cell.

+ // If the cell is non-editable, enclosingNodeOfType won't return it by

+In file included from ../../media/base/media_log_properties.h:13,

+ from ../../media/base/media_log.h:23,

+ from ../../media/filters/frame_processor.h:15,

+ from ../../media/filters/frame_processor.cc:5:

+../../media/base/media_log_properties_helper.h:86:8: error: extra qualification not allowed [-fpermissive]

+ 86 | struct internal::MediaLogPropertyTypeConverter<media::AudioDecoderConfig> {

+ | ^~~~~~~~

+../../media/base/media_log_properties_helper.h:86:75: error: explicit specialization of non-template 'media::internal::<unnamed struct>'

+ 86 | struct internal::MediaLogPropertyTypeConverter<media::AudioDecoderConfig> {

+ | ^

+

+diff --git a/media/base/media_log_properties_helper.h b/media/base/media_log_properties_helper.h

+index 95ff70a..549b003 100644

+--- a/media/base/media_log_properties_helper.h

++++ b/media/base/media_log_properties_helper.h

+@@ -83,7 +83,7 @@ struct MediaLogPropertyTypeConverter<std::vector<T>> {

+

+ // Specializer for sending AudioDecoderConfigs to the media tab in devtools.

+ template <>

+-struct internal::MediaLogPropertyTypeConverter<media::AudioDecoderConfig> {

++struct MediaLogPropertyTypeConverter<media::AudioDecoderConfig> {

+ static base::Value Convert(const AudioDecoderConfig& value) {

+ base::Value result(base::Value::Type::DICTIONARY);

+ result.SetStringKey("codec", GetCodecName(value.codec()));

+@@ -114,7 +114,7 @@ struct internal::MediaLogPropertyTypeConverter<media::AudioDecoderConfig> {

+

+ // Specializer for sending VideoDecoderConfigs to the media tab in devtools.

+ template <>

+-struct internal::MediaLogPropertyTypeConverter<VideoDecoderConfig> {

++struct MediaLogPropertyTypeConverter<VideoDecoderConfig> {

+ static base::Value Convert(const VideoDecoderConfig& value) {

+ base::Value result(base::Value::Type::DICTIONARY);

+ result.SetStringKey("codec", GetCodecName(value.codec()));

+From 8273f4d3130e06fd8b6bef87b07c936304b971d9 Mon Sep 17 00:00:00 2001

+From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>

+Date: Tue, 10 Dec 2019 20:59:57 +0000

+Subject: [PATCH] [cros search service]: Include <cmath> 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 <raphael.kubo.da.costa@intel.com>

+Reviewed-by: Jia Meng <jiameng@chromium.org>

+Commit-Queue: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>

+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 8351fa701e4d..884ef638c61c 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 <algorithm>

++#include <cmath>

+ #include <iterator>

+

+ #include "base/i18n/case_conversion.h"

+--

+2.24.1

+

+From cdf3e81ff49b200213d67d65558f2919222b60ab Mon Sep 17 00:00:00 2001

+From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>

+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<const std::__cxx11::basic_string<char>, sync_bookmarks::BookmarkModelMerger::RemoteTreeNode>' requested here

+ : std::aligned_storage<sizeof(_Tp), __alignof__(_Tp)>

+ ^

+/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<std::pair<const std::__cxx11::basic_string<char>, 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<std::pair<const std::__cxx11::basic_string<char>, 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<std::pair<const std::__cxx11::basic_string<char>, sync_bookmarks::BookmarkModelMerger::RemoteTreeNode>, true>' requested here

+ rebind_traits<typename __node_type::value_type>;

+ ^

+/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<std::allocator<std::__detail::_Hash_node<std::pair<const std::__cxx11::basic_string<char>, 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::__cxx11::basic_string<char>, std::pair<const std::__cxx11::basic_string<char>, sync_bookmarks::BookmarkModelMerger::RemoteTreeNode>, std::allocator<std::pair<con

+st std::__cxx11::basic_string<char>, sync_bookmarks::BookmarkModelMerger::RemoteTreeNode> >, std::__detail::_Select1st, std::equal_to<std::__cxx11::basic_string<char> >, std::hash<std::string>, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__deta

+il::_Hashtable_traits<true, false, true> >' requested here

+ _Hashtable _M_h;

+ ^

+../../components/sync_bookmarks/bookmark_model_merger.h:146:22: note: in instantiation of template class 'std::unordered_map<std::__cxx11::basic_string<char>, sync_bookmarks::BookmarkModelMerger::RemoteTreeNode, std::hash<std::string>, std::equal_to<std::__cxx11::basic_string<char> >, std::allocator<std::pair<con

+st std::__cxx11::basic_string<char>, 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<T, U>

+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 <raphael.kubo.da.costa@intel.com>

+Reviewed-by: Mikel Astiz <mastiz@chromium.org>

+Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>

+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 eae153eff953..579848ee664e 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 <algorithm>

+-#include <memory>

+ #include <set>

+ #include <string>

+ #include <utility>

+@@ -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<syncer::UpdateResponseData> 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<RemoteTreeNode>& 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<std::string, const RemoteTreeNode*>*

+- 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<std::string, const RemoteTreeNode*>*

++ 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<syncer::UpdateResponseData> update_;

+- std::vector<RemoteTreeNode> 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 9b592000dc59..bf0783ecf8ee 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 <memory>

+ #include <string>

+ #include <unordered_map>

+ #include <vector>

+@@ -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<base::StringPiece,

++ syncer::UpdateResponseDataList,

++ base::StringPieceHash>;

++

++ 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<syncer::UpdateResponseData> 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<RemoteTreeNode>& 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<std::string, const RemoteTreeNode*>*

++ guid_to_remote_node_map) const;

++

++ private:

++ static bool UniquePositionLessThan(const RemoteTreeNode& lhs,

++ const RemoteTreeNode& rhs);

++

++ RemoteTreeNode();

++

++ std::unique_ptr<syncer::UpdateResponseData> update_;

++ std::vector<RemoteTreeNode> 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.

+--

+2.24.1

+

+From 5633ce55ffd8e3df4a2c8c29c597b48aa7676435 Mon Sep 17 00:00:00 2001

+From: Stephan Hartmann <stha09@googlemail.com>

+Date: Thu, 16 Jan 2020 17:22:10 +0000

+Subject: [PATCH] GCC: use scoped_refptr to return abstract VideoTrackInterface

+

+Fix compilation issue in GCC with CrossThreadCopierPassThrough and VideoTrackInterface.

+

+Bug: 819294

+Change-Id: Id453c3a7bc63fc75a0f882af450730ada5b717de

+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2002512

+Reviewed-by: Chris Mumford <cmumford@google.com>

+Reviewed-by: Guido Urdaneta <guidou@chromium.org>

+Commit-Queue: Guido Urdaneta <guidou@chromium.org>

+Cr-Commit-Position: refs/heads/master@{#732437}

+---

+ .../peerconnection/adapters/web_rtc_cross_thread_copier.h | 5 +++--

+ 1 file changed, 3 insertions(+), 2 deletions(-)

+

+diff --git a/third_party/blink/renderer/modules/peerconnection/adapters/web_rtc_cross_thread_copier.h b/third_party/blink/renderer/modules/peerconnection/adapters/web_rtc_cross_thread_copier.h

+index 54cb7d13bff3..0d6c40f0b428 100644

+--- a/third_party/blink/renderer/modules/peerconnection/adapters/web_rtc_cross_thread_copier.h

++++ b/third_party/blink/renderer/modules/peerconnection/adapters/web_rtc_cross_thread_copier.h

+@@ -165,8 +165,9 @@ struct CrossThreadCopier<blink::MediaStreamVideoTrack>

+ };

+

+ template <>

+-struct CrossThreadCopier<webrtc::VideoTrackInterface>

+- : public CrossThreadCopierPassThrough<webrtc::VideoTrackInterface> {

++struct CrossThreadCopier<rtc::scoped_refptr<webrtc::VideoTrackInterface>>

++ : public CrossThreadCopierPassThrough<

++ rtc::scoped_refptr<webrtc::VideoTrackInterface>> {

+ STATIC_ONLY(CrossThreadCopier);

+ };

+

+--

+2.24.1

+

+From 00f47df999c9b19e80fdc01db0ae9ca1b6a12b3a Mon Sep 17 00:00:00 2001

+From: vasilvv <vasilvv@google.com>

+Date: Wed, 3 Apr 2019 13:58:53 -0700

+Subject: [PATCH] GCC: do not delete move constructor of QuicStreamSendBuffer

+MIME-Version: 1.0

+Content-Type: text/plain; charset=UTF-8

+Content-Transfer-Encoding: 8bit

+

+QuicStreamSendBuffer constructor is implicitely required in the

+initialization of the vector of substreams in QuicCryptoStream.

+Though clang apparently ignores that, GCC fails to build.

+

+BUG=chromium:819294

+

+Originally submitted by José Dapena Paz <jose.dapena@lge.com> at https://quiche-review.googlesource.com/c/quiche/+/2420

+

+PiperOrigin-RevId: 241800134

+Change-Id: I4e3c97d6e5895d85340e8c1b740e6196d9104066

+---

+ quic/core/quic_stream_send_buffer.h | 2 +-

+ 1 file changed, 1 insertion(+), 1 deletion(-)

+

+diff --git a/quic/core/quic_stream_send_buffer.h b/quic/core/quic_stream_send_buffer.h

+index e34514b..74e9d0d 100644

+--- a/net/third_party/quiche/src/quic/core/quic_stream_send_buffer.h

++++ b/net/third_party/quiche/src/quic/core/quic_stream_send_buffer.h

+@@ -62,7 +62,7 @@ class QUIC_EXPORT_PRIVATE QuicStreamSendBuffer {

+ public:

+ explicit QuicStreamSendBuffer(QuicBufferAllocator* allocator);

+ QuicStreamSendBuffer(const QuicStreamSendBuffer& other) = delete;

+- QuicStreamSendBuffer(QuicStreamSendBuffer&& other) = delete;

++ QuicStreamSendBuffer(QuicStreamSendBuffer&& other) = default;

+ ~QuicStreamSendBuffer();

+

+ // Save |data_length| of data starts at |iov_offset| in |iov| to send buffer.

+--

+2.24.1

+

+From d3afade220ddb307e16a6dd4f2b0ec88b2af91e7 Mon Sep 17 00:00:00 2001

+From: Stephan Hartmann <stha09@googlemail.com>

+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 <rsesek@chromium.org>

+Reviewed-by: Daniel Cheng <dcheng@chromium.org>

+Reviewed-by: Nico Weber <thakis@chromium.org>

+Commit-Queue: Robert Sesek <rsesek@chromium.org>

+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 c481bd3547bb..3587881eea89 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 ff969fab5406..8b2383f9c8bd 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 <string>

++#include <libxml/xmlreader.h>

+

+-#include "third_party/libxml/src/include/libxml/xmlreader.h"

++#include <string>

+

+ // 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 92464f4cbccf..899ccefb7c8e 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 <libxml/xmlreader.h>

++

+ #include <vector>

+

+ #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 51fce8ebeb19..7c58031fe2d2 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 <libxml/xmlwriter.h>

++

+ #include "third_party/libxml/chromium/libxml_utils.h"

+-#include "third_party/libxml/src/include/libxml/xmlwriter.h"

+

+ XmlWriter::XmlWriter() : writer_(nullptr), buffer_(nullptr) {}

+

+--

+2.24.1

+

+Version: 80.0.3987.87

+# https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63e5fbd254535ca8

+# https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ba7a983c4c70ff8

+Patch42: chromium-gcc9-blink.patch

+Patch43: chromium-gcc9-permissive.patch

+Patch50: chromium-unbundle-libxml.patch

+Patch51: chromium-quiche-gcc9.patch

+Patch52: chromium-gcc9-r723499.patch

+Patch53: chromium-gcc9-r725070.patch

+Patch54: chromium-gcc9-r732437.patch

+ third_party/devtools-frontend \

+ third_party/devtools-frontend/src/third_party \

+ third_party/libgifcodec \

+ third_party/wuffs \

+* Sun Feb 09 2020 - Ting-Wei Lan <lantw44@gmail.com> - 80.0.3987.87-100

+- Update to 80.0.3987.87

+