summaryrefslogtreecommitdiff
path: root/chromium/cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/cc')
-rw-r--r--chromium/cc/input/scrollbar_animation_controller.cc2
-rw-r--r--chromium/cc/input/single_scrollbar_animation_controller_thinning.cc2
-rw-r--r--chromium/cc/layers/mirror_layer_impl.h2
-rw-r--r--chromium/cc/metrics/frame_sequence_metrics.cc2
-rw-r--r--chromium/cc/metrics/video_playback_roughness_reporter.cc2
-rw-r--r--chromium/cc/paint/paint_op_buffer.h2
-rw-r--r--chromium/cc/tiles/gpu_image_decode_cache.cc2
7 files changed, 7 insertions, 7 deletions
diff --git a/chromium/cc/input/scrollbar_animation_controller.cc b/chromium/cc/input/scrollbar_animation_controller.cc
index 89861d68b4c..501e3d22836 100644
--- a/chromium/cc/input/scrollbar_animation_controller.cc
+++ b/chromium/cc/input/scrollbar_animation_controller.cc
@@ -160,7 +160,7 @@ bool ScrollbarAnimationController::Animate(base::TimeTicks now) {
float ScrollbarAnimationController::AnimationProgressAtTime(
base::TimeTicks now) {
const base::TimeDelta delta = now - last_awaken_time_;
- return base::ClampToRange(float{delta / fade_duration_}, 0.0f, 1.0f);
+ return base::ClampToRange(float(delta / fade_duration_), 0.0f, 1.0f);
}
void ScrollbarAnimationController::RunAnimationFrame(float progress) {
diff --git a/chromium/cc/input/single_scrollbar_animation_controller_thinning.cc b/chromium/cc/input/single_scrollbar_animation_controller_thinning.cc
index 75a458650f3..7e25420efdc 100644
--- a/chromium/cc/input/single_scrollbar_animation_controller_thinning.cc
+++ b/chromium/cc/input/single_scrollbar_animation_controller_thinning.cc
@@ -99,7 +99,7 @@ float SingleScrollbarAnimationControllerThinning::AnimationProgressAtTime(
return 1.0f;
const base::TimeDelta delta = now - last_awaken_time_;
- return base::ClampToRange(float{delta / thinning_duration_}, 0.0f, 1.0f);
+ return base::ClampToRange(float(delta / thinning_duration_), 0.0f, 1.0f);
}
void SingleScrollbarAnimationControllerThinning::RunAnimationFrame(
diff --git a/chromium/cc/layers/mirror_layer_impl.h b/chromium/cc/layers/mirror_layer_impl.h
index 54f5e14166c..fb2049659eb 100644
--- a/chromium/cc/layers/mirror_layer_impl.h
+++ b/chromium/cc/layers/mirror_layer_impl.h
@@ -55,7 +55,7 @@ class CC_EXPORT MirrorLayerImpl : public LayerImpl {
private:
const char* LayerTypeAsString() const override;
viz::CompositorRenderPassId mirrored_layer_render_pass_id() const {
- return viz::CompositorRenderPassId{mirrored_layer_id()};
+ return viz::CompositorRenderPassId(mirrored_layer_id());
}
int mirrored_layer_id_ = 0;
diff --git a/chromium/cc/metrics/frame_sequence_metrics.cc b/chromium/cc/metrics/frame_sequence_metrics.cc
index e79edb0a3c0..7f00deb1a7b 100644
--- a/chromium/cc/metrics/frame_sequence_metrics.cc
+++ b/chromium/cc/metrics/frame_sequence_metrics.cc
@@ -223,7 +223,7 @@ void FrameSequenceMetrics::ReportMetrics() {
.Run({
main_throughput_.frames_expected,
main_throughput_.frames_produced,
- jank_reporter_->jank_count(),
+ uint32_t(jank_reporter_->jank_count()),
});
main_throughput_ = {};
diff --git a/chromium/cc/metrics/video_playback_roughness_reporter.cc b/chromium/cc/metrics/video_playback_roughness_reporter.cc
index 69474ed3080..c3556df8c92 100644
--- a/chromium/cc/metrics/video_playback_roughness_reporter.cc
+++ b/chromium/cc/metrics/video_playback_roughness_reporter.cc
@@ -60,7 +60,7 @@ void VideoPlaybackRoughnessReporter::FrameSubmitted(
FrameInfo info;
info.token = token;
info.decode_time = frame.metadata()->decode_end_time;
- info.refresh_rate_hz = int{std::round(1.0 / render_interval.InSecondsF())};
+ info.refresh_rate_hz = int(std::lround(1.0 / render_interval.InSecondsF()));
info.size = frame.natural_size();
info.intended_duration = frame.metadata()->wallclock_frame_duration;
diff --git a/chromium/cc/paint/paint_op_buffer.h b/chromium/cc/paint/paint_op_buffer.h
index 57b1d8e4440..c0052d09744 100644
--- a/chromium/cc/paint/paint_op_buffer.h
+++ b/chromium/cc/paint/paint_op_buffer.h
@@ -1080,7 +1080,7 @@ class CC_PAINT_EXPORT PaintOpBuffer : public SkRefCnt {
uint16_t skip = static_cast<uint16_t>(ComputeOpSkip(sizeof(T)));
T* op = reinterpret_cast<T*>(AllocatePaintOp(skip));
- new (op) T{std::forward<Args>(args)...};
+ new (op) T(std::forward<Args>(args)...);
DCHECK_EQ(op->type, static_cast<uint32_t>(T::kType));
op->skip = skip;
AnalyzeAddedOp(op);
diff --git a/chromium/cc/tiles/gpu_image_decode_cache.cc b/chromium/cc/tiles/gpu_image_decode_cache.cc
index 016a7c4ba31..3d246efa630 100644
--- a/chromium/cc/tiles/gpu_image_decode_cache.cc
+++ b/chromium/cc/tiles/gpu_image_decode_cache.cc
@@ -3002,7 +3002,7 @@ sk_sp<SkImage> GpuImageDecodeCache::CreateImageFromYUVATexturesInternal(
DCHECK(uploaded_y_image);
DCHECK(uploaded_u_image);
DCHECK(uploaded_v_image);
- SkYUVAInfo yuva_info({image_width, image_height}, yuva_planar_config,
+ SkYUVAInfo yuva_info({int(image_width), int(image_height)}, yuva_planar_config,
yuv_color_space);
GrBackendTexture yuv_textures[3]{};
yuv_textures[0] = uploaded_y_image->getBackendTexture(false);