Commit 7092ef34 authored by Morten Stenshorne's avatar Morten Stenshorne Committed by Commit Bot

Compile core/animation/ with -Wshadow.

Bug: 294205
Change-Id: If049d3c91d14c023d1363e27a33f0881c7e1646a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2460892Reviewed-by: default avatarKevin Ellis <kevers@chromium.org>
Commit-Queue: Morten Stenshorne <mstensho@chromium.org>
Cr-Commit-Position: refs/heads/master@{#815218}
parent af69de90
...@@ -19,6 +19,8 @@ buildflag_header("buildflags") { ...@@ -19,6 +19,8 @@ buildflag_header("buildflags") {
} }
blink_core_sources("animation") { blink_core_sources("animation") {
configs += [ "//build/config/compiler:noshadowing" ]
sources = [ sources = [
"animatable.cc", "animatable.cc",
"animatable.h", "animatable.h",
......
...@@ -927,7 +927,8 @@ void CSSAnimations::MaybeApplyPendingUpdate(Element* element) { ...@@ -927,7 +927,8 @@ void CSSAnimations::MaybeApplyPendingUpdate(Element* element) {
// After cancellation, transitions must be downgraded or they'll fail // After cancellation, transitions must be downgraded or they'll fail
// to be considered when retriggering themselves. This can happen if // to be considered when retriggering themselves. This can happen if
// the transition is captured through getAnimations then played. // the transition is captured through getAnimations then played.
if (auto* effect = DynamicTo<KeyframeEffect>(animation->effect())) effect = DynamicTo<KeyframeEffect>(animation->effect());
if (effect)
effect->DowngradeToNormal(); effect->DowngradeToNormal();
animation->Update(kTimingUpdateOnDemand); animation->Update(kTimingUpdateOnDemand);
} }
......
...@@ -167,11 +167,11 @@ Timing::CalculatedTiming Timing::CalculateTimings( ...@@ -167,11 +167,11 @@ Timing::CalculatedTiming Timing::CalculateTimings(
local_time, current_phase, *this); local_time, current_phase, *this);
base::Optional<double> progress; base::Optional<double> progress;
const double iteration_duration = IterationDuration().InSecondsF(); const double local_iteration_duration = IterationDuration().InSecondsF();
const base::Optional<double> overall_progress = const base::Optional<double> overall_progress = CalculateOverallProgress(
CalculateOverallProgress(current_phase, active_time, iteration_duration, current_phase, active_time, local_iteration_duration, iteration_count,
iteration_count, iteration_start); iteration_start);
const base::Optional<double> simple_iteration_progress = const base::Optional<double> simple_iteration_progress =
CalculateSimpleIterationProgress(current_phase, overall_progress, CalculateSimpleIterationProgress(current_phase, overall_progress,
iteration_start, active_time, iteration_start, active_time,
...@@ -191,21 +191,21 @@ Timing::CalculatedTiming Timing::CalculateTimings( ...@@ -191,21 +191,21 @@ Timing::CalculatedTiming Timing::CalculateTimings(
AnimationTimeDelta time_to_next_iteration = AnimationTimeDelta::Max(); AnimationTimeDelta time_to_next_iteration = AnimationTimeDelta::Max();
// Conditionally compute the time to next iteration, which is only // Conditionally compute the time to next iteration, which is only
// applicable if the iteration duration is non-zero. // applicable if the iteration duration is non-zero.
if (iteration_duration) { if (local_iteration_duration) {
const double start_offset = const double start_offset =
MultiplyZeroAlwaysGivesZero(iteration_start, iteration_duration); MultiplyZeroAlwaysGivesZero(iteration_start, local_iteration_duration);
DCHECK_GE(start_offset, 0); DCHECK_GE(start_offset, 0);
const base::Optional<AnimationTimeDelta> offset_active_time = const base::Optional<AnimationTimeDelta> offset_active_time =
CalculateOffsetActiveTime(active_duration, active_time, start_offset); CalculateOffsetActiveTime(active_duration, active_time, start_offset);
const base::Optional<AnimationTimeDelta> iteration_time = const base::Optional<AnimationTimeDelta> iteration_time =
CalculateIterationTime(iteration_duration, active_duration, CalculateIterationTime(local_iteration_duration, active_duration,
offset_active_time, start_offset, current_phase, offset_active_time, start_offset, current_phase,
*this); *this);
if (iteration_time) { if (iteration_time) {
// active_time cannot be null if iteration_time is not null. // active_time cannot be null if iteration_time is not null.
DCHECK(active_time); DCHECK(active_time);
time_to_next_iteration = time_to_next_iteration =
AnimationTimeDelta::FromSecondsD(iteration_duration) - AnimationTimeDelta::FromSecondsD(local_iteration_duration) -
iteration_time.value(); iteration_time.value();
if (AnimationTimeDelta::FromSecondsD(active_duration) - if (AnimationTimeDelta::FromSecondsD(active_duration) -
active_time.value() < active_time.value() <
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment