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 43 matching lines @@
                                               controller_->GetWebContents());
 }
 
 void CardUnmaskPromptViews::ControllerGone() {
   controller_ = nullptr;
   ClosePrompt();
 }
 
 void CardUnmaskPromptViews::DisableAndWaitForVerification() {
   SetInputsEnabled(false);
-  progress_overlay_->SetOpacity(0.0);
+  progress_overlay_->SetAlpha(0);
   progress_overlay_->SetVisible(true);
   progress_throbber_->Start();
   overlay_animation_.Show();
   GetDialogClientView()->UpdateDialogButtons();
   Layout();
 }
 
 void CardUnmaskPromptViews::GotVerificationResult(
     const base::string16& error_message,
     bool allow_retry) {
   progress_throbber_->Stop();
   if (error_message.empty()) {
     progress_label_->SetText(l10n_util::GetStringUTF16(
         IDS_AUTOFILL_CARD_UNMASK_VERIFICATION_SUCCESS));
     progress_throbber_->SetChecked(true);
     base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE, base::Bind(&CardUnmaskPromptViews::ClosePrompt,
                               weak_ptr_factory_.GetWeakPtr()),
         controller_->GetSuccessMessageDuration());
   } else {
     // TODO(estade): it's somewhat jarring when the error comes back too
     // quickly.
     overlay_animation_.Reset();
-    storage_row_->SetOpacity(1.0);
+    storage_row_->SetAlpha(255);
     progress_overlay_->SetVisible(false);
 
     if (allow_retry) {
       SetInputsEnabled(true);
 
       // If there is more than one input showing, don't mark anything as
       // invalid since we don't know the location of the problem.
       if (!controller_->ShouldRequestExpirationDate())
         cvc_input_->SetInvalid(true);
 
@@ skipping 196 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());
-  storage_row_->SetOpacity(1.0 - animation->GetCurrentValue());
+  uint8_t alpha = gfx::ToRoundedInt(255 * animation->GetCurrentValue());

[Peter Kasting, 2015/04/07 22:29:42]

Use CurrentValueBetween instead and make the cast explicit:

  uint8_t alpha = static_cast<uint8_t>(animation->CurrentValueBetween(0, 255));

[danakj, 2015/04/07 22:36:43]

Done.

+  progress_overlay_->SetOpacity(alpha);
+  storage_row_->SetOpacity(255 - alpha);
 }
 
 void CardUnmaskPromptViews::InitIfNecessary() {
   if (has_children())
     return;
 
   main_contents_ = new views::View();
   main_contents_->SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 12));
   AddChildView(main_contents_);
@@ skipping 108 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) {
-  uint8_t alpha = static_cast<uint8_t>(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;
+void CardUnmaskPromptViews::FadeOutView::SetAlpha(uint8_t alpha) {
+  alpha_ = alpha;
   SchedulePaint();
 }
 
 }  // namespace autofill