Vectorize download shelf progress indicators

chrome/browser/ui/views/download/download_item_view.cc

 // Copyright (c) 2012 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/download/download_item_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 78 matching lines @@
 
 // How long we keep the item disabled after the user clicked it to open the
 // downloaded item.
 static const int kDisabledOnOpenDuration = 3000;
 
 // Darken light-on-dark download status text by 20% before drawing, thus
 // creating a "muted" version of title text for both dark-on-light and
 // light-on-dark themes.
 static const double kDownloadItemLuminanceMod = 0.8;
 
-namespace {
-
-// Callback for DownloadShelf paint functions to mirror the progress animation
-// in RTL locales.
-void RTLMirrorXForView(views::View* containing_view, gfx::Rect* bounds) {
-  bounds->set_x(containing_view->GetMirroredXForRect(*bounds));
-}
-
-}  // namespace
-
 DownloadItemView::DownloadItemView(DownloadItem* download_item,
     DownloadShelfView* parent)
   : warning_icon_(NULL),
     shelf_(parent),
     status_text_(l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_STARTING)),
     body_state_(NORMAL),
     drop_down_state_(NORMAL),
     mode_(NORMAL_MODE),
-    progress_angle_(DownloadShelf::kStartAngleDegrees),
     drop_down_pressed_(false),
     dragging_(false),
     starting_drag_(false),
     model_(download_item),
     save_button_(NULL),
     discard_button_(NULL),
     dangerous_download_label_(NULL),
     dangerous_download_label_sized_(false),
     disabled_while_opening_(false),
     creation_time_(base::Time::Now()),
@@ skipping 109 matching lines @@
 
   // ExperienceSampling: If the user took no action to remove the warning
   // before it disappeared, then the user effectively dismissed the download
   // without keeping it.
   if (sampling_event_.get())
     sampling_event_->CreateUserDecisionEvent(ExperienceSamplingEvent::kIgnore);
 }
 
 // Progress animation handlers.
 
-void DownloadItemView::UpdateDownloadProgress() {
-  progress_angle_ =
-      (progress_angle_ + DownloadShelf::kUnknownIncrementDegrees) %
-      DownloadShelf::kMaxDegrees;
-  SchedulePaint();
-}
-
 void DownloadItemView::StartDownloadProgress() {
   if (progress_timer_.IsRunning())
     return;
-  progress_timer_.Start(FROM_HERE,
-      base::TimeDelta::FromMilliseconds(DownloadShelf::kProgressRateMs), this,
-      &DownloadItemView::UpdateDownloadProgress);
+  progress_start_time_ = base::TimeTicks::Now();
+  progress_timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(
+                                       DownloadShelf::kProgressRateMs),
+                        this, &DownloadItemView::SchedulePaint);
 }
 
 void DownloadItemView::StopDownloadProgress() {
   progress_timer_.Stop();
 }
 
 void DownloadItemView::OnExtractIconComplete(gfx::Image* icon_bitmap) {
   if (icon_bitmap)
     shelf_->SchedulePaint();
 }
@@ skipping 593 matching lines @@
     icon = image->ToImageSkia();
 
   // We count on the fact that the icon manager will cache the icons and if one
   // is available, it will be cached here. We *don't* want to request the icon
   // to be loaded here, since this will also get called if the icon can't be
   // loaded, in which case LookupIcon will always be NULL. The loading will be
   // triggered only when we think the status might change.
   if (icon) {
     if (!IsShowingWarningDialog()) {
       DownloadItem::DownloadState state = download()->GetState();
-      DownloadShelf::BoundsAdjusterCallback rtl_mirror =
-          base::Bind(&RTLMirrorXForView, base::Unretained(this));
+      canvas->Save();
+      if (base::i18n::IsRTL())
+        canvas->Translate(
+            gfx::Vector2d(width() - DownloadShelf::kSmallProgressIconSize, 0));
+
       if (state == DownloadItem::IN_PROGRESS) {
-        DownloadShelf::PaintDownloadProgress(canvas, rtl_mirror, 0, 0,
-                                             progress_angle_,
+        DownloadShelf::PaintDownloadProgress(canvas, progress_start_time_,
                                              model_.PercentComplete());
       } else if (complete_animation_.get() &&
                  complete_animation_->is_animating()) {
         if (state == DownloadItem::INTERRUPTED) {
           DownloadShelf::PaintDownloadInterrupted(
-              canvas, rtl_mirror, 0, 0, complete_animation_->GetCurrentValue());
+              canvas, complete_animation_->GetCurrentValue());
         } else {
           DCHECK_EQ(DownloadItem::COMPLETE, state);
           DownloadShelf::PaintDownloadComplete(
-              canvas, rtl_mirror, 0, 0, complete_animation_->GetCurrentValue());
+              canvas, complete_animation_->GetCurrentValue());
         }
       }
+      canvas->Restore();
     }
 
     // Draw the icon image.
     int icon_x, icon_y;
 
     if (IsShowingWarningDialog()) {
       icon_x = kLeftPadding + body_image_set->top_left->width();
       icon_y = (height() - icon->height()) / 2;
     } else {
       icon_x = DownloadShelf::kSmallProgressIconOffset;
@@ skipping 482 matching lines @@
 void DownloadItemView::AnimateStateTransition(State from, State to,
                                               gfx::SlideAnimation* animation) {
   if (from == NORMAL && to == HOT) {
     animation->Show();
   } else if (from == HOT && to == NORMAL) {
     animation->Hide();
   } else if (from != to) {
     animation->Reset((to == HOT) ? 1.0 : 0.0);
   }
 }