diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-02-05 12:39:29 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-02-10 09:24:48 +0000 |
commit | 54a7558b95b0247718b84ec07f20a1fc20df2b12 (patch) | |
tree | 479281ab8091b752b73c3a1bcde098130f5e9583 | |
parent | 59b69cbb9117841339033828d34a4c129aeeaf35 (diff) | |
download | qtwebengine-chromium-54a7558b95b0247718b84ec07f20a1fc20df2b12.tar.gz |
FIXUP: Fix misuse of {} initialization
Change-Id: I6258eb787076c149d9cc0d811e69476e0de7366e
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
8 files changed, 15 insertions, 15 deletions
diff --git a/chromium/base/task/sequence_manager/task_queue_selector.h b/chromium/base/task/sequence_manager/task_queue_selector.h index 4a491ca4dc1..d9b2696f786 100644 --- a/chromium/base/task/sequence_manager/task_queue_selector.h +++ b/chromium/base/task/sequence_manager/task_queue_selector.h @@ -288,7 +288,7 @@ class BASE_EXPORT TaskQueueSelector : public WorkQueueSets::Observer { 0, // kVeryHighPriority - kMaxVeryHighPriorityStarvationScore, + int64_t(kMaxVeryHighPriorityStarvationScore), // kHighPriority int64_t(kMaxHighPriorityStarvationScore), diff --git a/chromium/components/pdf/renderer/pdf_ax_action_target.cc b/chromium/components/pdf/renderer/pdf_ax_action_target.cc index fb996a2fc2d..6c5a5df4a32 100644 --- a/chromium/components/pdf/renderer/pdf_ax_action_target.cc +++ b/chromium/components/pdf/renderer/pdf_ax_action_target.cc @@ -140,10 +140,10 @@ bool PdfAXActionTarget::ScrollToMakeVisibleWithSubFocus( pdf_action_data.vertical_scroll_alignment = ConvertAXScrollToPdfScrollAlignment(vertical_scroll_alignment); pdf_action_data.target_rect = { - {target_plugin_node_.data().relative_bounds.bounds.x(), - target_plugin_node_.data().relative_bounds.bounds.y()}, - {target_plugin_node_.data().relative_bounds.bounds.width(), - target_plugin_node_.data().relative_bounds.bounds.height()}}; + {int32_t(target_plugin_node_.data().relative_bounds.bounds.x()), + int32_t(target_plugin_node_.data().relative_bounds.bounds.y())}, + {int32_t(target_plugin_node_.data().relative_bounds.bounds.width()), + int32_t(target_plugin_node_.data().relative_bounds.bounds.height())}}; pdf_accessibility_tree_source_->HandleAction(pdf_action_data); return true; } diff --git a/chromium/device/fido/win/type_conversions.cc b/chromium/device/fido/win/type_conversions.cc index 4adc96f7290..fb595bce363 100644 --- a/chromium/device/fido/win/type_conversions.cc +++ b/chromium/device/fido/win/type_conversions.cc @@ -169,7 +169,7 @@ std::vector<WEBAUTHN_CREDENTIAL> ToWinCredentialVector( } result.push_back(WEBAUTHN_CREDENTIAL{ WEBAUTHN_CREDENTIAL_CURRENT_VERSION, - credential.id().size(), + DWORD(credential.id().size()), const_cast<unsigned char*>(credential.id().data()), WEBAUTHN_CREDENTIAL_TYPE_PUBLIC_KEY, }); @@ -185,7 +185,7 @@ std::vector<WEBAUTHN_CREDENTIAL_EX> ToWinCredentialExVector( continue; } result.push_back(WEBAUTHN_CREDENTIAL_EX{ - WEBAUTHN_CREDENTIAL_EX_CURRENT_VERSION, credential.id().size(), + WEBAUTHN_CREDENTIAL_EX_CURRENT_VERSION, DWORD(credential.id().size()), const_cast<unsigned char*>(credential.id().data()), WEBAUTHN_CREDENTIAL_TYPE_PUBLIC_KEY, ToWinTransportsMask(credential.transports())}); diff --git a/chromium/device/gamepad/dualshock4_controller.cc b/chromium/device/gamepad/dualshock4_controller.cc index 5bc356eb315..7671ff75aa3 100644 --- a/chromium/device/gamepad/dualshock4_controller.cc +++ b/chromium/device/gamepad/dualshock4_controller.cc @@ -245,8 +245,8 @@ void Dualshock4Controller::SetVibrationBluetooth(double strong_magnitude, control_report[2] = 0x20; // unknown control_report[3] = 0xf1; // motor only, don't update LEDs control_report[4] = 0x04; // unknown - control_report[6] = uint8_t{weak_magnitude * kRumbleMagnitudeMax}; - control_report[7] = uint8_t{strong_magnitude * kRumbleMagnitudeMax}; + control_report[6] = uint8_t(weak_magnitude * kRumbleMagnitudeMax); + control_report[7] = uint8_t(strong_magnitude * kRumbleMagnitudeMax); control_report[21] = 0x43; // volume left control_report[22] = 0x43; // volume right control_report[24] = 0x4d; // volume speaker diff --git a/chromium/extensions/browser/blob_reader.cc b/chromium/extensions/browser/blob_reader.cc index d311c704af1..5a0f73c540a 100644 --- a/chromium/extensions/browser/blob_reader.cc +++ b/chromium/extensions/browser/blob_reader.cc @@ -22,7 +22,7 @@ void BlobReader::Read(content::BrowserContext* browser_context, CHECK_GT(length, 0); CHECK_LE(offset, std::numeric_limits<int64_t>::max() - length); - base::Optional<Range> range = Range{offset, length}; + base::Optional<Range> range = Range{uint64_t(offset), uint64_t(length)}; Read(browser_context, blob_uuid, std::move(callback), std::move(range)); } diff --git a/chromium/third_party/blink/renderer/modules/hid/hid_report_item.cc b/chromium/third_party/blink/renderer/modules/hid/hid_report_item.cc index 514b4c2f0aa..89ec72c40e5 100644 --- a/chromium/third_party/blink/renderer/modules/hid/hid_report_item.cc +++ b/chromium/third_party/blink/renderer/modules/hid/hid_report_item.cc @@ -67,7 +67,7 @@ int8_t UnitFactorExponentToInt(uint8_t unit_factor_exponent) { DCHECK_LE(unit_factor_exponent, 0x0f); // Values from 0x08 to 0x0f encode negative exponents. if (unit_factor_exponent > 0x08) - return int8_t{unit_factor_exponent} - 16; + return int8_t(unit_factor_exponent) - 16; return unit_factor_exponent; } diff --git a/chromium/third_party/blink/renderer/platform/audio/dynamics_compressor_kernel.cc b/chromium/third_party/blink/renderer/platform/audio/dynamics_compressor_kernel.cc index daec0eceb54..bf03c7d394e 100644 --- a/chromium/third_party/blink/renderer/platform/audio/dynamics_compressor_kernel.cc +++ b/chromium/third_party/blink/renderer/platform/audio/dynamics_compressor_kernel.cc @@ -62,8 +62,8 @@ DynamicsCompressorKernel::DynamicsCompressorKernel(float sample_rate, Reset(); metering_release_k_ = - float{audio_utilities::DiscreteTimeConstantForSampleRate( - kMeteringReleaseTimeConstant, sample_rate)}; + float(audio_utilities::DiscreteTimeConstantForSampleRate( + kMeteringReleaseTimeConstant, sample_rate)); } void DynamicsCompressorKernel::SetNumberOfChannels( diff --git a/chromium/third_party/blink/renderer/platform/graphics/dark_mode_generic_classifier.cc b/chromium/third_party/blink/renderer/platform/graphics/dark_mode_generic_classifier.cc index f14ba3721b8..06f7a14ffaa 100644 --- a/chromium/third_party/blink/renderer/platform/graphics/dark_mode_generic_classifier.cc +++ b/chromium/third_party/blink/renderer/platform/graphics/dark_mode_generic_classifier.cc @@ -37,9 +37,9 @@ DarkModeClassification ClassifyUsingDecisionTree( // the vector. Do not change the order here without also changing the neural // network code! Vector<float> ToVector(const DarkModeImageClassifier::Features& features) { - return {features.is_colorful, features.color_buckets_ratio, + return {float(features.is_colorful), features.color_buckets_ratio, features.transparency_ratio, features.background_ratio, - features.is_svg}; + float(features.is_svg)}; } } // namespace |