Refactoring to make adding ink drop animations easier

ui/views/view.cc

 // Copyright (c) 2012 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.
 
 #define _USE_MATH_DEFINES // For VC++ to get M_PI. This has to be first.
 
 #include "ui/views/view.h"
 
 #include <algorithm>
 #include <cmath>
@@ skipping 21 matching lines @@
 #include "ui/gfx/geometry/point3_f.h"
 #include "ui/gfx/geometry/point_conversions.h"
 #include "ui/gfx/interpolated_transform.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/scoped_canvas.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/transform.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/accessibility/native_view_accessibility.h"
+#include "ui/views/animation/ink_drop_delegate.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/context_menu_controller.h"
 #include "ui/views/drag_controller.h"
 #include "ui/views/focus/view_storage.h"
 #include "ui/views/layout/layout_manager.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/native_widget_private.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/tooltip_manager.h"
@@ skipping 459 matching lines @@
   // just propagate the Layout() call down the hierarchy, so whoever receives
   // the call can take appropriate action.
   for (int i = 0, count = child_count(); i < count; ++i) {
     View* child = child_at(i);
     if (child->needs_layout_ || !layout_manager_.get()) {
       TRACE_EVENT1("views", "View::Layout", "class", child->GetClassName());
       child->needs_layout_ = false;
       child->Layout();
     }
   }
+
+  InkDropDelegate* ink_drop_delegate = GetInkDropDelegate();
+  if (ink_drop_delegate)
+    ink_drop_delegate->Layout();
 }
 
 void View::InvalidateLayout() {
   // Always invalidate up. This is needed to handle the case of us already being
   // valid, but not our parent.
   needs_layout_ = true;
   if (parent_)
     parent_->InvalidateLayout();
 }
 
@@ skipping 477 matching lines @@
 }
 
 void View::OnScrollEvent(ui::ScrollEvent* event) {
 }
 
 void View::OnTouchEvent(ui::TouchEvent* event) {
   NOTREACHED() << "Views should not receive touch events.";
 }
 
 void View::OnGestureEvent(ui::GestureEvent* event) {
+  InkDropDelegate* ink_drop_delegate = GetInkDropDelegate();
+  if (ink_drop_delegate)
+    ink_drop_delegate->OnGestureEvent(*event);
 }
 
 const ui::InputMethod* View::GetInputMethod() const {
   Widget* widget = const_cast<Widget*>(GetWidget());
   return widget ? const_cast<const ui::InputMethod*>(widget->GetInputMethod())
                 : nullptr;
 }
 
 scoped_ptr<ViewTargeter>
 View::SetEventTargeter(scoped_ptr<ViewTargeter> targeter) {
@@ skipping 219 matching lines @@
 }
 
 void View::OnDragExited() {
 }
 
 int View::OnPerformDrop(const ui::DropTargetEvent& event) {
   return ui::DragDropTypes::DRAG_NONE;
 }
 
 void View::OnDragDone() {
+  InkDropDelegate* ink_drop_delegate = GetInkDropDelegate();
+  if (ink_drop_delegate)
+    ink_drop_delegate->OnActionComplete();
 }
 
 // static
 bool View::ExceededDragThreshold(const gfx::Vector2d& delta) {
   return (abs(delta.x()) > GetHorizontalDragThreshold() ||
           abs(delta.y()) > GetVerticalDragThreshold());
 }
 
 // Accessibility----------------------------------------------------------------
 
@@ skipping 245 matching lines @@
     // Iterate backwards through the children so that a child with a layer
     // which is further to the back is stacked above one which is further to
     // the front.
     for (Views::reverse_iterator it(children_.rbegin());
          it != children_.rend(); ++it) {
       (*it)->ReorderChildLayers(parent_layer);
     }
   }
 }
 
+// Animations ----------------------------------------------------------------
+
+InkDropDelegate* View::GetInkDropDelegate() const {
+  return nullptr;
+}
+
 // Input -----------------------------------------------------------------------
 
 View::DragInfo* View::GetDragInfo() {
   return parent_ ? parent_->GetDragInfo() : NULL;
 }
 
 // Focus -----------------------------------------------------------------------
 
 void View::OnFocus() {
   // TODO(beng): Investigate whether it's possible for us to move this to
@@ skipping 822 matching lines @@
   // Message the RootView to do the drag and drop. That way if we're removed
   // the RootView can detect it and avoid calling us back.
   gfx::Point widget_location(event.location());
   ConvertPointToWidget(this, &widget_location);
   widget->RunShellDrag(this, data, widget_location, drag_operations, source);
   // WARNING: we may have been deleted.
   return true;
 }
 
 }  // namespace views