Vectorize download shelf progress indicators

chrome/browser/ui/cocoa/download/download_item_cell.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/download/download_item_cell.h"
 
 #include "base/bind.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_shelf.h"
 #import "chrome/browser/themes/theme_properties.h"
 #import "chrome/browser/ui/cocoa/download/background_theme.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
 #include "grit/theme_resources.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSColor+Luminance.h"
+#include "ui/base/default_theme_provider.h"
 #include "ui/gfx/canvas_skia_paint.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 #include "ui/gfx/text_elider.h"
+#include "ui/native_theme/native_theme.h"
 
 // Distance from top border to icon.
 const CGFloat kImagePaddingTop = 7;
 
 // Distance from left border to icon.
 const CGFloat kImagePaddingLeft = 9;
 
 // Width of icon.
 const CGFloat kImageWidth = 16;
 
 // Height of icon.
 const CGFloat kImageHeight = 16;
 
 // x coordinate of download name string, in view coords.
 const CGFloat kTextPosLeft = kImagePaddingLeft +
-    kImageWidth + DownloadShelf::kSmallProgressIconOffset;
+    kImageWidth + DownloadShelf::kFiletypeIconOffset;
 
 // Distance from end of download name string to dropdown area.
 const CGFloat kTextPaddingRight = 3;
 
 // y coordinate of download name string, in view coords, when status message
 // is visible.
 const CGFloat kPrimaryTextPosTop = 3;
 
 // y coordinate of download name string, in view coords, when status message
 // is not visible.
@@ skipping 20 matching lines @@
 NSTimeInterval kHideStatusDuration = 0.3;
 
 // Duration of the 'download complete' animation, in seconds.
 const CGFloat kCompleteAnimationDuration = 2.5;
 
 // Duration of the 'download interrupted' animation, in seconds.
 const CGFloat kInterruptedAnimationDuration = 2.5;
 
 using content::DownloadItem;
 
-namespace {
-
-// Passed as a callback to DownloadShelf paint functions. On toolkit-views
-// platforms it will mirror the position of the download progress, but that's
-// not done on Mac.
-void DummyRTLMirror(gfx::Rect* bounds) {
-}
-
-}  // namespace
-
 // This is a helper class to animate the fading out of the status text.
 @interface DownloadItemCellAnimation : NSAnimation {
  @private
   DownloadItemCell* cell_;
 }
 - (id)initWithDownloadItemCell:(DownloadItemCell*)cell
                       duration:(NSTimeInterval)duration
                 animationCurve:(NSAnimationCurve)animationCurve;
 
 @end
