Modify AppService for to handle compressed standard icons.

For web apps icon, only modify the effects for uncompressed icon,
because for compressed icons, we still need apply those icon effects.

For Arc apps, when the standard icon flag is enable, call ArcAppIcon to
generate the adaptive icon for both the compressed and uncompressed
icon, so that AppService can generate the standard compressed and
uncompressed icons.

BUG=1083331

Change-Id: Icf6381ea8de96bfdc176d4df687403b72691f426
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2272659
Commit-Queue: Nancy Wang <nancylingwang@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#783873}

chrome/browser/apps/app_service/app_icon_factory.cc

@@ -209,36 +209,6 @@ void LoadCompressedDataFromExtension(
       std::move(compressed_data_callback));
 }
 
-// Encode the ImageSkia to the compressed PNG data with the image's 1.0f scale
-// factor representation. Return the encoded PNG data.
-//
-// This function should not be called on the UI thread.
-std::vector<uint8_t> EncodeImage(const gfx::ImageSkia image) {
-  base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
-                                                base::BlockingType::MAY_BLOCK);
-
-  std::vector<uint8_t> image_data;
-
-  const gfx::ImageSkiaRep& image_skia_rep = image.GetRepresentation(1.0f);
-  if (image_skia_rep.scale() != 1.0f) {
-    return image_data;
-  }
-
-  const SkBitmap& bitmap = image_skia_rep.GetBitmap();
-  if (bitmap.drawsNothing()) {
-    return image_data;
-  }
-
-  base::AssertLongCPUWorkAllowed();
-  constexpr bool discard_transparency = false;
-  bool success = gfx::PNGCodec::EncodeBGRASkBitmap(bitmap, discard_transparency,
-                                                   &image_data);
-  if (!success) {
-    return std::vector<uint8_t>();
-  }
-  return image_data;
-}
-
 // This pipeline is meant to:
 // * Simplify loading icons, as things like effects and type are common
 //   to all loading.
@@ -362,19 +332,20 @@ void IconLoadingPipeline::LoadWebAppIcon(
           return;
         }
         FALLTHROUGH;
-      case apps::mojom::IconType::kUncompressed: {
-        // For uncompressed icon, apply the resize and pad effect.
-        icon_effects_ = static_cast<apps::IconEffects>(
-            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);
+      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);
+
+          // 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);
+        }
         FALLTHROUGH;
-      }
       case apps::mojom::IconType::kStandard:
         // If |icon_effects| are requested, we must always load the
         // uncompressed image to apply the icon effects, and then re-encode the
@@ -553,7 +524,7 @@ void IconLoadingPipeline::MaybeApplyEffectsAndComplete(
   processed_image.MakeThreadSafe();
   base::ThreadPool::PostTaskAndReplyWithResult(
       FROM_HERE, {base::MayBlock(), base::TaskPriority::USER_VISIBLE},
-      base::BindOnce(&EncodeImage, processed_image),
+      base::BindOnce(&apps::EncodeImageToPngBytes, processed_image),
       base::BindOnce(&IconLoadingPipeline::CompleteWithCompressed,
                      base::WrapRefCounted(this)));
 }
