Renamed Manifest::Purpose::BADGE to MONOCHROME to match the spec.

Web App Manifest spec term was updated recently: w3c/manifest#833 Bug: 1096388 Fixes: 1096388 Change-Id: I6fe6da6abb8d4e06391c46d4054a746bc49e6e1f Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2291512 Reviewed-by: Matthew Jones <[email protected]> Reviewed-by: Dominick Ng <[email protected]> Reviewed-by: Mugdha Lakhani <[email protected]> Commit-Queue: Glen Robertson <[email protected]> Cr-Commit-Position: refs/heads/master@{#788482}
blueboxd · Jul 15, 2020 · 41d3c0f · 41d3c0f
1 parent 6de14c0
commit 41d3c0f
Show file tree

Hide file tree

Showing 26 changed files with 78 additions and 75 deletions.
diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res/values/dimens.xml
@@ -203,7 +203,7 @@
          83dp -->
     <dimen name="webapk_adaptive_icon_size">83dp</dimen>
 
-    <dimen name="webapk_badge_icon_size">24dp</dimen>
+    <dimen name="webapk_monochrome_icon_size">24dp</dimen>
 
     <!-- Toolbar dimensions -->
     <dimen name="toolbar_tab_count_text_size_1_digit">12dp</dimen>

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java
@@ -678,12 +678,12 @@ public static int getMinimumSplashImageSizeInPx(Context context) {
     }
 
     /**
-     * Returns the ideal size for a badge icon of a WebAPK.
+     * Returns the ideal size for a monochrome icon of a WebAPK.
      * @param context Context to pull resources from.
-     * @return the dimensions in pixels which the badge icon should have.
+     * @return the dimensions in pixels which the monochrome icon should have.
      */
