views: Change CardUnmaskPromptViews::FadeOutView opacity to alpha.

chrome/browser/ui/views/autofill/card_unmask_prompt_views.cc

 // Copyright 2014 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.
 
 #include "chrome/browser/ui/views/autofill/card_unmask_prompt_views.h"
 
 #include "base/basictypes.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_types.h"
 #include "chrome/browser/ui/autofill/card_unmask_prompt_controller.h"
 #include "chrome/browser/ui/views/autofill/decorated_textfield.h"
 #include "chrome/browser/ui/views/autofill/tooltip_icon.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "components/web_modal/web_contents_modal_dialog_host.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/compositing_recorder.h"
 #include "ui/compositor/paint_context.h"
 #include "ui/gfx/canvas.h"
+#include "ui/gfx/geometry/safe_integer_conversions.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/throbber.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_client_view.h"
 
@@ skipping 284 matching lines @@
     year_input_->SetInvalid(true);
     SetRetriableErrorMessage(l10n_util::GetStringUTF16(
         IDS_AUTOFILL_CARD_UNMASK_INVALID_EXPIRATION_DATE));
   }
 
   GetDialogClientView()->UpdateDialogButtons();
 }
 
 void CardUnmaskPromptViews::AnimationProgressed(
     const gfx::Animation* animation) {
   progress_overlay_->SetOpacity(animation->GetCurrentValue());

[danakj, 2015/04/07 21:47:04]

The animation value is in the range 0-1. So we'd have to turn these into 0-255
here. It seems a bit nicer to make that conversion inside the SetOpacity
function to me, wdyt? Would you prefer to ToRoundedInt(255*...) here for both
animation values?

   storage_row_->SetOpacity(1.0 - animation->GetCurrentValue());
 }
 
 void CardUnmaskPromptViews::InitIfNecessary() {
   if (has_children())
     return;
 
   main_contents_ = new views::View();
   main_contents_->SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 12));
@@ skipping 109 matching lines @@
   return controller_->InputExpirationIsValid(
       month_input_->GetTextForRow(month_input_->selected_index()),
       year_input_->GetTextForRow(year_input_->selected_index()));
 }
 
 void CardUnmaskPromptViews::ClosePrompt() {
   GetWidget()->Close();
 }
 
 CardUnmaskPromptViews::FadeOutView::FadeOutView()
-    : fade_everything_(false), opacity_(1.0) {
+    : fade_everything_(false), alpha_(255) {
 }
 CardUnmaskPromptViews::FadeOutView::~FadeOutView() {
 }
 
 void CardUnmaskPromptViews::FadeOutView::PaintChildren(
     const ui::PaintContext& context) {
-  int alpha = static_cast<int>(255 * opacity_);
-  ui::CompositingRecorder recorder(context, alpha);
+  ui::CompositingRecorder recorder(context, alpha_);
   views::View::PaintChildren(context);
 }
 
 void CardUnmaskPromptViews::FadeOutView::OnPaint(gfx::Canvas* canvas) {
-  if (!fade_everything_ || opacity_ > 0.99)
+  if (!fade_everything_ || alpha_ == 255)
     return views::View::OnPaint(canvas);
 
-  canvas->SaveLayerAlpha(0xff * opacity_);
+  canvas->SaveLayerAlpha(alpha_);
   views::View::OnPaint(canvas);
   canvas->Restore();
 }
 
 void CardUnmaskPromptViews::FadeOutView::SetOpacity(double opacity) {
-  opacity_ = opacity;
+  DCHECK_GE(opacity, 0.0);
+  DCHECK_LE(opacity, 1.0);
+  alpha_ = gfx::ToRoundedInt(opacity * 255);

[Peter Kasting, 2015/04/07 21:45:30]

My intent was to make this function also take an int and have its callers work
in ints as well.

   SchedulePaint();
 }
 
 }  // namespace autofill