Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(222)

Unified Diff: ui/views/animation/ink_drop_host_view.h

Issue 2960393002: Hardcode ripple color/opacity for Harmony. (Closed)
Patch Set: Consolidate FloodFill as well Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/views/animation/ink_drop_host_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/animation/ink_drop_host_view.h
diff --git a/ui/views/animation/ink_drop_host_view.h b/ui/views/animation/ink_drop_host_view.h
index 8ac475fa752c2e1a3450f18628cd8d58055fac7f..8885ac5246254ef6cc1f3e30cbefb9ab3f8d6f94 100644
--- a/ui/views/animation/ink_drop_host_view.h
+++ b/ui/views/animation/ink_drop_host_view.h
@@ -84,6 +84,9 @@ class VIEWS_EXPORT InkDropHostView : public View, public InkDropHost {
const gfx::Size& size = gfx::Size(kDefaultInkDropSize,
kDefaultInkDropSize)) const;
+ // Returns a FloodFill InkDropRipple centered on the last event.
+ std::unique_ptr<InkDropRipple> CreateFloodFillInkDropRipple() const;
+
// Returns the default InkDropHighlight centered on |center_point|.
std::unique_ptr<InkDropHighlight> CreateDefaultInkDropHighlight(
const gfx::PointF& center_point,
@@ -128,13 +131,20 @@ class VIEWS_EXPORT InkDropHostView : public View, public InkDropHost {
void ResetInkDropMask();
+ // Returns an InkDropImpl with default configuration. The base implementation
+ // of CreateInkDrop() delegates to this function.
+ std::unique_ptr<InkDropImpl> CreateDefaultInkDropImpl();
+
// Returns an InkDropImpl configured to work well with a
// flood-fill ink drop ripple.
std::unique_ptr<InkDropImpl> CreateDefaultFloodFillInkDropImpl();
- // Returns an InkDropImpl with default configuration. The base implementation
- // of CreateInkDrop() delegates to this function.
- std::unique_ptr<InkDropImpl> CreateDefaultInkDropImpl();
+ // Returns the color to use for ink drops. Ripples once derived their color
+ // from the text color via GetInkDropBaseColor(). Latest specs just say
+ // ripples should be black. This method chooses which to use.
+ // TODO(tapted): Make GetInkDropBaseColor() private so that it can only be
+ // overridden, and not invoked externally.
+ SkColor GetInkDropBaseColorImpl() const;
private:
class InkDropGestureHandler;
« no previous file with comments | « no previous file | ui/views/animation/ink_drop_host_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698