-    public static int getIdealBadgeIconSizeInPx(Context context) {
-        return getSizeFromResourceInPx(context, R.dimen.webapk_badge_icon_size);
+    public static int getIdealMonochromeIconSizeInPx(Context context) {
+        return getSizeFromResourceInPx(context, R.dimen.webapk_monochrome_icon_size);
     }
 
     /**
@@ -747,7 +747,7 @@ private static int[] getIconSizes() {
         // This ordering must be kept up to date with the C++ ShortcutHelper.
         return new int[] {getIdealHomescreenIconSizeInPx(context),
                 getMinimumHomescreenIconSizeInPx(context), getIdealSplashImageSizeInPx(context),
-                getMinimumSplashImageSizeInPx(context), getIdealBadgeIconSizeInPx(context),
+                getMinimumSplashImageSizeInPx(context), getIdealMonochromeIconSizeInPx(context),
                 getIdealAdaptiveLauncherIconSizeInPx(context),
                 ViewUtils.dpToPx(context, SHORTCUT_ICON_IDEAL_SIZE_DP)};
     }

diff --git a/...me/android/junit/src/org/chromium/chrome/browser/webapps/WebApkUpdateManagerUnitTest.java b/...me/android/junit/src/org/chromium/chrome/browser/webapps/WebApkUpdateManagerUnitTest.java
@@ -977,10 +977,11 @@ public void testPrimaryIconUrlChangeShouldUpgrade() {
      * AND
      * - "best" icon URL for the primary icon did not change.
      * AND
-     * - "best" icon URL for the badge icon did not change.
+     * - "best" icon URL for the monochrome icon did not change.
      */
     @Test
-    public void testIconUrlsChangeShouldNotUpgradeIfPrimaryIconUrlAndBadgeIconUrlDoNotChange() {
+    public void
+    testIconUrlsChangeShouldNotUpgradeIfPrimaryIconUrlAndMonochromeIconUrlDoNotChange() {
         ManifestData fetchedData = defaultManifestData();
         fetchedData.iconUrlToMurmur2HashMap.put("/icon2.png", null);
         assertFalse(checkUpdateNeededForFetchedManifest(defaultManifestData(), fetchedData));
@@ -998,8 +999,8 @@ public void testIconUrlsChangeShouldNotUpgradeIfPrimaryIconUrlAndBadgeIconUrlDoN
     public void testWebManifestSameButBestIconUrlChangedShouldNotUpgrade() {
         String iconUrl1 = "/icon1.png";
         String iconUrl2 = "/icon2.png";
-        String badgeUrl1 = "/badge1.png";
-        String badgeUrl2 = "/badge2.pgn";
+        String monochromeUrl1 = "/monochrome1.png";
+        String monochromeUrl2 = "/monochrome2.png";
         String hash1 = "11";
         String hash2 = "22";
         String hash3 = "33";
@@ -1010,16 +1011,16 @@ public void testWebManifestSameButBestIconUrlChangedShouldNotUpgrade() {
         androidManifestData.iconUrlToMurmur2HashMap.clear();
         androidManifestData.iconUrlToMurmur2HashMap.put(iconUrl1, hash1);
         androidManifestData.iconUrlToMurmur2HashMap.put(iconUrl2, hash2);
-        androidManifestData.iconUrlToMurmur2HashMap.put(badgeUrl1, hash3);
-        androidManifestData.iconUrlToMurmur2HashMap.put(badgeUrl2, hash4);
+        androidManifestData.iconUrlToMurmur2HashMap.put(monochromeUrl1, hash3);
+        androidManifestData.iconUrlToMurmur2HashMap.put(monochromeUrl2, hash4);
 
         ManifestData fetchedManifestData = defaultManifestData();
         fetchedManifestData.primaryIconUrl = iconUrl2;
         fetchedManifestData.iconUrlToMurmur2HashMap.clear();
         fetchedManifestData.iconUrlToMurmur2HashMap.put(iconUrl1, null);
         fetchedManifestData.iconUrlToMurmur2HashMap.put(iconUrl2, hash2);
-        fetchedManifestData.iconUrlToMurmur2HashMap.put(badgeUrl1, null);
-        fetchedManifestData.iconUrlToMurmur2HashMap.put(badgeUrl2, hash4);
+        fetchedManifestData.iconUrlToMurmur2HashMap.put(monochromeUrl1, null);
+        fetchedManifestData.iconUrlToMurmur2HashMap.put(monochromeUrl2, hash4);
 
         assertFalse(checkUpdateNeededForFetchedManifest(androidManifestData, fetchedManifestData));
     }

diff --git a/chrome/browser/android/shortcut_helper.cc b/chrome/browser/android/shortcut_helper.cc
@@ -45,7 +45,7 @@ int g_ideal_homescreen_icon_size = -1;
 int g_minimum_homescreen_icon_size = -1;
 int g_ideal_splash_image_size = -1;
 int g_minimum_splash_image_size = -1;
-int g_ideal_badge_icon_size = -1;
+int g_ideal_monochrome_icon_size = -1;
 int g_ideal_adaptive_launcher_icon_size = -1;
 int g_ideal_shortcut_icon_size = -1;
 
@@ -68,7 +68,7 @@ void GetIconSizes() {
   g_minimum_homescreen_icon_size = sizes[1];
   g_ideal_splash_image_size = sizes[2];
   g_minimum_splash_image_size = sizes[3];
-  g_ideal_badge_icon_size = sizes[4];
+  g_ideal_monochrome_icon_size = sizes[4];
   g_ideal_adaptive_launcher_icon_size = sizes[5];
   g_ideal_shortcut_icon_size = sizes[6];
 

diff --git a/chrome/browser/android/webapk/webapk.proto b/chrome/browser/android/webapk/webapk.proto
@@ -126,9 +126,8 @@ message Image {
     // The icon can be displayed in any context.
     ANY = 1;
 
-    // The icon can be used where space constraints and/or color requirements
-    // differ from those of the application icon.
-    // BADGE = 2; We do not plan to support Badge purpose, and will ignore it.
+    // The icon can be used where a monochrome icon with a solid fill is needed.
+    // MONOCHROME = 2; This is not currently used, so ignore it.
 
     // The icon is designed with the intention to be masked.
     MASKABLE = 3;

diff --git a/chrome/browser/installable/installable_manager_unittest.cc b/chrome/browser/installable/installable_manager_unittest.cc
@@ -227,7 +227,7 @@ TEST_F(InstallableManagerUnitTest,
   EXPECT_EQ(NO_ERROR_DETECTED, GetErrorCode());
 
   // The icon MUST have IconPurpose::ANY or IconPurpose::Maskable.
-  manifest.icons[0].purpose[0] = IconPurpose::BADGE;
+  manifest.icons[0].purpose[0] = IconPurpose::MONOCHROME;
   EXPECT_FALSE(IsManifestValid(manifest, true, true));
   EXPECT_EQ(MANIFEST_MISSING_SUITABLE_ICON, GetErrorCode());
 

diff --git a/chrome/browser/web_applications/components/web_app_install_utils_unittest.cc b/chrome/browser/web_applications/components/web_app_install_utils_unittest.cc
@@ -126,12 +126,12 @@ TEST(WebAppInstallUtils, UpdateWebAppInfoFromManifest) {
   blink::Manifest::ImageResource icon;
   icon.src = AppIcon2();
   icon.purpose = {blink::Manifest::ImageResource::Purpose::ANY,
-                  blink::Manifest::ImageResource::Purpose::BADGE};
+                  blink::Manifest::ImageResource::Purpose::MONOCHROME};
   manifest.icons.push_back(icon);
   icon.src = AppIcon3();
   manifest.icons.push_back(icon);
   // Add an icon without purpose ANY (expect to be ignored).
-  icon.purpose = {blink::Manifest::ImageResource::Purpose::BADGE};
+  icon.purpose = {blink::Manifest::ImageResource::Purpose::MONOCHROME};
   manifest.icons.push_back(icon);
 
   UpdateWebAppInfoFromManifest(manifest, &web_app_info);
@@ -241,12 +241,12 @@ TEST_F(WebAppInstallUtilsWithShortcutsMenu,
   blink::Manifest::ImageResource icon;
   icon.src = AppIcon2();
   icon.purpose = {blink::Manifest::ImageResource::Purpose::ANY,
-                  blink::Manifest::ImageResource::Purpose::BADGE};
+                  blink::Manifest::ImageResource::Purpose::MONOCHROME};
   manifest.icons.push_back(icon);
   icon.src = AppIcon3();
   manifest.icons.push_back(icon);
   // Add an icon without purpose ANY (expect to be ignored).
-  icon.purpose = {blink::Manifest::ImageResource::Purpose::BADGE};
+  icon.purpose = {blink::Manifest::ImageResource::Purpose::MONOCHROME};
   manifest.icons.push_back(icon);
 
   // Test that shortcuts in the manifest replace those in |web_app_info|.

diff --git a/chrome/test/data/banners/manifest.json b/chrome/test/data/banners/manifest.json
@@ -15,7 +15,7 @@
       "src": "launcher-icon-2x.png",
       "sizes": "96x96",
       "type": "image/png",
-      "purpose": "any badge"
+      "purpose": "any monochrome"
     },
     {
       "src": "launcher-icon-3x.png",

diff --git a/chrome/test/data/banners/manifest_empty_name_short_name.json b/chrome/test/data/banners/manifest_empty_name_short_name.json
@@ -14,7 +14,7 @@
       "src": "launcher-icon-2x.png",
       "sizes": "96x96",
       "type": "image/png",
-      "purpose": "any badge"
+      "purpose": "any monochrome"
     },
     {
       "src": "launcher-icon-3x.png",

diff --git a/chrome/test/data/banners/manifest_too_small_icon.json b/chrome/test/data/banners/manifest_too_small_icon.json
@@ -5,7 +5,7 @@
       "src": "launcher-icon-1x.png",
       "sizes": "48x48",
       "type": "image/png",
-      "purpose": "any badge"
+      "purpose": "any monochrome"
     }
   ],
   "start_url": "manifest_test_page.html",

diff --git a/chrome/test/data/banners/manifest_with_file_handlers.json b/chrome/test/data/banners/manifest_with_file_handlers.json
@@ -15,7 +15,7 @@
       "src": "launcher-icon-2x.png",
       "sizes": "96x96",
       "type": "image/png",
-      "purpose": "any badge"
+      "purpose": "any monochrome"
     },
     {
       "src": "launcher-icon-3x.png",

diff --git a/chrome/test/data/banners/release_notes_manifest.json b/chrome/test/data/banners/release_notes_manifest.json
@@ -16,7 +16,7 @@
       "src": "launcher-icon-2x.png",
       "sizes": "96x96",
       "type": "image/png",
-      "purpose": "any badge"
+      "purpose": "any monochrome"
     },
     {
       "src": "launcher-icon-3x.png",

diff --git a/content/browser/background_fetch/background_fetch.proto b/content/browser/background_fetch/background_fetch.proto
@@ -72,7 +72,7 @@ message BackgroundFetchOptions {
     // https://w3c.github.io/manifest/#purpose-member
     enum Purpose {
       ANY = 1;
-      BADGE = 2;
+      MONOCHROME = 2;
       MASKABLE = 3;
     }
 

diff --git a/content/browser/background_fetch/storage/create_metadata_task.cc b/content/browser/background_fetch/storage/create_metadata_task.cc
@@ -264,9 +264,9 @@ void CreateMetadataTask::InitializeMetadataProto() {
           image_resource_proto->add_purpose(
               proto::BackgroundFetchOptions_ImageResource_Purpose_ANY);
           break;
-        case blink::Manifest::ImageResource::Purpose::BADGE:
+        case blink::Manifest::ImageResource::Purpose::MONOCHROME:
           image_resource_proto->add_purpose(
-              proto::BackgroundFetchOptions_ImageResource_Purpose_BADGE);
+              proto::BackgroundFetchOptions_ImageResource_Purpose_MONOCHROME);
           break;
         case blink::Manifest::ImageResource::Purpose::MASKABLE:
           image_resource_proto->add_purpose(

diff --git a/content/browser/background_fetch/storage/get_initialization_data_task.cc b/content/browser/background_fetch/storage/get_initialization_data_task.cc
@@ -361,9 +361,9 @@ class FillFromMetadataTask : public InitializationSubTask {
           case proto::BackgroundFetchOptions_ImageResource_Purpose_ANY:
             ir.purpose.push_back(blink::Manifest::ImageResource::Purpose::ANY);
             break;
-          case proto::BackgroundFetchOptions_ImageResource_Purpose_BADGE:
+          case proto::BackgroundFetchOptions_ImageResource_Purpose_MONOCHROME:
             ir.purpose.push_back(
-                blink::Manifest::ImageResource::Purpose::BADGE);
+                blink::Manifest::ImageResource::Purpose::MONOCHROME);
             break;
         }
       }

diff --git a/content/test/data/payments/payment_app_invocation.html b/content/test/data/payments/payment_app_invocation.html
@@ -33,7 +33,7 @@
               'src': 'icon-2x.png',
               'sizes': '96x96',
               'type': 'image/png',
-              'purpose': 'any badge'
+              'purpose': 'any monochrome'
             }
           ]
         }),

diff --git a/third_party/blink/common/manifest/manifest_icon_selector_unittest.cc b/third_party/blink/common/manifest/manifest_icon_selector_unittest.cc
@@ -140,23 +140,24 @@ TEST_P(ManifestIconSelectorTest, PurposeFiltering) {
   sizes_144.push_back(gfx::Size(width_to_height_ratio() * 144, 144));
 
   std::vector<blink::Manifest::ImageResource> icons;
-  icons.push_back(
-      CreateIcon("http://foo.com/icon_48.png", "", sizes_48, Purpose::BADGE));
+  icons.push_back(CreateIcon("http://foo.com/icon_48.png", "", sizes_48,
+                             Purpose::MONOCHROME));
   icons.push_back(
       CreateIcon("http://foo.com/icon_96.png", "", sizes_96, Purpose::ANY));
   icons.push_back(
       CreateIcon("http://foo.com/icon_144.png", "", sizes_144, Purpose::ANY));
 
-  GURL url = FindBestMatchingIcon(icons, 48, kMinimumIconSize, Purpose::BADGE);
+  GURL url =
+      FindBestMatchingIcon(icons, 48, kMinimumIconSize, Purpose::MONOCHROME);
   EXPECT_EQ("http://foo.com/icon_48.png", url.spec());
 
   url = FindBestMatchingIcon(icons, 48, kMinimumIconSize, Purpose::ANY);
   EXPECT_EQ("http://foo.com/icon_96.png", url.spec());
 
-  url = FindBestMatchingIcon(icons, 96, kMinimumIconSize, Purpose::BADGE);
+  url = FindBestMatchingIcon(icons, 96, kMinimumIconSize, Purpose::MONOCHROME);
   EXPECT_EQ("http://foo.com/icon_48.png", url.spec());
 
-  url = FindBestMatchingIcon(icons, 96, 96, Purpose::BADGE);
+  url = FindBestMatchingIcon(icons, 96, 96, Purpose::MONOCHROME);
   EXPECT_TRUE(url.is_empty());
 
   url = FindBestMatchingIcon(icons, 144, kMinimumIconSize, Purpose::ANY);

diff --git a/third_party/blink/public/common/manifest/manifest.h b/third_party/blink/public/common/manifest/manifest.h
@@ -31,7 +31,7 @@ struct BLINK_COMMON_EXPORT Manifest {
   struct BLINK_COMMON_EXPORT ImageResource {
     enum class Purpose {
       ANY = 0,
-      BADGE,
+      MONOCHROME,
       MASKABLE,
       IMAGE_RESOURCE_PURPOSE_LAST = MASKABLE,
     };

diff --git a/third_party/blink/public/common/manifest/manifest_mojom_traits.h b/third_party/blink/public/common/manifest/manifest_mojom_traits.h
@@ -328,8 +328,8 @@ struct BLINK_COMMON_EXPORT
     switch (purpose) {
       case ::blink::Manifest::ImageResource::Purpose::ANY:
         return blink::mojom::ManifestImageResource_Purpose::ANY;
-      case ::blink::Manifest::ImageResource::Purpose::BADGE:
-        return blink::mojom::ManifestImageResource_Purpose::BADGE;
+      case ::blink::Manifest::ImageResource::Purpose::MONOCHROME:
+        return blink::mojom::ManifestImageResource_Purpose::MONOCHROME;
       case ::blink::Manifest::ImageResource::Purpose::MASKABLE:
         return blink::mojom::ManifestImageResource_Purpose::MASKABLE;
     }
@@ -342,8 +342,8 @@ struct BLINK_COMMON_EXPORT
       case blink::mojom::ManifestImageResource_Purpose::ANY:
         *out = ::blink::Manifest::ImageResource::Purpose::ANY;
         return true;
-      case blink::mojom::ManifestImageResource_Purpose::BADGE:
-        *out = ::blink::Manifest::ImageResource::Purpose::BADGE;
+      case blink::mojom::ManifestImageResource_Purpose::MONOCHROME:
+        *out = ::blink::Manifest::ImageResource::Purpose::MONOCHROME;
         return true;
       case blink::mojom::ManifestImageResource_Purpose::MASKABLE:
         *out = ::blink::Manifest::ImageResource::Purpose::MASKABLE;

diff --git a/third_party/blink/public/mojom/manifest/manifest.mojom b/third_party/blink/public/mojom/manifest/manifest.mojom
@@ -87,7 +87,7 @@ struct ManifestShortcutItem {
 struct ManifestImageResource {
   enum Purpose {
     ANY = 0,
-    BADGE,
+    MONOCHROME,
     MASKABLE,
   };
 

diff --git a/third_party/blink/renderer/modules/manifest/fuzzer_seed_corpus/manifest_minimal-ui.json b/third_party/blink/renderer/modules/manifest/fuzzer_seed_corpus/manifest_minimal-ui.json
@@ -5,7 +5,7 @@
       "src": "launcher-icon-4x.png",
       "sizes": "192x192",
       "type": "image/png",
-      "purpose": "badge"
+      "purpose": "monochrome"
     }
   ],
   "start_url": "/",

diff --git a/third_party/blink/renderer/modules/manifest/image_resource_type_converters.cc b/third_party/blink/renderer/modules/manifest/image_resource_type_converters.cc
@@ -63,8 +63,8 @@ WTF::Vector<Purpose> ParsePurpose(const WTF::String& purpose) {
     Purpose purpose_enum;
     if (lowercase_purpose == "any") {
       purpose_enum = Purpose::ANY;
-    } else if (lowercase_purpose == "badge") {
-      purpose_enum = Purpose::BADGE;
+    } else if (lowercase_purpose == "monochrome") {
+      purpose_enum = Purpose::MONOCHROME;
     } else if (lowercase_purpose == "maskable") {
       purpose_enum = Purpose::MASKABLE;
     } else {
@@ -122,16 +122,17 @@ Manifest::ImageResource ConvertManifestImageResource(
 
   // Parse 'purpose'
   const auto purposes = mojo::ParsePurpose(icon->purpose());
-  // ParsePurpose() would've weeded out any purposes that're not ANY or BADGE.
+  // ParsePurpose() would've weeded out any purposes that're not ANY or
+  // MONOCHROME.
   for (auto purpose : purposes) {
     switch (purpose) {
       case mojo::Purpose::ANY:
         manifest_icon.purpose.emplace_back(
             Manifest::ImageResource::Purpose::ANY);
         break;
-      case mojo::Purpose::BADGE:
+      case mojo::Purpose::MONOCHROME:
         manifest_icon.purpose.emplace_back(
-            Manifest::ImageResource::Purpose::BADGE);
+            Manifest::ImageResource::Purpose::MONOCHROME);
         break;
       case mojo::Purpose::MASKABLE:
         manifest_icon.purpose.emplace_back(