👹 Read MASKABLE purpose from Web App Manifests.

Web App Manifest icons can have the MASKABLE purpose specifying they
were designed with all of their important content sufficiently far from
the edges to allow the User Agent to apply a mask [1].

This CL just adds code to read in that purpose, which will be used in
upcoming CLs.

[1] https://w3c.github.io/manifest/#purpose-member

Bug: 904354
Change-Id: Ib62eb7af9226d14199d0d74615cb5bbf2666abda
Reviewed-on: https://chromium-review.googlesource.com/c/1329792
Commit-Queue: Peter Conn <peconn@chromium.org>
Reviewed-by: Mounir Lamouri <mlamouri@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Reviewed-by: Peter Beverloo <peter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608448}

content/browser/background_fetch/background_fetch.proto

@@ -73,6 +73,7 @@ message BackgroundFetchOptions {
     enum Purpose {
       ANY = 1;
       BADGE = 2;
+      MASKABLE = 3;
     }
 
     // blink::Manifest::ImageResource::Purpose enum.

content/browser/background_fetch/storage/create_metadata_task.cc

@@ -270,6 +270,10 @@ void CreateMetadataTask::InitializeMetadataProto() {
           image_resource_proto->add_purpose(
               proto::BackgroundFetchOptions_ImageResource_Purpose_BADGE);
           break;
+        case blink::Manifest::ImageResource::Purpose::MASKABLE:
+          image_resource_proto->add_purpose(
+              proto::BackgroundFetchOptions_ImageResource_Purpose_MASKABLE);
+          break;
       }
     }
   }

content/renderer/manifest/manifest_parser.cc

@@ -294,6 +294,8 @@ ManifestParser::ParseIconPurpose(const base::DictionaryValue& icon) {
       purposes.push_back(blink::Manifest::ImageResource::Purpose::ANY);
     } else if (base::LowerCaseEqualsASCII(keyword, "badge")) {
       purposes.push_back(blink::Manifest::ImageResource::Purpose::BADGE);
+    } else if (base::LowerCaseEqualsASCII(keyword, "maskable")) {
+      purposes.push_back(blink::Manifest::ImageResource::Purpose::MASKABLE);
     } else {
       AddErrorInfo(
           "found icon with invalid purpose. "

content/renderer/manifest/manifest_parser_unittest.cc

@@ -965,12 +965,14 @@ TEST_F(ManifestParserTest, IconPurposeParseRules) {
   {
     blink::Manifest manifest = ParseManifest(
         "{ \"icons\": [ {\"src\": \"\","
-        "\"purpose\": \"Any Badge\" } ] }");
-    ASSERT_EQ(manifest.icons[0].purpose.size(), 2u);
+        "\"purpose\": \"Any Badge Maskable\" } ] }");
+    ASSERT_EQ(manifest.icons[0].purpose.size(), 3u);
     EXPECT_EQ(manifest.icons[0].purpose[0],
               blink::Manifest::ImageResource::Purpose::ANY);
     EXPECT_EQ(manifest.icons[0].purpose[1],
               blink::Manifest::ImageResource::Purpose::BADGE);
+    EXPECT_EQ(manifest.icons[0].purpose[2],
+              blink::Manifest::ImageResource::Purpose::MASKABLE);
     EXPECT_EQ(0u, GetErrorCount());
   }
 

third_party/blink/public/common/manifest/manifest.h

@@ -32,7 +32,8 @@ struct BLINK_COMMON_EXPORT Manifest {
     enum class Purpose {
       ANY = 0,
       BADGE,
-      IMAGE_RESOURCE_PURPOSE_LAST = BADGE,
+      MASKABLE,
+      IMAGE_RESOURCE_PURPOSE_LAST = MASKABLE,
     };
 
     ImageResource();

third_party/blink/public/common/manifest/manifest_mojom_traits.h

@@ -212,6 +212,8 @@ struct BLINK_COMMON_EXPORT
         return blink::mojom::ManifestImageResource_Purpose::ANY;
       case ::blink::Manifest::ImageResource::Purpose::BADGE:
         return blink::mojom::ManifestImageResource_Purpose::BADGE;
+      case ::blink::Manifest::ImageResource::Purpose::MASKABLE:
+        return blink::mojom::ManifestImageResource_Purpose::MASKABLE;
     }
     NOTREACHED();
     return blink::mojom::ManifestImageResource_Purpose::ANY;
@@ -225,6 +227,9 @@ struct BLINK_COMMON_EXPORT
       case blink::mojom::ManifestImageResource_Purpose::BADGE:
         *out = ::blink::Manifest::ImageResource::Purpose::BADGE;
         return true;
+      case blink::mojom::ManifestImageResource_Purpose::MASKABLE:
+        *out = ::blink::Manifest::ImageResource::Purpose::MASKABLE;
+        return true;
     }
 
     return false;

third_party/blink/public/mojom/manifest/manifest.mojom

@@ -63,6 +63,7 @@ struct ManifestImageResource {
   enum Purpose {
     ANY = 0,
     BADGE,
+    MASKABLE,
   };
 
   // MUST be a valid url. If an icon doesn't have a valid URL, it will not be

third_party/blink/renderer/modules/manifest/image_resource_type_converters.cc

@@ -64,6 +64,8 @@ WTF::Vector<Purpose> ParsePurpose(const WTF::String& purpose) {
       purpose_enum = Purpose::ANY;
     } else if (lowercase_purpose == "badge") {
       purpose_enum = Purpose::BADGE;
+    } else if (lowercase_purpose == "maskable") {
+      purpose_enum = Purpose::MASKABLE;
     } else {
       // TODO(rayankans): Issue developer warning.
       continue;
@@ -119,10 +121,20 @@ Manifest::ImageResource ConvertManifestImageResource(
   const auto purposes = mojo::ParsePurpose(icon->purpose());
   // ParsePurpose() would've weeded out any purposes that're not ANY or BADGE.
   for (auto purpose : purposes) {
-    manifest_icon.purpose.emplace_back(
-        purpose == mojo::Purpose::ANY
-            ? Manifest::ImageResource::Purpose::ANY
-            : Manifest::ImageResource::Purpose::BADGE);
+    switch (purpose) {
+      case mojo::Purpose::ANY:
+        manifest_icon.purpose.emplace_back(
+            Manifest::ImageResource::Purpose::ANY);
+        break;
+      case mojo::Purpose::BADGE:
+        manifest_icon.purpose.emplace_back(
+            Manifest::ImageResource::Purpose::BADGE);
+        break;
+      case mojo::Purpose::MASKABLE:
+        manifest_icon.purpose.emplace_back(
+            Manifest::ImageResource::Purpose::MASKABLE);
+        break;
+    }
   }
   // Parse 'sizes'.
   WTF::Vector<WebSize> sizes = mojo::ParseSizes(icon->sizes());