@@ -649,6 +620,32 @@ void IconLoadingPipeline::MaybeLoadFallbackOrCompleteEmpty() {
 
 namespace apps {
 
+std::vector<uint8_t> EncodeImageToPngBytes(const gfx::ImageSkia image) {
+  base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
+                                                base::BlockingType::MAY_BLOCK);
+
+  std::vector<uint8_t> image_data;
+
+  const gfx::ImageSkiaRep& image_skia_rep = image.GetRepresentation(1.0f);
+  if (image_skia_rep.scale() != 1.0f) {
+    return image_data;
+  }
+
+  const SkBitmap& bitmap = image_skia_rep.GetBitmap();
+  if (bitmap.drawsNothing()) {
+    return image_data;
+  }
+
+  base::AssertLongCPUWorkAllowed();
+  constexpr bool discard_transparency = false;
+  bool success = gfx::PNGCodec::EncodeBGRASkBitmap(bitmap, discard_transparency,
+                                                   &image_data);
+  if (!success) {
+    return std::vector<uint8_t>();
+  }
+  return image_data;
+}
+
 void ApplyIconEffects(IconEffects icon_effects,
                       int size_hint_in_dip,
                       gfx::ImageSkia* image_skia) {

chrome/browser/apps/app_service/app_icon_factory.h

@@ -44,6 +44,11 @@ enum IconEffects : uint32_t {
   kCrOsStandardMask = 0x80,  // Apply the mask to the standard icon.
 };
 
+// Encode the ImageSkia to the compressed PNG data with the image's 1.0f scale
+// factor representation. Return the encoded PNG data.
+// This function should not be called on the UI thread.
+std::vector<uint8_t> EncodeImageToPngBytes(const gfx::ImageSkia image);
+
 // Modifies |image_skia| to apply icon post-processing effects like badging and
 // desaturation to gray.
 void ApplyIconEffects(IconEffects icon_effects,

chrome/browser/apps/app_service/arc_apps.cc

@@ -14,6 +14,8 @@
 #include "base/metrics/histogram_macros.h"
 #include "base/optional.h"
 #include "base/stl_util.h"
+#include "base/task/post_task.h"
+#include "base/task/thread_pool.h"
 #include "chrome/browser/apps/app_service/app_service_proxy.h"
 #include "chrome/browser/apps/app_service/app_service_proxy_factory.h"
 #include "chrome/browser/apps/app_service/arc_apps_factory.h"
@@ -48,6 +50,19 @@
 
 namespace {
 
+void CompleteWithCompressed(apps::mojom::Publisher::LoadIconCallback callback,
+                            std::vector<uint8_t> data) {
+  if (data.empty()) {
+    std::move(callback).Run(apps::mojom::IconValue::New());
+    return;
+  }
+  apps::mojom::IconValuePtr iv = apps::mojom::IconValue::New();
+  iv->icon_type = apps::mojom::IconType::kCompressed;
+  iv->compressed = std::move(data);
+  iv->is_placeholder_icon = false;
+  std::move(callback).Run(std::move(iv));
+}
+
 void OnArcAppIconCompletelyLoaded(
     apps::mojom::IconType icon_type,
     int32_t size_hint_in_dip,
@@ -64,23 +79,26 @@ void OnArcAppIconCompletelyLoaded(
   iv->is_placeholder_icon = false;
 
   switch (icon_type) {
-    case apps::mojom::IconType::kCompressed: {
-      auto& compressed_images = icon->compressed_images();
-      auto iter =
-          compressed_images.find(apps_util::GetPrimaryDisplayUIScaleFactor());
-      if (iter == compressed_images.end()) {
-        std::move(callback).Run(apps::mojom::IconValue::New());
-        return;
-      }
-      const std::string& data = iter->second;
-      iv->compressed = std::vector<uint8_t>(data.begin(), data.end());
-      if (icon_effects != apps::IconEffects::kNone) {
-        // TODO(crbug.com/988321): decompress the image, apply icon effects then
-        // re-compress.
+    case apps::mojom::IconType::kCompressed:
+      if (!base::FeatureList::IsEnabled(features::kAppServiceAdaptiveIcon)) {
+        auto& compressed_images = icon->compressed_images();
+        auto iter =
+            compressed_images.find(apps_util::GetPrimaryDisplayUIScaleFactor());
+        if (iter == compressed_images.end()) {
+          std::move(callback).Run(apps::mojom::IconValue::New());
+          return;
+        }
+        const std::string& data = iter->second;
+        iv->compressed = std::vector<uint8_t>(data.begin(), data.end());
+        if (icon_effects != apps::IconEffects::kNone) {
+          // TODO(crbug.com/988321): decompress the image, apply icon effects
+          // then re-compress.
+        }
+        break;
       }
-      break;
-    }
+      FALLTHROUGH;
     case apps::mojom::IconType::kUncompressed:
+      FALLTHROUGH;
     case apps::mojom::IconType::kStandard: {
       if (base::FeatureList::IsEnabled(features::kAppServiceAdaptiveIcon)) {
         iv->uncompressed = gfx::ImageSkiaOperations::CreateSuperimposedImage(
@@ -99,6 +117,15 @@ void OnArcAppIconCompletelyLoaded(
       break;
   }
 
+  if (base::FeatureList::IsEnabled(features::kAppServiceAdaptiveIcon) &&
+      icon_type == apps::mojom::IconType::kCompressed) {
+    iv->uncompressed.MakeThreadSafe();
+    base::ThreadPool::PostTaskAndReplyWithResult(
+        FROM_HERE, {base::MayBlock(), base::TaskPriority::USER_VISIBLE},
+        base::BindOnce(&apps::EncodeImageToPngBytes, iv->uncompressed),
+        base::BindOnce(&CompleteWithCompressed, std::move(callback)));
+    return;
+  }
   std::move(callback).Run(std::move(iv));
 }
 

chrome/browser/apps/app_service/arc_icon_once_loader.cc

@@ -5,6 +5,7 @@
 #include "chrome/browser/apps/app_service/arc_icon_once_loader.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_icon.h"
+#include "chrome/common/chrome_features.h"
 
 namespace apps {
 
@@ -73,10 +74,16 @@ void ArcIconOnceLoader::SizeSpecificLoader::LoadIcon(
   switch (icon_type_) {
     case apps::mojom::IconType::kUnknown:
     case apps::mojom::IconType::kUncompressed:
-      icon_type = ArcAppIcon::IconType::kUncompressed;
+      icon_type =
+          base::FeatureList::IsEnabled(features::kAppServiceAdaptiveIcon)
+              ? ArcAppIcon::IconType::kAdaptive
+              : ArcAppIcon::IconType::kUncompressed;
       break;
     case apps::mojom::IconType::kCompressed:
-      icon_type = ArcAppIcon::IconType::kCompressed;
+      icon_type =
+          base::FeatureList::IsEnabled(features::kAppServiceAdaptiveIcon)
+              ? ArcAppIcon::IconType::kAdaptive
+              : ArcAppIcon::IconType::kCompressed;
       break;
     case apps::mojom::IconType::kStandard:
       icon_type = ArcAppIcon::IconType::kAdaptive;