Initial CL for talking to the WebAPK server to generate WebAPK

content/renderer/manifest/manifest_parser.cc

Index: content/renderer/manifest/manifest_parser.cc
diff --git a/content/renderer/manifest/manifest_parser.cc b/content/renderer/manifest/manifest_parser.cc
index 23dca88bb9baf247d8b8e2f6762718a9e41bd136..5f771a8429ac08535f933b31faec3e46ae407f53 100644
--- a/content/renderer/manifest/manifest_parser.cc
+++ b/content/renderer/manifest/manifest_parser.cc
@@ -15,6 +15,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "content/public/common/manifest.h"
+#include "content/public/common/manifest_util.h"
 #include "content/renderer/manifest/manifest_uma_util.h"
 #include "third_party/WebKit/public/platform/WebColor.h"
 #include "third_party/WebKit/public/platform/WebIconSizesParser.h"
@@ -221,18 +222,11 @@ blink::WebDisplayMode ManifestParser::ParseDisplay(
   if (display.is_null())
     return blink::WebDisplayModeUndefined;
 
-  if (base::LowerCaseEqualsASCII(display.string(), "fullscreen"))
-    return blink::WebDisplayModeFullscreen;
-  else if (base::LowerCaseEqualsASCII(display.string(), "standalone"))
-    return blink::WebDisplayModeStandalone;
-  else if (base::LowerCaseEqualsASCII(display.string(), "minimal-ui"))
-    return blink::WebDisplayModeMinimalUi;
-  else if (base::LowerCaseEqualsASCII(display.string(), "browser"))
-    return blink::WebDisplayModeBrowser;
-  else {
+  blink::WebDisplayMode display_enum =
+      WebDisplayModeFromString(base::UTF16ToUTF8(display.string()));
+  if (display_enum == blink::WebDisplayModeUndefined)
     AddErrorInfo("unknown 'display' value ignored.");

[no sievers, 2016/08/05 17:53:08]

why is this an error? seems to be allowed by the spec not to override the
display mode.

[pkotwicz, 2016/08/05 18:16:21]

The case of "display mode not in Web Manifest" is handled by line 223

-    return blink::WebDisplayModeUndefined;
-  }
+  return display_enum;
 }
 
 blink::WebScreenOrientationLockType ManifestParser::ParseOrientation(
@@ -243,30 +237,12 @@ blink::WebScreenOrientationLockType ManifestParser::ParseOrientation(
   if (orientation.is_null())
     return blink::WebScreenOrientationLockDefault;
 
-  if (base::LowerCaseEqualsASCII(orientation.string(), "any"))
-    return blink::WebScreenOrientationLockAny;
-  else if (base::LowerCaseEqualsASCII(orientation.string(), "natural"))
-    return blink::WebScreenOrientationLockNatural;
-  else if (base::LowerCaseEqualsASCII(orientation.string(), "landscape"))
-    return blink::WebScreenOrientationLockLandscape;
-  else if (base::LowerCaseEqualsASCII(orientation.string(),
-                                      "landscape-primary"))
-    return blink::WebScreenOrientationLockLandscapePrimary;
-  else if (base::LowerCaseEqualsASCII(orientation.string(),
-                                      "landscape-secondary"))
-    return blink::WebScreenOrientationLockLandscapeSecondary;
-  else if (base::LowerCaseEqualsASCII(orientation.string(), "portrait"))
-    return blink::WebScreenOrientationLockPortrait;
-  else if (base::LowerCaseEqualsASCII(orientation.string(),
-                                      "portrait-primary"))
-    return blink::WebScreenOrientationLockPortraitPrimary;
-  else if (base::LowerCaseEqualsASCII(orientation.string(),
-                                      "portrait-secondary"))
-    return blink::WebScreenOrientationLockPortraitSecondary;
-  else {
+  blink::WebScreenOrientationLockType orientation_enum =
+      WebScreenOrientationLockTypeFromString(
+          base::UTF16ToUTF8(orientation.string()));
+  if (orientation_enum == blink::WebScreenOrientationLockDefault)
     AddErrorInfo("unknown 'orientation' value ignored.");

[no sievers, 2016/08/05 17:53:09]

why is 'default' orientation an error?

[pkotwicz, 2016/08/05 18:16:21]

According to the spec (https://www.w3.org/TR/appmanifest/#orientation-member):
"If value is not one of the OrientationLockType enum values, or value is
unsupported by the user agent, or the value cannot be used together with display
mode:
- Issue a developer warning.
- Return undefined."

'default' is not an OrientationLockType enum value. See
https://w3c.github.io/screen-orientation/#orientationlocktype-enum

-    return blink::WebScreenOrientationLockDefault;
-  }
+  return orientation_enum;
 }
 
 GURL ManifestParser::ParseIconSrc(const base::DictionaryValue& icon) {