Tidy up some repetitive casting on bitwise IconEffects operations.

Change-Id: Ie7ceb049a3ad622fe0b3e1c998dd88b7e5de1dbc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2358726Reviewed-by: Nancy Wang <nancylingwang@chromium.org>
Commit-Queue: Glen Robertson <glenrob@chromium.org>
Auto-Submit: Glen Robertson <glenrob@chromium.org>
Cr-Commit-Position: refs/heads/master@{#798973}

chrome/browser/apps/app_service/app_icon_factory.cc

@@ -327,7 +327,7 @@ base::Optional<IconPurpose> GetIconPurpose(
   }
 
   return base::nullopt;
-}  // namespace
+}
 
 // This pipeline is meant to:
 // * Simplify loading icons, as things like effects and type are common
@@ -540,12 +540,9 @@ void IconLoadingPipeline::LoadWebAppIcon(
   // safe zone, and clear the standard icon effect, apply the mask to the icon
   // without shrinking it.
   if (icon_purpose_to_read.value() == IconPurpose::MASKABLE) {
-    icon_effects_ = static_cast<apps::IconEffects>(
-        icon_effects_ & ~apps::IconEffects::kCrOsStandardIcon);
-    icon_effects_ = static_cast<apps::IconEffects>(
-        icon_effects_ | apps::IconEffects::kCrOsStandardBackground);
-    icon_effects_ = static_cast<apps::IconEffects>(
-        icon_effects_ | apps::IconEffects::kCrOsStandardMask);
+    icon_effects_ &= ~apps::IconEffects::kCrOsStandardIcon;
+    icon_effects_ |= apps::IconEffects::kCrOsStandardBackground;
+    icon_effects_ |= apps::IconEffects::kCrOsStandardMask;
   }
 
   switch (icon_type_) {
@@ -564,15 +561,12 @@ void IconLoadingPipeline::LoadWebAppIcon(
     case apps::mojom::IconType::kUncompressed:
       if (icon_type_ == apps::mojom::IconType::kUncompressed) {
         // For uncompressed icon, apply the resize and pad effect.
-        icon_effects_ = static_cast<apps::IconEffects>(
-            icon_effects_ | apps::IconEffects::kResizeAndPad);
+        icon_effects_ |= apps::IconEffects::kResizeAndPad;
 
         // For uncompressed icon, clear the standard icon effects: kBackground
         // and kMask.
-        icon_effects_ = static_cast<apps::IconEffects>(
-            icon_effects_ & ~apps::IconEffects::kCrOsStandardBackground);
-        icon_effects_ = static_cast<apps::IconEffects>(
-            icon_effects_ & ~apps::IconEffects::kCrOsStandardMask);
+        icon_effects_ &= ~apps::IconEffects::kCrOsStandardBackground;
+        icon_effects_ &= ~apps::IconEffects::kCrOsStandardMask;
       }
       FALLTHROUGH;
     case apps::mojom::IconType::kStandard:
@@ -676,8 +670,7 @@ void IconLoadingPipeline::LoadIconFromResource(int icon_resource) {
     //
     // For the default icon, use the raw icon, because the standard icon image
     // convert could break the test cases.
-    icon_effects_ = static_cast<apps::IconEffects>(
-        icon_effects_ & ~apps::IconEffects::kCrOsStandardIcon);
+    icon_effects_ &= ~apps::IconEffects::kCrOsStandardIcon;
   }
 #endif
 

chrome/browser/apps/app_service/app_icon_factory.h

@@ -54,6 +54,26 @@ enum IconEffects : uint32_t {
                               // and kCrOsStandardMask together.
 };
 
+inline IconEffects operator|(IconEffects a, IconEffects b) {
+  return static_cast<IconEffects>(static_cast<uint32_t>(a) |
+                                  static_cast<uint32_t>(b));
+}
+
+inline IconEffects operator|=(IconEffects& a, IconEffects b) {
+  a = a | b;
+  return a;
+}
+
+inline IconEffects operator&(IconEffects a, uint32_t b) {
+  return static_cast<IconEffects>(static_cast<uint32_t>(a) &
+                                  static_cast<uint32_t>(b));
+}
+
+inline IconEffects operator&=(IconEffects& a, uint32_t b) {
+  a = a & b;
+  return a;
+}
+
 // Returns a callback that converts compressed data to an ImageSkia.
 base::OnceCallback<void(std::vector<uint8_t> compressed_data)>
 CompressedDataToImageSkiaCallback(

chrome/browser/apps/app_service/web_apps_chromeos.cc

@@ -388,30 +388,23 @@ IconEffects WebAppsChromeOs::GetIconEffects(const web_app::WebApp* web_app,
                                             bool is_disabled) {
   IconEffects icon_effects = IconEffects::kNone;
   if (base::FeatureList::IsEnabled(features::kAppServiceAdaptiveIcon)) {
-    icon_effects = web_app->is_generated_icon()
-                       ? static_cast<IconEffects>(
-                             icon_effects | IconEffects::kCrOsStandardMask)
-                       : static_cast<IconEffects>(
-                             icon_effects | IconEffects::kCrOsStandardIcon);
+    icon_effects |= web_app->is_generated_icon()
+                        ? IconEffects::kCrOsStandardMask
+                        : IconEffects::kCrOsStandardIcon;
   } else {
-    icon_effects =
-        static_cast<IconEffects>(icon_effects | IconEffects::kResizeAndPad);
+    icon_effects |= IconEffects::kResizeAndPad;
   }
   if (extensions::util::ShouldApplyChromeBadgeToWebApp(profile(),
                                                        web_app->app_id())) {
-    icon_effects =
-        static_cast<IconEffects>(icon_effects | IconEffects::kChromeBadge);
+    icon_effects |= IconEffects::kChromeBadge;
   }
-  icon_effects = static_cast<IconEffects>(icon_effects |
-                                          WebAppsBase::GetIconEffects(web_app));
+  icon_effects |= WebAppsBase::GetIconEffects(web_app);
   if (paused) {
-    icon_effects =
-        static_cast<IconEffects>(icon_effects | IconEffects::kPaused);
+    icon_effects |= IconEffects::kPaused;
   }
 
   if (is_disabled) {
-    icon_effects =
-        static_cast<IconEffects>(icon_effects | IconEffects::kBlocked);
+    icon_effects |= IconEffects::kBlocked;
   }
 
   return icon_effects;