From c551f43206405019121bd2b2c93714319a0a3300 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 23 Jan 2020 17:21:03 +0100 Subject: BASELINE: Update Chromium to 79.0.3945.139 Change-Id: I336b7182fab9bca80b709682489c07db112eaca5 Reviewed-by: Allan Sandfeld Jensen --- .../renderer/platform/network/encoded_form_data.cc | 14 ++++---- .../renderer/platform/network/encoded_form_data.h | 5 ++- .../encoded_form_data_element_mojom_traits.cc | 40 ++++++++++++---------- .../encoded_form_data_element_mojom_traits.h | 11 +++--- .../network/encoded_form_data_mojom_traits.h | 2 +- .../platform/network/encoded_form_data_test.cc | 7 ++-- .../renderer/platform/network/http_parsers_test.cc | 1 - .../platform/network/network_state_notifier.h | 6 ++-- .../platform/network/wrapped_data_pipe_getter.h | 11 +++--- 9 files changed, 52 insertions(+), 45 deletions(-) (limited to 'chromium/third_party/blink/renderer/platform/network') diff --git a/chromium/third_party/blink/renderer/platform/network/encoded_form_data.cc b/chromium/third_party/blink/renderer/platform/network/encoded_form_data.cc index cf91f10861c..1b660e6ffc9 100644 --- a/chromium/third_party/blink/renderer/platform/network/encoded_form_data.cc +++ b/chromium/third_party/blink/renderer/platform/network/encoded_form_data.cc @@ -21,6 +21,8 @@ #include "third_party/blink/renderer/platform/network/encoded_form_data.h" +#include "mojo/public/cpp/bindings/pending_remote.h" +#include "third_party/blink/renderer/platform/blob/blob_data.h" #include "third_party/blink/renderer/platform/file_metadata.h" #include "third_party/blink/renderer/platform/network/form_data_encoder.h" #include "third_party/blink/renderer/platform/network/wrapped_data_pipe_getter.h" @@ -59,11 +61,10 @@ FormDataElement::FormDataElement( : type_(kDataPipe), data_pipe_getter_(std::move(data_pipe_getter)) {} FormDataElement::FormDataElement(const FormDataElement&) = default; -FormDataElement::FormDataElement(FormDataElement&&) noexcept = default; +FormDataElement::FormDataElement(FormDataElement&&) = default; FormDataElement::~FormDataElement() = default; FormDataElement& FormDataElement::operator=(const FormDataElement&) = default; -FormDataElement& FormDataElement::operator=(FormDataElement&&) noexcept = - default; +FormDataElement& FormDataElement::operator=(FormDataElement&&) = default; bool operator==(const FormDataElement& a, const FormDataElement& b) { if (&a == &b) @@ -150,9 +151,10 @@ scoped_refptr EncodedFormData::DeepCopy() const { e.blob_uuid_.IsolatedCopy(), e.optional_blob_data_handle_)); break; case FormDataElement::kDataPipe: - network::mojom::blink::DataPipeGetterPtr data_pipe_getter; - (*e.data_pipe_getter_->GetPtr()) - ->Clone(mojo::MakeRequest(&data_pipe_getter)); + mojo::PendingRemote + data_pipe_getter; + e.data_pipe_getter_->GetDataPipeGetter()->Clone( + data_pipe_getter.InitWithNewPipeAndPassReceiver()); auto wrapped = base::MakeRefCounted( std::move(data_pipe_getter)); form_data->elements_.UncheckedAppend( diff --git a/chromium/third_party/blink/renderer/platform/network/encoded_form_data.h b/chromium/third_party/blink/renderer/platform/network/encoded_form_data.h index c950519f254..865f664dd07 100644 --- a/chromium/third_party/blink/renderer/platform/network/encoded_form_data.h +++ b/chromium/third_party/blink/renderer/platform/network/encoded_form_data.h @@ -30,7 +30,6 @@ #include #include "mojo/public/cpp/bindings/struct_traits.h" -#include "third_party/blink/renderer/platform/blob/blob_data.h" #include "third_party/blink/renderer/platform/weborigin/kurl.h" #include "third_party/blink/renderer/platform/wtf/allocator/allocator.h" #include "third_party/blink/renderer/platform/wtf/forward.h" @@ -62,12 +61,12 @@ class PLATFORM_EXPORT FormDataElement final { explicit FormDataElement(scoped_refptr); FormDataElement(const FormDataElement&); - FormDataElement(FormDataElement&&) noexcept; + FormDataElement(FormDataElement&&); ~FormDataElement(); FormDataElement& operator=(const FormDataElement&); - FormDataElement& operator=(FormDataElement&&) noexcept; + FormDataElement& operator=(FormDataElement&&); bool IsSafeToSendToAnotherThread() const; diff --git a/chromium/third_party/blink/renderer/platform/network/encoded_form_data_element_mojom_traits.cc b/chromium/third_party/blink/renderer/platform/network/encoded_form_data_element_mojom_traits.cc index 4e64779717c..0df4fbecb5a 100644 --- a/chromium/third_party/blink/renderer/platform/network/encoded_form_data_element_mojom_traits.cc +++ b/chromium/third_party/blink/renderer/platform/network/encoded_form_data_element_mojom_traits.cc @@ -11,6 +11,7 @@ #include "mojo/public/cpp/base/file_path_mojom_traits.h" #include "mojo/public/cpp/base/time_mojom_traits.h" #include "mojo/public/cpp/bindings/array_traits_wtf_vector.h" +#include "mojo/public/cpp/bindings/remote.h" #include "mojo/public/cpp/bindings/string_traits_wtf.h" #include "services/network/public/cpp/features.h" #include "services/network/public/mojom/data_pipe_getter.mojom-blink.h" @@ -66,29 +67,32 @@ StructTraits StructTraits< blink::mojom::FetchAPIDataElementDataView, blink::FormDataElement>::data_pipe_getter(const blink::FormDataElement& data) { if (data.type_ == blink::FormDataElement::kDataPipe) { if (!data.data_pipe_getter_) - return nullptr; - network::mojom::blink::DataPipeGetterPtr data_pipe_getter; - (*data.data_pipe_getter_->GetPtr()) - ->Clone(mojo::MakeRequest(&data_pipe_getter)); - return data_pipe_getter.PassInterface(); + return mojo::NullRemote(); + mojo::PendingRemote data_pipe_getter; + data.data_pipe_getter_->GetDataPipeGetter()->Clone( + data_pipe_getter.InitWithNewPipeAndPassReceiver()); + return data_pipe_getter; } if (data.type_ == blink::FormDataElement::kEncodedBlob) { if (data.optional_blob_data_handle_) { - blink::mojom::blink::BlobPtr blob_ptr(blink::mojom::blink::BlobPtrInfo( - data.optional_blob_data_handle_->CloneBlobRemote().PassPipe(), - blink::mojom::blink::Blob::Version_)); - network::mojom::blink::DataPipeGetterPtr data_pipe_getter_ptr; - blob_ptr->AsDataPipeGetter(MakeRequest(&data_pipe_getter_ptr)); - return data_pipe_getter_ptr.PassInterface(); + mojo::Remote blob_remote( + mojo::PendingRemote( + data.optional_blob_data_handle_->CloneBlobRemote().PassPipe(), + blink::mojom::blink::Blob::Version_)); + mojo::PendingRemote + data_pipe_getter_remote; + blob_remote->AsDataPipeGetter( + data_pipe_getter_remote.InitWithNewPipeAndPassReceiver()); + return data_pipe_getter_remote; } } - return nullptr; + return mojo::NullRemote(); } // static @@ -139,15 +143,13 @@ bool StructTraitstype_ = blink::FormDataElement::kDataPipe; - auto data_pipe_ptr_info = data.TakeDataPipeGetter< - network::mojom::blink::DataPipeGetterPtrInfo>(); - DCHECK(data_pipe_ptr_info.is_valid()); + auto data_pipe_ptr_remote = data.TakeDataPipeGetter< + mojo::PendingRemote>(); + DCHECK(data_pipe_ptr_remote.is_valid()); - network::mojom::blink::DataPipeGetterPtr data_pipe_getter; - data_pipe_getter.Bind(std::move(data_pipe_ptr_info)); out->data_pipe_getter_ = base::MakeRefCounted( - std::move(data_pipe_getter)); + std::move(data_pipe_ptr_remote)); break; } case network::mojom::DataElementType::kBlob: diff --git a/chromium/third_party/blink/renderer/platform/network/encoded_form_data_element_mojom_traits.h b/chromium/third_party/blink/renderer/platform/network/encoded_form_data_element_mojom_traits.h index 74c00ea5c7e..c81eef75fe8 100644 --- a/chromium/third_party/blink/renderer/platform/network/encoded_form_data_element_mojom_traits.h +++ b/chromium/third_party/blink/renderer/platform/network/encoded_form_data_element_mojom_traits.h @@ -5,7 +5,8 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_NETWORK_ENCODED_FORM_DATA_ELEMENT_MOJOM_TRAITS_H_ #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_NETWORK_ENCODED_FORM_DATA_ELEMENT_MOJOM_TRAITS_H_ -#include "services/network/public/mojom/url_loader.mojom-blink.h" +#include "mojo/public/cpp/bindings/pending_remote.h" +#include "services/network/public/mojom/url_loader.mojom-blink-forward.h" #include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom-blink.h" #include "third_party/blink/renderer/platform/network/encoded_form_data.h" @@ -27,12 +28,12 @@ struct PLATFORM_EXPORT StructTraits + data_pipe_getter(const blink::FormDataElement& data); - static network::mojom::blink::ChunkedDataPipeGetterPtrInfo + static mojo::PendingRemote chunked_data_pipe_getter(const blink::FormDataElement& data) { - return nullptr; + return mojo::NullRemote(); } static uint64_t offset(const blink::FormDataElement& data) { diff --git a/chromium/third_party/blink/renderer/platform/network/encoded_form_data_mojom_traits.h b/chromium/third_party/blink/renderer/platform/network/encoded_form_data_mojom_traits.h index 0a403da6821..07b98ae23b7 100644 --- a/chromium/third_party/blink/renderer/platform/network/encoded_form_data_mojom_traits.h +++ b/chromium/third_party/blink/renderer/platform/network/encoded_form_data_mojom_traits.h @@ -5,7 +5,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_NETWORK_ENCODED_FORM_DATA_MOJOM_TRAITS_H_ #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_NETWORK_ENCODED_FORM_DATA_MOJOM_TRAITS_H_ -#include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom-blink.h" +#include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom-blink-forward.h" #include "third_party/blink/renderer/platform/network/encoded_form_data.h" namespace mojo { diff --git a/chromium/third_party/blink/renderer/platform/network/encoded_form_data_test.cc b/chromium/third_party/blink/renderer/platform/network/encoded_form_data_test.cc index b333ac5410b..461380f721c 100644 --- a/chromium/third_party/blink/renderer/platform/network/encoded_form_data_test.cc +++ b/chromium/third_party/blink/renderer/platform/network/encoded_form_data_test.cc @@ -10,6 +10,7 @@ #include "mojo/public/cpp/base/file_path_mojom_traits.h" #include "mojo/public/cpp/base/time_mojom_traits.h" #include "mojo/public/cpp/bindings/array_traits_wtf_vector.h" +#include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/string_traits_wtf.h" #include "mojo/public/cpp/test_support/test_utils.h" #include "services/network/public/mojom/url_loader.mojom-blink.h" @@ -147,7 +148,7 @@ TEST_F(EncodedFormDataMojomTraitsTest, Roundtrips_FormDataElement) { mojo::MessagePipe pipe; original3.optional_blob_data_handle_ = BlobDataHandle::Create( original3.blob_uuid_, "type-test", 100, - mojom::blink::BlobPtrInfo(std::move(pipe.handle0), 0)); + mojo::PendingRemote(std::move(pipe.handle0), 0)); FormDataElement copied3; EXPECT_TRUE(mojo::test::SerializeAndDeserialize< blink::mojom::blink::FetchAPIDataElement>(&original3, &copied3)); @@ -155,8 +156,8 @@ TEST_F(EncodedFormDataMojomTraitsTest, Roundtrips_FormDataElement) { FormDataElement original4; original4.type_ = blink::FormDataElement::kDataPipe; - network::mojom::blink::DataPipeGetterPtr data_pipe_getter; - auto request = mojo::MakeRequest(&data_pipe_getter); + mojo::PendingRemote data_pipe_getter; + ignore_result(data_pipe_getter.InitWithNewPipeAndPassReceiver()); original4.data_pipe_getter_ = base::MakeRefCounted( std::move(data_pipe_getter)); diff --git a/chromium/third_party/blink/renderer/platform/network/http_parsers_test.cc b/chromium/third_party/blink/renderer/platform/network/http_parsers_test.cc index f6e9b52b6be..feee0ce34f6 100644 --- a/chromium/third_party/blink/renderer/platform/network/http_parsers_test.cc +++ b/chromium/third_party/blink/renderer/platform/network/http_parsers_test.cc @@ -8,7 +8,6 @@ #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/renderer/platform/heap/handle.h" #include "third_party/blink/renderer/platform/loader/fetch/resource_response.h" -#include "third_party/blink/renderer/platform/wtf/dtoa/utils.h" #include "third_party/blink/renderer/platform/wtf/math_extras.h" #include "third_party/blink/renderer/platform/wtf/text/atomic_string.h" diff --git a/chromium/third_party/blink/renderer/platform/network/network_state_notifier.h b/chromium/third_party/blink/renderer/platform/network/network_state_notifier.h index 3067328559b..4b686e1e360 100644 --- a/chromium/third_party/blink/renderer/platform/network/network_state_notifier.h +++ b/chromium/third_party/blink/renderer/platform/network/network_state_notifier.h @@ -362,9 +362,9 @@ class PLATFORM_EXPORT NetworkStateNotifier { double GetRandomMultiplier(const String& host) const; mutable Mutex mutex_; - NetworkState state_; - bool has_override_; - NetworkState override_; + NetworkState state_ GUARDED_BY(mutex_); + bool has_override_ GUARDED_BY(mutex_); + NetworkState override_ GUARDED_BY(mutex_); ObserverListMap connection_observers_; ObserverListMap on_line_state_observers_; diff --git a/chromium/third_party/blink/renderer/platform/network/wrapped_data_pipe_getter.h b/chromium/third_party/blink/renderer/platform/network/wrapped_data_pipe_getter.h index f50bf1467a1..96ee5dd39bd 100644 --- a/chromium/third_party/blink/renderer/platform/network/wrapped_data_pipe_getter.h +++ b/chromium/third_party/blink/renderer/platform/network/wrapped_data_pipe_getter.h @@ -7,6 +7,8 @@ #include "third_party/blink/renderer/platform/platform_export.h" +#include "mojo/public/cpp/bindings/pending_remote.h" +#include "mojo/public/cpp/bindings/remote.h" #include "services/network/public/mojom/data_pipe_getter.mojom-blink.h" namespace blink { @@ -18,16 +20,17 @@ class PLATFORM_EXPORT WrappedDataPipeGetter final : public RefCounted { public: explicit WrappedDataPipeGetter( - network::mojom::blink::DataPipeGetterPtr data_pipe_getter) + mojo::PendingRemote + data_pipe_getter) : data_pipe_getter_(std::move(data_pipe_getter)) {} ~WrappedDataPipeGetter() = default; - network::mojom::blink::DataPipeGetterPtr* GetPtr() { - return &data_pipe_getter_; + network::mojom::blink::DataPipeGetter* GetDataPipeGetter() { + return data_pipe_getter_.get(); } private: - network::mojom::blink::DataPipeGetterPtr data_pipe_getter_; + mojo::Remote data_pipe_getter_; }; } // namespace blink -- cgit v1.2.1