[ash-md] Added different highlighting modes to the InkDropImpl.

ui/views/animation/ink_drop_host_view.h

 // Copyright 2016 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.
 
 #ifndef UI_VIEWS_ANIMATION_INK_DROP_HOST_VIEW_H_
 #define UI_VIEWS_ANIMATION_INK_DROP_HOST_VIEW_H_
 
 #include <memory>
 
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/views/animation/ink_drop.h"
 #include "ui/views/animation/ink_drop_host.h"
 #include "ui/views/view.h"
 
 namespace views {
 
 namespace test {
 class InkDropHostViewTestApi;
 }  // namespace test
 
 class InkDropRipple;
 class InkDropHighlight;
+class InkDropImpl;
 
 // A view that provides InkDropHost functionality.
 class VIEWS_EXPORT InkDropHostView : public View, public InkDropHost {
  public:
   InkDropHostView();
   ~InkDropHostView() override;
 
   // Overridden from InkDropHost:
   void AddInkDropLayer(ui::Layer* ink_drop_layer) override;
   void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override;
+  std::unique_ptr<InkDrop> CreateInkDrop() override;
   std::unique_ptr<InkDropRipple> CreateInkDropRipple() const override;
   std::unique_ptr<InkDropHighlight> CreateInkDropHighlight() const override;
 
-  void set_ink_drop_size(const gfx::Size& size) { ink_drop_size_ = size; }
-
  protected:
   // Used in SetInkDropMode() to specify whether the ink drop effect is enabled
   // or not for the view. In case of having an ink drop, it also specifies
   // whether the default gesture event handler for the ink drop should be
   // installed or the subclass will handle gesture events itself.
   enum class InkDropMode {
     OFF,
     ON,
     ON_NO_GESTURE_HANDLER,
   };
 
+  static gfx::Size CalculateLargeInkDropSize(const gfx::Size small_size);

[sky, 2016/11/02 02:52:11]

const gfx::Size&

[bruthig, 2016/11/04 18:50:36]

Done.

+
   static const int kInkDropSmallCornerRadius;
+  static const int kInkDropLargeCornerRadius;

[sky, 2016/11/02 02:52:11]

constants before functions.

[bruthig, 2016/11/04 18:50:36]

Done.

 
   void set_ink_drop_visible_opacity(float visible_opacity) {
     ink_drop_visible_opacity_ = visible_opacity;
   }
   float ink_drop_visible_opacity() const { return ink_drop_visible_opacity_; }
 
   // Returns the default InkDropRipple centered on |center_point|.
   std::unique_ptr<InkDropRipple> CreateDefaultInkDropRipple(
       const gfx::Point& center_point) const;
 
@@ skipping 18 matching lines @@
   void VisibilityChanged(View* starting_from, bool is_visible) override;
   void OnFocus() override;
   void OnBlur() override;
   void OnMouseEvent(ui::MouseEvent* event) override;
 
   // Overrideable methods to allow views to provide minor tweaks to the default
   // ink drop.
   virtual SkColor GetInkDropBaseColor() const;
 
   // Should return true if the ink drop is also used to depict focus.
+  // TODO(bruthig): Make this a configuration of InkDropImpl.
   virtual bool ShouldShowInkDropForFocus() const;
 
   InkDrop* ink_drop() { return ink_drop_.get(); }
 
   // Toggle to enable/disable an InkDrop on this View.  Descendants can override
-  // CreateInkDropHighlight() and CreateInkDropRipple() to change the look/feel
-  // of the InkDrop.
+  // CreateInkDrop(), CreateInkDropHighlight() and CreateInkDropRipple() to
+  // change the look/feel of the InkDrop.
   void SetInkDropMode(InkDropMode ink_drop_mode);
 
+  // Returns an InkDropImpl configured to work well with a
+  // flood-fill ink drop ripple.
+  std::unique_ptr<InkDropImpl> CreateDefaultFloodFillInkDropImpl();
+
+  // Returns a InkDropImpl with default configuration. The base implementation
+  // of CreateInkDrop() delegates to this function.
+  std::unique_ptr<InkDropImpl> CreateDefaultInkDropImpl();
+
  private:
   class InkDropGestureHandler;
   friend class InkDropGestureHandler;
   friend class test::InkDropHostViewTestApi;
 
   // The last user Event to trigger an ink drop ripple animation.
   std::unique_ptr<ui::LocatedEvent> last_ripple_triggering_event_;
 
   std::unique_ptr<InkDrop> ink_drop_;
 
   // Intentionally declared after |ink_drop_| so that it doesn't access a
   // destroyed |ink_drop_| during destruction.
   std::unique_ptr<InkDropGestureHandler> gesture_handler_;
 
-  gfx::Size ink_drop_size_;
-
   float ink_drop_visible_opacity_;
 
   // Determines whether the view was already painting to layer before adding ink
   // drop layer.
   bool old_paint_to_layer_;
 
   bool destroying_;
 
   DISALLOW_COPY_AND_ASSIGN(InkDropHostView);
 };
 }  // namespace views
 
 #endif  // UI_VIEWS_ANIMATION_INK_DROP_HOST_VIEW_H_