Commit c71e7949 authored by Hwanseung Lee's avatar Hwanseung Lee Committed by Commit Bot

Convert enum to enum class for SquareInkDropRipple::ActivatedShape

Use enum class instead of enum for ActivatedShape
enum class is more type safety.

Bug: 940736
Change-Id: I377b57af89eb29199f31496b310d7adea414e711
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1850677
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Reviewed-by: default avatarPeter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#704509}
parent 66b3259d
...@@ -146,7 +146,7 @@ SquareInkDropRipple::SquareInkDropRipple(const gfx::Size& large_size, ...@@ -146,7 +146,7 @@ SquareInkDropRipple::SquareInkDropRipple(const gfx::Size& large_size,
const gfx::Point& center_point, const gfx::Point& center_point,
SkColor color, SkColor color,
float visible_opacity) float visible_opacity)
: activated_shape_(ROUNDED_RECT), : activated_shape_(ActivatedShape::kRoundedRect),
visible_opacity_(visible_opacity), visible_opacity_(visible_opacity),
large_size_(large_size), large_size_(large_size),
large_corner_radius_(large_corner_radius), large_corner_radius_(large_corner_radius),
...@@ -542,10 +542,10 @@ void SquareInkDropRipple::GetCurrentTransforms( ...@@ -542,10 +542,10 @@ void SquareInkDropRipple::GetCurrentTransforms(
void SquareInkDropRipple::GetActivatedTargetTransforms( void SquareInkDropRipple::GetActivatedTargetTransforms(
InkDropTransforms* transforms_out) const { InkDropTransforms* transforms_out) const {
switch (activated_shape_) { switch (activated_shape_) {
case CIRCLE: case ActivatedShape::kCircle:
CalculateCircleTransforms(small_size_, transforms_out); CalculateCircleTransforms(small_size_, transforms_out);
break; break;
case ROUNDED_RECT: case ActivatedShape::kRoundedRect:
CalculateRectTransforms(small_size_, small_corner_radius_, CalculateRectTransforms(small_size_, small_corner_radius_,
transforms_out); transforms_out);
break; break;
...@@ -555,10 +555,10 @@ void SquareInkDropRipple::GetActivatedTargetTransforms( ...@@ -555,10 +555,10 @@ void SquareInkDropRipple::GetActivatedTargetTransforms(
void SquareInkDropRipple::GetDeactivatedTargetTransforms( void SquareInkDropRipple::GetDeactivatedTargetTransforms(
InkDropTransforms* transforms_out) const { InkDropTransforms* transforms_out) const {
switch (activated_shape_) { switch (activated_shape_) {
case CIRCLE: case ActivatedShape::kCircle:
CalculateCircleTransforms(large_size_, transforms_out); CalculateCircleTransforms(large_size_, transforms_out);
break; break;
case ROUNDED_RECT: case ActivatedShape::kRoundedRect:
CalculateRectTransforms(large_size_, small_corner_radius_, CalculateRectTransforms(large_size_, small_corner_radius_,
transforms_out); transforms_out);
break; break;
......
...@@ -51,7 +51,7 @@ class SquareInkDropRippleTestApi; ...@@ -51,7 +51,7 @@ class SquareInkDropRippleTestApi;
class VIEWS_EXPORT SquareInkDropRipple : public InkDropRipple { class VIEWS_EXPORT SquareInkDropRipple : public InkDropRipple {
public: public:
// The shape to use for the ACTIVATED/DEACTIVATED states. // The shape to use for the ACTIVATED/DEACTIVATED states.
enum ActivatedShape { CIRCLE, ROUNDED_RECT }; enum class ActivatedShape { kCircle, kRoundedRect };
SquareInkDropRipple(const gfx::Size& large_size, SquareInkDropRipple(const gfx::Size& large_size,
int large_corner_radius, int large_corner_radius,
......
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