Commit 311b7cca authored by Alan Cutter's avatar Alan Cutter Committed by Commit Bot

Quick fix for broken compositor driven UI animations on Chrome OS

This CL disables AnimationDelegateViews from using the compositor driven
CompositorAnimationRunner in favour of the legacy base::RepeatingTimer
driven runner.

We are disabling this due to the ui::Compositor sometimes going away
during the browser window's lifetime on Chrome OS resulting in animations
not running anymore.

Bug: 969788
Change-Id: If2a029764dd471eb91aadd4030f576c3604a6636
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1715358
Commit-Queue: Allen Bauer <kylixrd@chromium.org>
Reviewed-by: default avatarAllen Bauer <kylixrd@chromium.org>
Auto-Submit: Alan Cutter <alancutter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#681357}
parent c1de3c48
...@@ -56,6 +56,12 @@ void AnimationDelegateViews::AnimationContainerShuttingDown( ...@@ -56,6 +56,12 @@ void AnimationDelegateViews::AnimationContainerShuttingDown(
} }
void AnimationDelegateViews::UpdateAnimationRunner() { void AnimationDelegateViews::UpdateAnimationRunner() {
#if defined(OS_CHROMEOS)
// TODO(crbug.com/969788): Re-enable this function with better ui::Compositor
// switching support.
return;
#endif // defined(OS_CHROMEOS)
if (!container_) if (!container_)
return; return;
......
...@@ -15,7 +15,14 @@ namespace test { ...@@ -15,7 +15,14 @@ namespace test {
using CompositorAnimationRunnerTest = WidgetTest; using CompositorAnimationRunnerTest = WidgetTest;
TEST_F(CompositorAnimationRunnerTest, BasicCoverageTest) { // TODO(crbug.com/969788): Re-enable CompositorAnimationRunner with better
// ui::Compositor switching support.
#if defined(OS_CHROMEOS)
#define MAYBE_BasicCoverageTest DISABLED_BasicCoverageTest
#else
#define MAYBE_BasicCoverageTest BasicCoverageTest
#endif
TEST_F(CompositorAnimationRunnerTest, MAYBE_BasicCoverageTest) {
WidgetAutoclosePtr widget(CreateTopLevelPlatformWidget()); WidgetAutoclosePtr widget(CreateTopLevelPlatformWidget());
widget->Show(); widget->Show();
......
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