| Index: webkit/browser/appcache/manifest_parser.h
|
| diff --git a/webkit/browser/appcache/manifest_parser.h b/webkit/browser/appcache/manifest_parser.h
|
| index 44661ef1fa0da3a65965c728e2f4f1ae10cbd348..c8d5f00a91359201cf71cffcb0aa313527bde7dc 100644
|
| --- a/webkit/browser/appcache/manifest_parser.h
|
| +++ b/webkit/browser/appcache/manifest_parser.h
|
| @@ -52,12 +52,20 @@ struct WEBKIT_STORAGE_BROWSER_EXPORT Manifest {
|
| NamespaceVector fallback_namespaces;
|
| NamespaceVector online_whitelist_namespaces;
|
| bool online_whitelist_all;
|
| + bool did_ignore_intercept_namespaces;
|
| };
|
|
|
| -WEBKIT_STORAGE_BROWSER_EXPORT bool ParseManifest(const GURL& manifest_url,
|
| - const char* data,
|
| - int length,
|
| - Manifest& manifest);
|
| +enum ParseMode {
|
| + PARSE_MANIFEST_PER_STANDARD,
|
| + PARSE_MANIFEST_ALLOWING_INTERCEPTS
|
| +};
|
| +
|
| +WEBKIT_STORAGE_BROWSER_EXPORT bool ParseManifest(
|
| + const GURL& manifest_url,
|
| + const char* data,
|
| + int length,
|
| + ParseMode parse_mode,
|
| + Manifest& manifest);
|
|
|
| } // namespace appcache
|
|
|
|
|