[Chrome OS] Fix the broken focus rectangle on Launcher icon.

ash/common/shelf/app_list_button.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 "ash/common/shelf/app_list_button.h"
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/ink_drop_button_listener.h"
 #include "ash/common/shelf/shelf_constants.h"
@@ skipping 151 matching lines @@
 void AppListButton::PaintMd(gfx::Canvas* canvas) {
   gfx::PointF circle_center(GetCenterPoint());
 
   // Paint the circular background.
   SkPaint bg_paint;
   bg_paint.setColor(SkColorSetA(kShelfBaseColor, background_alpha_));
   bg_paint.setFlags(SkPaint::kAntiAlias_Flag);
   bg_paint.setStyle(SkPaint::kFill_Style);
   canvas->DrawCircle(circle_center, kAppListButtonRadius, bg_paint);
 
-  // Paint a white ring as the foreground. The ceil/dsf math assures that the
-  // ring draws sharply and is centered at all scale factors.

[Evan Stade, 2017/02/01 00:38:13]

This logic looks pretty intentional. Are you sure you aren't breaking something?

I'm pretty sure what you actually want is a ScopedCanvas to undo-undo-dsf.

[xdai1, 2017/02/01 01:14:06]

Sorry for the previous bad fix. Modified as you suggested. Thanks!

+  // Paint a white ring as the foreground.
   const float kRingOuterRadiusDp = 7.f;
   const float kRingThicknessDp = 1.5f;
-  const float dsf = canvas->UndoDeviceScaleFactor();
-  circle_center.Scale(dsf);
-
   SkPaint fg_paint;
   fg_paint.setFlags(SkPaint::kAntiAlias_Flag);
   fg_paint.setStyle(SkPaint::kStroke_Style);
   fg_paint.setColor(kShelfIconColor);
-  const float thickness = std::ceil(kRingThicknessDp * dsf);
-  const float radius = std::ceil(kRingOuterRadiusDp * dsf) - thickness / 2;
-  fg_paint.setStrokeWidth(thickness);
+  fg_paint.setStrokeWidth(kRingThicknessDp);
+  const float radius = kRingOuterRadiusDp - kRingThicknessDp / 2;
   // Make sure the center of the circle lands on pixel centers.
   canvas->DrawCircle(circle_center, radius, fg_paint);
 }
 
 void AppListButton::PaintAppListButton(gfx::Canvas* canvas,
                                        const gfx::ImageSkia& foreground_image) {
   int background_image_id = 0;
 
   if (WmShell::Get()->GetAppListTargetVisibility() ||
       draw_background_as_active_) {
@@ skipping 105 matching lines @@
     return gfx::Point(x_mid, x_mid);
   } else if (alignment == SHELF_ALIGNMENT_RIGHT) {
     return gfx::Point(y_mid, y_mid);
   } else {
     DCHECK_EQ(alignment, SHELF_ALIGNMENT_LEFT);
     return gfx::Point(width() - y_mid, y_mid);
   }
 }
 
 }  // namespace ash