Change PowerStatus::GetBatteryImage to not use ExtractImageRep and scale

ash/common/system/chromeos/power/power_status.cc

 // Copyright (c) 2013 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/system/chromeos/power/power_status.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/resources/grit/ash_resources.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/time_format.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image.h"
-#include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/image/image_skia_rep.h"
 #include "ui/gfx/paint_vector_icon.h"
 
 namespace ash {
 namespace {
 
 // Updates |proto| to ensure that its fields are consistent.
 void SanitizeProto(power_manager::PowerSupplyProperties* proto) {
   DCHECK(proto);
 
   if (proto->battery_state() ==
@@ skipping 78 matching lines @@
   }
   NOTREACHED();
   return gfx::kNoneIcon;
 }
 
 static PowerStatus* g_power_status = NULL;
 
 // Minimum battery percentage rendered in UI.
 const int kMinBatteryPercent = 1;
 
-// Width and height of battery images.
-const int kBatteryImageHeight = 25;
-const int kBatteryImageWidth = 25;
-
 // Number of different power states.
 const int kNumPowerImages = 15;
 
 // The height of the battery icon in material design (as measured from the
 // user-visible bottom of the icon to the user-visible top of the icon).
 const int kBatteryImageHeightMd = 12;
 
 // The dimensions of the canvas containing the material design battery icon.
 const int kBatteryCanvasSizeMd = 16;
 
@@ skipping 245 matching lines @@
     info->index = kNumPowerImages - 1;
   } else if (!IsBatteryPresent()) {
     info->index = kNumPowerImages;
   } else {
     info->index =
         static_cast<int>(GetBatteryPercent() / 100.0 * (kNumPowerImages - 1));
     info->index = std::max(std::min(info->index, kNumPowerImages - 2), 0);
   }
 }
 
-gfx::ImageSkia PowerStatus::GetBatteryImage(
-    const BatteryImageInfo& info) const {
-  if (!MaterialDesignController::UseMaterialDesignSystemIcons())
-    return GetBatteryImageNonMd(info);
+// static
+gfx::Size PowerStatus::GetBatteryImageSizeInDip() {
+  return gfx::Size(kBatteryCanvasSizeMd, kBatteryCanvasSizeMd);

[Peter Kasting, 2017/03/25 00:22:30]

Nit: Now that there is no non-MD path, remove "Md" from this constant.

+}
 
+gfx::ImageSkiaRep PowerStatus::GetBatteryImage(const BatteryImageInfo& info,
+                                               float scale) const {
   const bool use_alert_color =
       (info.charge_level == kMinVisualChargeLevelMd && !IsLinePowerConnected());
   const SkColor badge_color =
       use_alert_color ? kBatteryAlertColor : kBatteryBadgeColor;
   const SkColor charge_color =
       use_alert_color ? kBatteryAlertColor : kBatteryChargeColor;
-  gfx::Canvas canvas(
-      gfx::Size(kBatteryCanvasSizeMd, kBatteryCanvasSizeMd),
-      display::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor(),
-      false);
+
+  gfx::Canvas canvas(GetBatteryImageSizeInDip(), scale, false /* opaque */);
 
   // Paint the battery's base (background) color.
   PaintVectorIcon(&canvas, kSystemTrayBatteryIcon, kBatteryCanvasSizeMd,
                   kBatteryBaseColor);
 
   // Paint the charged portion of the battery. Note that |charge_height| adjusts
   // for the 2dp of padding between the bottom of the battery icon and the
   // bottom edge of |canvas|.
   const int charge_height = info.charge_level + 2;
   gfx::Rect clip_rect(0, kBatteryCanvasSizeMd - charge_height,
                       kBatteryCanvasSizeMd, charge_height);
   canvas.Save();
   canvas.ClipRect(clip_rect);
   PaintVectorIcon(&canvas, kSystemTrayBatteryIcon, kBatteryCanvasSizeMd,
                   charge_color);
   canvas.Restore();
 
   // Paint the badge over top of the battery, if applicable.
   if (info.icon_badge != ICON_BADGE_NONE) {
     PaintVectorIcon(&canvas, VectorIconForIconBadge(info.icon_badge),
                     kBatteryCanvasSizeMd, badge_color);
   }
 
-  return gfx::ImageSkia(canvas.ExtractImageRep());
-}
-
-gfx::ImageSkia PowerStatus::GetBatteryImageNonMd(
-    const BatteryImageInfo& info) const {
-  gfx::Image all;
-  all = ui::ResourceBundle::GetSharedInstance().GetImageNamed(info.resource_id);
-  gfx::Rect region(info.offset * kBatteryImageWidth,
-                   info.index * kBatteryImageHeight, kBatteryImageWidth,

[Peter Kasting, 2017/03/25 00:22:30]

With this removal, |resource_id|, |offset|, and |index| are dead, so they should
be removed + all code transitively touching them.

If this also removes the last references to some bitmap resources, make sure to
remove those too.

[Evan Stade, 2017/03/27 15:11:23]

that's all done here: https://codereview.chromium.org/2770953003/

Dana, you might want to wait till that one lands and rebase, but there are
changes here that will still be relevant.

-                   kBatteryImageHeight);
-  return gfx::ImageSkiaOperations::ExtractSubset(*all.ToImageSkia(), region);
+  return gfx::ImageSkiaRep(canvas.GetBitmap(), scale);
 }
 
 base::string16 PowerStatus::GetAccessibleNameString(
     bool full_description) const {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   if (IsBatteryFull()) {
     return rb.GetLocalizedString(
         IDS_ASH_STATUS_TRAY_BATTERY_FULL_CHARGE_ACCESSIBLE);
   }
 
@@ skipping 55 matching lines @@
 
 void PowerStatus::PowerChanged(
     const power_manager::PowerSupplyProperties& proto) {
   proto_ = proto;
   SanitizeProto(&proto_);
   for (auto& observer : observers_)
     observer.OnPowerStatusChanged();
 }
 
 }  // namespace ash