[Merge to M58]Chrome OS: Fix the regression of 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/shelf/ink_drop_button_listener.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/shelf_view.h"
 #include "ash/common/shelf/wm_shelf.h"
@@ skipping 115 matching lines @@
   cc::PaintFlags bg_flags;
   bg_flags.setColor(background_color_);
   bg_flags.setAntiAlias(true);
   bg_flags.setStyle(cc::PaintFlags::kFill_Style);
   canvas->DrawCircle(circle_center, kAppListButtonRadius, bg_flags);
 
   // Paint a white ring as the foreground. The ceil/dsf math assures that the
   // ring draws sharply and is centered at all scale factors.
   const float kRingOuterRadiusDp = 7.f;
   const float kRingThicknessDp = 1.5f;
-  gfx::ScopedCanvas scoped_canvas(canvas);
-  const float dsf = canvas->UndoDeviceScaleFactor();
-  circle_center.Scale(dsf);
 
-  cc::PaintFlags fg_flags;
-  fg_flags.setAntiAlias(true);
-  fg_flags.setStyle(cc::PaintFlags::kStroke_Style);
-  fg_flags.setColor(kShelfIconColor);
-  const float thickness = std::ceil(kRingThicknessDp * dsf);
-  const float radius = std::ceil(kRingOuterRadiusDp * dsf) - thickness / 2;
-  fg_flags.setStrokeWidth(thickness);
-  // Make sure the center of the circle lands on pixel centers.
-  canvas->DrawCircle(circle_center, radius, fg_flags);
+  {
+    gfx::ScopedCanvas scoped_canvas(canvas);
+    const float dsf = canvas->UndoDeviceScaleFactor();
+    circle_center.Scale(dsf);
+
+    cc::PaintFlags fg_flags;
+    fg_flags.setAntiAlias(true);
+    fg_flags.setStyle(cc::PaintFlags::kStroke_Style);
+    fg_flags.setColor(kShelfIconColor);
+    const float thickness = std::ceil(kRingThicknessDp * dsf);
+    const float radius = std::ceil(kRingOuterRadiusDp * dsf) - thickness / 2;
+    fg_flags.setStrokeWidth(thickness);
+    // Make sure the center of the circle lands on pixel centers.
+    canvas->DrawCircle(circle_center, radius, fg_flags);
+  }
 
   views::Painter::PaintFocusPainter(this, canvas, focus_painter());
 }
 
 void AppListButton::GetAccessibleNodeData(ui::AXNodeData* node_data) {
   node_data->role = ui::AX_ROLE_BUTTON;
   node_data->SetName(shelf_view_->GetTitleForView(this));
 }
 
 std::unique_ptr<views::InkDropRipple> AppListButton::CreateInkDropRipple()
@@ skipping 48 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