@@ skipping 34 matching lines @@
 
 @implementation DownloadItemCell
 
 @synthesize secondaryTitle = secondaryTitle_;
 @synthesize secondaryFont = secondaryFont_;
 
 - (void)setInitialState {
   isStatusTextVisible_ = NO;
   titleY_ = kPrimaryTextOnlyPosTop;
   statusAlpha_ = 0.0;
-  indeterminateProgressAngle_ = DownloadShelf::kStartAngleDegrees;
 
   [self setFont:[NSFont systemFontOfSize:
       [NSFont systemFontSizeForControlSize:NSSmallControlSize]]];
   [self setSecondaryFont:[NSFont systemFontOfSize:
       [NSFont systemFontSizeForControlSize:NSSmallControlSize]]];
 
   [self updateTrackingAreas:self];
   [[NSNotificationCenter defaultCenter]
       addObserver:self
          selector:@selector(updateTrackingAreas:)
@@ skipping 91 matching lines @@
       break;
     case DownloadItem::IN_PROGRESS:
       if (downloadModel->download()->IsPaused()) {
         percentDone_ = -1;
         [self stopIndeterminateAnimation];
       } else if (downloadModel->PercentComplete() == -1) {
         percentDone_ = -1;
         if (!indeterminateProgressTimer_) {
           indeterminateProgressTimer_.reset([[IndeterminateProgressTimer alloc]
               initWithDownloadItemCell:self]);
+          progressStartTime_ = base::TimeTicks::Now();
         }
       } else {
         percentDone_ = downloadModel->PercentComplete();
         [self stopIndeterminateAnimation];
       }
       break;
     default:
       NOTREACHED();
   }
 
@@ skipping 281 matching lines @@
   [primaryText drawAtPoint:primaryPos withAttributes:primaryTextAttributes];
 
   // Draw progress disk
   {
     // CanvasSkiaPaint draws its content to the current NSGraphicsContext in its
     // destructor, which needs to be invoked before the icon is drawn below -
     // hence this nested block.
 
     // Always repaint the whole disk.
     NSPoint imagePosition = [self imageRectForBounds:cellFrame].origin;
-    int x = imagePosition.x - DownloadShelf::kSmallProgressIconOffset;
-    int y = imagePosition.y - DownloadShelf::kSmallProgressIconOffset;
+    int x = imagePosition.x - DownloadShelf::kFiletypeIconOffset;
+    int y = imagePosition.y - DownloadShelf::kFiletypeIconOffset;
     NSRect dirtyRect = NSMakeRect(
         x, y,
-        DownloadShelf::kSmallProgressIconSize,
-        DownloadShelf::kSmallProgressIconSize);
+        DownloadShelf::kProgressIndicatorSize,
+        DownloadShelf::kProgressIndicatorSize);
 
     gfx::CanvasSkiaPaint canvas(dirtyRect, false);
     canvas.set_composite_alpha(true);
+    canvas.Translate(gfx::Vector2d(x, y));
+
+    ui::ThemeProvider* themeProvider =
+        [[[self controlView] window] themeProvider];
+    ui::DefaultThemeProvider defaultTheme;
+    if (!themeProvider)
+      themeProvider = &defaultTheme;

[Evan Stade, 2015/07/22 17:34:43]

theme provider can be null during tests

[asanka, 2015/07/22 21:22:17]

Can we instead mock the themeProvider selector on the test window in the
affected tests?

[Evan Stade, 2015/07/22 21:32:20]

That would be nice, except I don't have a mac build handy so tinkering with that
would be difficult.

+
     if (completionAnimation_.get()) {
       if ([completionAnimation_ isAnimating]) {
         if (percentDone_ == -1) {
           DownloadShelf::PaintDownloadComplete(
-              &canvas, base::Bind(&DummyRTLMirror), x, y,
+              &canvas, *themeProvider,
               [completionAnimation_ currentValue]);
         } else {
           DownloadShelf::PaintDownloadInterrupted(
-              &canvas, base::Bind(&DummyRTLMirror), x, y,
+              &canvas, *themeProvider,
               [completionAnimation_ currentValue]);
         }
       }
     } else if (percentDone_ >= 0 || indeterminateProgressTimer_) {
-      DownloadShelf::PaintDownloadProgress(&canvas, base::Bind(&DummyRTLMirror),
-                                           x, y, indeterminateProgressAngle_,
-                                           percentDone_);
+      DownloadShelf::PaintDownloadProgress(
+          &canvas, *themeProvider,
+          progressStartTime_, percentDone_);
     }
   }
 
   // Draw icon
   [[self image] drawInRect:[self imageRectForBounds:cellFrame]
                   fromRect:NSZeroRect
                  operation:NSCompositeSourceOver
                   fraction:[self isEnabled] ? 1.0 : 0.5
             respectFlipped:YES
                      hints:nil];
@@ skipping 91 matching lines @@
           (1 - progress)*kPrimaryTextPosTop;
       statusAlpha_ = 1 - progress;
     }
     [[self controlView] setNeedsDisplay:YES];
   } else if (animation == completionAnimation_) {
     [[self controlView] setNeedsDisplay:YES];
   }
 }
 
 - (void)updateIndeterminateDownload {
-  indeterminateProgressAngle_ =
-      (indeterminateProgressAngle_ + DownloadShelf::kUnknownIncrementDegrees) %
-      DownloadShelf::kMaxDegrees;
   [[self controlView] setNeedsDisplay:YES];
 }
 
 - (void)stopIndeterminateAnimation {
   [indeterminateProgressTimer_ invalidate];
   indeterminateProgressTimer_.reset();
 }
 
 - (void)animationDidEnd:(NSAnimation *)animation {
   if (animation == toggleStatusVisibilityAnimation_)
@@ skipping 58 matching lines @@
 
 - (void)invalidate {
   [timer_ invalidate];
 }
 
 - (void)onTimer:(NSTimer*)timer {
   [cell_ updateIndeterminateDownload];
 }
 
 @end