diff options
| author | Tamas Zakor <ztamas@inf.u-szeged.hu> | 2020-07-15 15:58:44 +0200 |
|---|---|---|
| committer | Tamas Zakor <ztamas@inf.u-szeged.hu> | 2020-07-24 07:32:26 +0000 |
| commit | d61a4348c475ab6867334ef3ab4b5709cae15bb2 (patch) | |
| tree | 317dcb2ea3067ad35ac484bf5d6720fb086afa6c | |
| parent | 52367e8e7534f945e1c2c9e305c75aea7d9424f1 (diff) | |
| download | qtwebengine-chromium-d61a4348c475ab6867334ef3ab4b5709cae15bb2.tar.gz | |
Fix WebAuth build
- Enable typemaps.gni for WebAuth.
- Workaround a gcc 6 compiler error when flat_map is uncopyable.
- Also fix the build with gcc 6 and gcc 7.
Task-number: QTBUG-54720
Task-number: QTBUG-85117
Change-Id: If73ce3fccdb7fc3dc2cddd39bba998f51956e45a
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
4 files changed, 10 insertions, 4 deletions
diff --git a/chromium/base/containers/flat_map.h b/chromium/base/containers/flat_map.h index 41682d5958d..8fbf554b38f 100644 --- a/chromium/base/containers/flat_map.h +++ b/chromium/base/containers/flat_map.h @@ -240,6 +240,12 @@ class flat_map : public ::base::internal::flat_tree< friend void swap(flat_map& lhs, flat_map& rhs) noexcept { lhs.swap(rhs); } }; + +#if defined(__GNUC__) && !defined(__clang__) && __GNUC__ <= 7 +template <typename... T> +struct is_trivially_copy_constructible<flat_map<T...>> : std::false_type {}; +#endif + // ---------------------------------------------------------------------------- // Lifetime. diff --git a/chromium/device/fido/bio/enrollment.cc b/chromium/device/fido/bio/enrollment.cc index 981c4397ca2..a1749e35d06 100644 --- a/chromium/device/fido/bio/enrollment.cc +++ b/chromium/device/fido/bio/enrollment.cc @@ -131,7 +131,7 @@ base::Optional<BioEnrollmentResponse> BioEnrollmentResponse::Parse( BioEnrollmentResponse response; if (!cbor_response || !cbor_response->is_map()) { - return response; + return base::make_optional<BioEnrollmentResponse>(std::move(response)); } const auto& response_map = cbor_response->GetMap(); @@ -252,7 +252,7 @@ base::Optional<BioEnrollmentResponse> BioEnrollmentResponse::Parse( response.template_infos = std::move(template_infos); } - return std::move(response); + return base::make_optional<BioEnrollmentResponse>(std::move(response)); } BioEnrollmentResponse::BioEnrollmentResponse() = default; diff --git a/chromium/device/fido/cable/fido_cable_discovery.cc b/chromium/device/fido/cable/fido_cable_discovery.cc index aa130900be2..ac8a4b4b099 100644 --- a/chromium/device/fido/cable/fido_cable_discovery.cc +++ b/chromium/device/fido/cable/fido_cable_discovery.cc @@ -348,7 +348,7 @@ FidoCableDiscovery::CreateHandshakeHandler( return base::nullopt; } - return handler; + return base::make_optional<std::unique_ptr<FidoCableHandshakeHandler> >(std::move(handler)); } void FidoCableDiscovery::DeviceAdded(BluetoothAdapter* adapter, diff --git a/chromium/mojo/public/tools/bindings/chromium_bindings_configuration.gni b/chromium/mojo/public/tools/bindings/chromium_bindings_configuration.gni index 1ad43c69c92..35840baac15 100644 --- a/chromium/mojo/public/tools/bindings/chromium_bindings_configuration.gni +++ b/chromium/mojo/public/tools/bindings/chromium_bindings_configuration.gni @@ -18,7 +18,7 @@ _typemap_imports = [ "//components/chromeos_camera/common/typemaps.gni", "//components/sync/mojom/typemaps.gni", "//components/typemaps.gni", -# "//content/browser/typemaps.gni", + "//content/browser/typemaps.gni", "//content/common/typemaps.gni", "//content/public/common/typemaps.gni", "//device/bluetooth/public/mojom/typemaps.gni", |