Refactor GestureNavigation to eliminate code redundancy

content/browser/web_contents/aura/overscroll_window_animation.cc

Index: content/browser/web_contents/aura/overscroll_window_animation.cc
diff --git a/content/browser/web_contents/aura/overscroll_window_animation.cc b/content/browser/web_contents/aura/overscroll_window_animation.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a56a47d472d6e39468696216d81bdf45d808f262
--- /dev/null
+++ b/content/browser/web_contents/aura/overscroll_window_animation.cc
@@ -0,0 +1,151 @@
+// Copyright (c) 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "content/browser/web_contents/aura/overscroll_window_animation.h"
+
+#include <algorithm>
+
+#include "base/i18n/rtl.h"
+#include "content/browser/web_contents/aura/shadow_layer_delegate.h"
+#include "content/browser/web_contents/web_contents_impl.h"
+#include "ui/aura/window.h"
+#include "ui/compositor/layer_animation_observer.h"
+#include "ui/compositor/scoped_layer_animation_settings.h"
+
+namespace content {
+
+namespace {
+
+OverscrollWindowAnimation::Direction GetDirectionForMode(OverscrollMode mode) {
+  if (mode == (base::i18n::IsRTL() ? OVERSCROLL_EAST : OVERSCROLL_WEST))
+    return OverscrollWindowAnimation::SLIDE_FRONT;
+  if (mode == (base::i18n::IsRTL() ? OVERSCROLL_WEST : OVERSCROLL_EAST))
+    return OverscrollWindowAnimation::SLIDE_BACK;
+  return OverscrollWindowAnimation::SLIDE_NONE;
+}
+
+}  // namespace
+
+OverscrollWindowAnimation::OverscrollWindowAnimation(Delegate* delegate)
+    : delegate_(delegate),
+      direction_(SLIDE_NONE),
+      overscroll_cancelled_(false) {
+  DCHECK(delegate_);
+}
+
+OverscrollWindowAnimation::~OverscrollWindowAnimation() {
+}
+
+void OverscrollWindowAnimation::CancelAnimation() {
+  ui::Layer* layer = GetFrontLayer();
+  ui::ScopedLayerAnimationSettings settings(layer->GetAnimator());
+  settings.SetPreemptionStrategy(
+      ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
+  settings.SetTweenType(gfx::Tween::EASE_OUT);
+  settings.AddObserver(this);
+  layer->SetTransform(gfx::Transform());
+  overscroll_cancelled_ = true;
+}
+
+float OverscrollWindowAnimation::GetTranslationForOverscroll(float delta_x) {
+  DCHECK(direction_ != SLIDE_NONE);
+  const float bounds_width = GetVisibleBounds().width();
+  if (direction_ == SLIDE_FRONT)
+    return std::max(-bounds_width, delta_x);
+  else
+    return std::min(bounds_width, delta_x);
+}
+
+gfx::Rect OverscrollWindowAnimation::GetVisibleBounds() const {
+  return delegate_->GetMainWindow()->bounds();
+}
+
+bool OverscrollWindowAnimation::OnOverscrollUpdate(float delta_x,
+                                                   float delta_y) {
+  if (direction_ == SLIDE_NONE)
+    return false;
+  gfx::Transform transform;
+  transform.Translate(GetTranslationForOverscroll(delta_x), 0);
+  GetFrontLayer()->SetTransform(transform);
+  return true;
+}
+
+void OverscrollWindowAnimation::OnImplicitAnimationsCompleted() {
+  if (overscroll_cancelled_) {
+    slide_window_.reset();
+    delegate_->OnOverscrollCancelled();
+    overscroll_cancelled_ = false;
+  } else {
+    delegate_->OnOverscrollCompleted(slide_window_.Pass());
+  }
+  direction_ = SLIDE_NONE;
+}
+
+void OverscrollWindowAnimation::OnOverscrollModeChange(
+    OverscrollMode old_mode,
+    OverscrollMode new_mode) {
+  Direction new_direction = GetDirectionForMode(new_mode);
+  if (new_direction == SLIDE_NONE) {
+    // The user cancelled the in progress animation.
+    if (is_active())
+      CancelAnimation();

[mfomitchev, 2015/04/07 21:07:38]

I think this method name is a bit confusing - we are not actually cancelling the
animation, we are cancelling the overscroll and starting the animation. Perhaps
call this CancelOverscroll() or CancelSlide()?

[Nina, 2015/04/08 13:35:20]

Renamed to CancelSlide.

+    return;
+  }
+  if (slide_window_)

[mfomitchev, 2015/04/07 21:07:38]

Use is_active() instead?

[Nina, 2015/04/08 13:35:20]

Done.

+    GetFrontLayer()->GetAnimator()->StopAnimating();
+  slide_window_ = new_direction == SLIDE_FRONT ? delegate_->CreateFrontWindow()
+                                               : delegate_->CreateBackWindow();
+  if (!slide_window_) {
+    // Cannot navigate, do not start the animation.
+    direction_ = SLIDE_NONE;
+    return;
+  }
+  overscroll_cancelled_ = false;
+  gfx::Rect bounds = gfx::Rect(GetVisibleBounds().size());
+
+  // Make sure the live window is in its default position.
+  delegate_->GetMainWindow()->SetTransform(gfx::Transform());
+  delegate_->GetMainWindow()->SetBounds(bounds);
+
+  if (new_direction == SLIDE_FRONT)
+    bounds.Offset(base::i18n::IsRTL() ? -bounds.width() : bounds.width(), 0);
+  slide_window_->SetBounds(bounds);

[mfomitchev, 2015/04/07 21:07:38]

Ugh, just noticed this. Why are we setting the bounds instead of setting the
transform? I remember I asked a similar question in ONO when we were resetting
the bounds to default, and we got rid of that code..

[Nina, 2015/04/08 13:35:20]

To simplify the transform logic - especially for parallax scrolling.
I modified the code as we discussed offline to make sure we do not set bounds on
the content window, and most of the bounds setting occurs before
aura::Window::Show().

+  direction_ = new_direction;
+  shadow_.reset(new ShadowLayerDelegate(GetFrontLayer()));
+}
+
+void OverscrollWindowAnimation::OnOverscrollComplete(
+    OverscrollMode overscroll_mode) {
+  if (!is_active())
+    return;
+  delegate_->OnOverscrollCompleting();
+  int content_width = GetVisibleBounds().width();
+  float translate_x;
+  if ((base::i18n::IsRTL() && direction_ == SLIDE_FRONT) ||
+      (!base::i18n::IsRTL() && direction_ == SLIDE_BACK)) {
+    translate_x = content_width;
+  } else {
+    translate_x = -content_width;
+  }
+  ui::Layer* layer = GetFrontLayer();
+  gfx::Transform transform;
+  transform.Translate(translate_x, 0);
+  ui::ScopedLayerAnimationSettings settings(layer->GetAnimator());
+  settings.SetPreemptionStrategy(
+      ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
+  settings.SetTweenType(gfx::Tween::EASE_OUT);
+  settings.AddObserver(this);
+  layer->SetTransform(transform);
+}
+
+ui::Layer* OverscrollWindowAnimation::GetFrontLayer() const {
+  DCHECK(direction_ != SLIDE_NONE);
+  if (direction_ == SLIDE_FRONT) {
+    DCHECK(slide_window_);
+    return slide_window_->layer();
+  }
+  return delegate_->GetMainWindow()->layer();
+}
+
+}  // namespace content