[Mac] Draw the circular avatar programmatically rather than with a frame.

chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 
 #import "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h"
 
 #include "base/mac/bundle_locations.h"
 #include "base/prefs/pref_service.h"
@@ skipping 40 matching lines @@
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #import "ui/base/cocoa/cocoa_base_utils.h"
 #import "ui/base/cocoa/controls/blue_label_button.h"
 #import "ui/base/cocoa/controls/hyperlink_button_cell.h"
 #import "ui/base/cocoa/hover_image_button.h"
 #include "ui/base/cocoa/window_size_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.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"
 
 namespace {
 
 // Constants taken from the Windows/Views implementation at:
 // chrome/browser/ui/views/profile_chooser_view.cc
 const int kLargeImageSide = 88;
 const int kSmallImageSide = 32;
 const CGFloat kFixedMenuWidth = 250;
@@ skipping 332 matching lines @@
     [self addTrackingArea:trackingArea_.get()];
 
     NSRect bounds = NSMakeRect(0, 0, kLargeImageSide, kLargeImageSide);
     if (editingAllowed) {
       changePhotoButton_.reset([self changePhotoButtonWithRect:bounds]);
       [self addSubview:changePhotoButton_];
 
       // Hide the button until the image is hovered over.
       [changePhotoButton_ setHidden:YES];
     }
-
-    // Add the frame overlay last, so that both the photo and the button
-    // look like circles.
-    base::scoped_nsobject<NSImageView> frameOverlay(
-        [[NSImageView alloc] initWithFrame:bounds]);
-    [frameOverlay setImage:ui::ResourceBundle::GetSharedInstance().
-        GetNativeImageNamed(IDR_ICON_PROFILES_AVATAR_PHOTO_FRAME).AsNSImage()];

[groby-ooo-7-16, 2014/05/23 17:33:42]

Can you get rid of the image resource, too?

[noms (inactive), 2014/05/23 19:32:13]

Not yet -- until it lands, it's still being used on Win/Linux, and I think
Android was going to pick it up. I will double check with them (and if not,
delete it in a different CL)
On 2014/05/23 17:33:42, groby wrote:

-    [self addSubview:frameOverlay];
   }
   return self;
 }
 
+- (void)drawRect:(NSRect)dirtyRect {
+  NSRect bounds = [self bounds];
+
+  // Display the profile picture as a circle.
+  NSBezierPath* path = [NSBezierPath bezierPathWithOvalInRect:bounds];
+  {

[groby-ooo-7-16, 2014/05/23 17:33:42]

You can kill the scoped state - Cocoa automatically has a save/restore state
call around drawRect

[noms (inactive), 2014/05/23 19:32:13]

Nice! Done.
 On 2014/05/23 17:33:42, groby wrote:

+    gfx::ScopedNSGraphicsContextSaveGState scopedGState;
+    [path addClip];
+    [self.image drawAtPoint:bounds.origin
+                   fromRect:bounds
+                  operation:NSCompositeSourceOver
+                   fraction:1.0];
+  }
+}
+
 - (void)editPhoto:(id)sender {
   avatarMenu_->EditProfile(avatarMenu_->GetActiveProfileIndex());
 }
 
 - (void)mouseEntered:(NSEvent*)event {
   [changePhotoButton_ setHidden:NO];
 }
 
 - (void)mouseExited:(NSEvent*)event {
   [changePhotoButton_ setHidden:YES];
@@ skipping 1248 matching lines @@
       IDR_CLOSE_1_P).ToNSImage()];
   [deleteButton setTarget:self];
   [deleteButton setAction:@selector(showAccountRemovalView:)];
   [deleteButton setTag:tag];
 
   [button addSubview:deleteButton];
   return button.autorelease();
 }
 
 @end