summaryrefslogtreecommitdiffstats
path: root/webkit/appcache/manifest_parser.h
diff options
context:
space:
mode:
authorjennb@chromium.org <jennb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-10 23:58:18 +0000
committerjennb@chromium.org <jennb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-10 23:58:18 +0000
commitb160d6dc73b9ce92827f81517d9b155006a4e422 (patch)
treeaa90f4368acd71b1c2a670e4e5533723722d66ed /webkit/appcache/manifest_parser.h
parent9cdef414f2d081d6144ca1578b4fe1d0d4cf7b4d (diff)
downloadchromium_src-b160d6dc73b9ce92827f81517d9b155006a4e422.zip
chromium_src-b160d6dc73b9ce92827f81517d9b155006a4e422.tar.gz
chromium_src-b160d6dc73b9ce92827f81517d9b155006a4e422.tar.bz2
Update manifest parser code to match current HTML5 spec by
adding support for whitelisting all URLs using a wildcard and using namespace in place of URL for fallback and network sections. BUG=none TEST=added checks for wildcard character in all sections Review URL: http://codereview.chromium.org/165151 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22972 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/appcache/manifest_parser.h')
-rw-r--r--webkit/appcache/manifest_parser.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/webkit/appcache/manifest_parser.h b/webkit/appcache/manifest_parser.h
index 3bff98a..e9f80d9 100644
--- a/webkit/appcache/manifest_parser.h
+++ b/webkit/appcache/manifest_parser.h
@@ -41,13 +41,15 @@ class GURL;
namespace appcache {
-typedef std::vector<std::pair<GURL, GURL> > FallbackUrlVector;
+typedef std::pair<GURL, GURL> FallbackNamespace;
-// TODO(jennb): spec changed since webkit implementation. Update in next CL.
struct Manifest {
- std::vector<GURL> online_whitelisted_urls;
base::hash_set<std::string> explicit_urls;
- FallbackUrlVector fallback_urls;
+ std::vector<FallbackNamespace> fallback_namespaces;
+ std::vector<GURL> online_whitelist_namespaces;
+ bool online_whitelist_all;
+
+ Manifest() : online_whitelist_all(false) {}
};
bool ParseManifest(const GURL& manifest_url, const char* data, int length,