diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-04-27 11:09:20 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-12-13 16:44:06 +0100 |
commit | 3290eb564dd9a0f420ee2d688101ebd9aa2209db (patch) | |
tree | 2f9c7522ee4b8f9120d56e4f9a064cdf89f81767 /chromium/third_party | |
parent | 5394daee1e902fc393bb08a96cfc8a3b62c66f28 (diff) | |
download | qtwebengine-chromium-3290eb564dd9a0f420ee2d688101ebd9aa2209db.tar.gz |
Fix building on macOS with Xcode
Fixes various issues were we differ from Google's clang.
Task-number: QTBUG-60438
Change-Id: I5a97ba828f7267731e50010c4345caa19bb8939a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/third_party')
8 files changed, 12 insertions, 8 deletions
diff --git a/chromium/third_party/blink/renderer/bindings/core/v8/referrer_script_info.h b/chromium/third_party/blink/renderer/bindings/core/v8/referrer_script_info.h index 0119624a028..f323657b69b 100644 --- a/chromium/third_party/blink/renderer/bindings/core/v8/referrer_script_info.h +++ b/chromium/third_party/blink/renderer/bindings/core/v8/referrer_script_info.h @@ -23,7 +23,7 @@ class CORE_EXPORT ReferrerScriptInfo { STACK_ALLOCATED(); public: - ReferrerScriptInfo() {} + ReferrerScriptInfo() : nonce_() {} ReferrerScriptInfo(const KURL& base_url, network::mojom::CredentialsMode credentials_mode, const String& nonce, diff --git a/chromium/third_party/blink/renderer/modules/indexeddb/idb_transaction.cc b/chromium/third_party/blink/renderer/modules/indexeddb/idb_transaction.cc index bcc266d7574..25094e9d23d 100644 --- a/chromium/third_party/blink/renderer/modules/indexeddb/idb_transaction.cc +++ b/chromium/third_party/blink/renderer/modules/indexeddb/idb_transaction.cc @@ -131,6 +131,7 @@ IDBTransaction::IDBTransaction( open_db_request_(open_db_request), mode_(mojom::IDBTransactionMode::VersionChange), durability_(mojom::IDBTransactionDurability::Default), + scope_(), state_(kInactive), old_database_metadata_(old_metadata), event_queue_( diff --git a/chromium/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler.cc b/chromium/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler.cc index 58168b98601..933c96ca6bc 100644 --- a/chromium/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler.cc +++ b/chromium/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler.cc @@ -1775,7 +1775,7 @@ RTCPeerConnectionHandler::AddTrack( ->IncrementStreamCounter(); } } - return platform_transceiver; + return std::unique_ptr<RTCRtpTransceiverPlatform>(platform_transceiver.release()); } void RTCPeerConnectionHandler::AddTrackOnSignalingThread( @@ -1849,7 +1849,7 @@ RTCPeerConnectionHandler::RemoveTrack(blink::RTCRtpSenderPlatform* web_sender) { } std::unique_ptr<RTCRtpTransceiverPlatform> platform_transceiver = std::move(transceiver); - return platform_transceiver; + return std::unique_ptr<RTCRtpTransceiverPlatform>(platform_transceiver.release()); } void RTCPeerConnectionHandler::RemoveTrackOnSignalingThread( diff --git a/chromium/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc b/chromium/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc index 86f6bd5953e..7c106b87568 100644 --- a/chromium/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc +++ b/chromium/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc @@ -1201,7 +1201,7 @@ cc::ImageHeaderMetadata JPEGImageDecoder::MakeMetadataForDecodeAcceleration() // If you need a specific implementation for other J_COLOR_SPACE values, // please add a full template specialization for this function below. template <J_COLOR_SPACE colorSpace> -void SetPixel(ImageFrame::PixelData*, JSAMPARRAY samples, int column) = delete; +void SetPixel(ImageFrame::PixelData*, JSAMPARRAY samples, int column); // Used only for debugging with libjpeg (instead of libjpeg-turbo). template <> diff --git a/chromium/third_party/blink/renderer/platform/loader/fetch/script_fetch_options.h b/chromium/third_party/blink/renderer/platform/loader/fetch/script_fetch_options.h index 2394ce624ab..1b77b50ebc6 100644 --- a/chromium/third_party/blink/renderer/platform/loader/fetch/script_fetch_options.h +++ b/chromium/third_party/blink/renderer/platform/loader/fetch/script_fetch_options.h @@ -41,7 +41,10 @@ class PLATFORM_EXPORT ScriptFetchOptions final { // string, parser metadata is "not-parser-inserted", credentials mode is // "same-origin", and referrer policy is the empty string." [spec text] ScriptFetchOptions() - : parser_state_(ParserDisposition::kNotParserInserted), + : nonce_(), + integrity_metadata_(), + integrity_attribute_(), + parser_state_(ParserDisposition::kNotParserInserted), credentials_mode_(network::mojom::CredentialsMode::kSameOrigin), referrer_policy_(network::mojom::ReferrerPolicy::kDefault), fetch_priority_hint_(mojom::blink::FetchPriorityHint::kAuto) {} diff --git a/chromium/third_party/blink/renderer/platform/media/url_index.cc b/chromium/third_party/blink/renderer/platform/media/url_index.cc index fa203d693e3..f908c39b0df 100644 --- a/chromium/third_party/blink/renderer/platform/media/url_index.cc +++ b/chromium/third_party/blink/renderer/platform/media/url_index.cc @@ -37,7 +37,7 @@ std::unique_ptr<MultiBuffer::DataProvider> ResourceMultiBuffer::CreateWriter( auto writer = std::make_unique<ResourceMultiBufferDataProvider>( url_data_, pos, is_client_audio_element, task_runner_); writer->Start(); - return writer; + return std::move(writer); } bool ResourceMultiBuffer::RangeSupported() const { diff --git a/chromium/third_party/blink/renderer/platform/wtf/text/wtf_string.h b/chromium/third_party/blink/renderer/platform/wtf/text/wtf_string.h index aeadc11b699..961d2b10431 100644 --- a/chromium/third_party/blink/renderer/platform/wtf/text/wtf_string.h +++ b/chromium/third_party/blink/renderer/platform/wtf/text/wtf_string.h @@ -60,7 +60,7 @@ class WTF_EXPORT String { public: // Construct a null string, distinguishable from an empty string. - String() = default; + String() {} // Construct a string with UTF-16 data. String(const UChar* characters, unsigned length); diff --git a/chromium/third_party/webrtc/modules/desktop_capture/screen_capturer_darwin.mm b/chromium/third_party/webrtc/modules/desktop_capture/screen_capturer_darwin.mm index d5a7bb0522b..72b7661ab07 100644 --- a/chromium/third_party/webrtc/modules/desktop_capture/screen_capturer_darwin.mm +++ b/chromium/third_party/webrtc/modules/desktop_capture/screen_capturer_darwin.mm @@ -27,7 +27,7 @@ std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawScreenCapturer( return nullptr; } - return capturer; + return std::move(capturer); } } // namespace webrtc |