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

Unified Diff: ui/views/color_chooser/color_chooser_view.cc

Issue 1135263002: stop using (deprecated) SkScalarDiv (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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/controls/progress_bar.cc » ('j') | ui/views/controls/progress_bar.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/color_chooser/color_chooser_view.cc
diff --git a/ui/views/color_chooser/color_chooser_view.cc b/ui/views/color_chooser/color_chooser_view.cc
index 749e64589ba8ba2f37115ae195273c8134aa6500..db413c6385a37094d64885f01e0d580990fb9457 100644
--- a/ui/views/color_chooser/color_chooser_view.cc
+++ b/ui/views/color_chooser/color_chooser_view.cc
@@ -144,7 +144,7 @@ ColorChooserView::HueView::HueView(ColorChooserView* chooser_view)
void ColorChooserView::HueView::OnHueChanged(SkScalar hue) {
SkScalar height = SkIntToScalar(kSaturationValueSize - 1);
SkScalar hue_max = SkIntToScalar(360);
- int level = SkScalarDiv(SkScalarMul(hue_max - hue, height), hue_max);
+ int level = (hue_max - hue) * height / hue_max;
level += kBorderWidth;
if (level_ != level) {
level_ = level;
@@ -157,10 +157,8 @@ void ColorChooserView::HueView::ProcessEventAtLocation(
level_ = std::max(kBorderWidth,
std::min(height() - 1 - kBorderWidth, point.y()));
int base_height = kSaturationValueSize - 1;
- chooser_view_->OnHueChosen(SkScalarDiv(
- SkScalarMul(SkIntToScalar(360),
- SkIntToScalar(base_height - (level_ - kBorderWidth))),
- SkIntToScalar(base_height)));
+ chooser_view_->OnHueChosen(360.f * (base_height - (level_ - kBorderWidth)) /
+ base_height);
SchedulePaint();
}
@@ -181,10 +179,8 @@ void ColorChooserView::HueView::OnPaint(gfx::Canvas* canvas) {
SK_ColorGRAY);
int base_left = kHueIndicatorSize + kBorderWidth;
for (int y = 0; y < kSaturationValueSize; ++y) {
- hsv[0] = SkScalarDiv(SkScalarMul(SkIntToScalar(360),
- SkIntToScalar(
- kSaturationValueSize - 1 - y)),
- SkIntToScalar(kSaturationValueSize - 1));
+ hsv[0] =
+ 360.f * (kSaturationValueSize - 1 - y) / (kSaturationValueSize - 1);
canvas->FillRect(gfx::Rect(base_left, y + kBorderWidth, kHueBarWidth, 1),
SkHSVToColor(hsv));
}
@@ -282,10 +278,8 @@ void ColorChooserView::SaturationValueView::OnSaturationValueChanged(
void ColorChooserView::SaturationValueView::ProcessEventAtLocation(
const gfx::Point& point) {
SkScalar scalar_size = SkIntToScalar(kSaturationValueSize - 1);
- SkScalar saturation = SkScalarDiv(
- SkIntToScalar(point.x() - kBorderWidth), scalar_size);
- SkScalar value = SK_Scalar1 - SkScalarDiv(
- SkIntToScalar(point.y() - kBorderWidth), scalar_size);
+ SkScalar saturation = (point.x() - kBorderWidth) / scalar_size;
+ SkScalar value = SK_Scalar1 - (point.y() - kBorderWidth) / scalar_size;
saturation = SkScalarPin(saturation, 0, SK_Scalar1);
value = SkScalarPin(value, 0, SK_Scalar1);
OnSaturationValueChanged(saturation, value);
« no previous file with comments | « no previous file | ui/views/controls/progress_bar.cc » ('j') | ui/views/controls/progress_bar.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698