diff options
| author | davidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-22 19:24:43 +0000 |
|---|---|---|
| committer | davidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-22 19:24:43 +0000 |
| commit | 675957f87020a0b1231741f185501513b66cc05a (patch) | |
| tree | f8f58c2ca5e3cd4a745bf2596659fd3644773c34 /webkit | |
| parent | c1fc04d64f103c689f43296510b6b6f50704f871 (diff) | |
| download | chromium_src-675957f87020a0b1231741f185501513b66cc05a.zip chromium_src-675957f87020a0b1231741f185501513b66cc05a.tar.gz chromium_src-675957f87020a0b1231741f185501513b66cc05a.tar.bz2 | |
Add ResourceType::PING and mark those requests as detachable.
This avoids cancelling <a ping> requests on cross-process navigations
when the owning renderer dies.
Actually assigning resources this type is conditioned on a currently
undefined WEBKIT_HAS_TARGET_PING symbol to be defined in a follow-up
Blink CL. The #ifdef can then be removed when that lands.
BUG=302816
TEST=ResourceDispatcherHostTest.DeletedFilterDetachable
Review URL: https://codereview.chromium.org/55513002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236807 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/common/resource_type.cc | 4 | ||||
| -rw-r--r-- | webkit/common/resource_type.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/webkit/common/resource_type.cc b/webkit/common/resource_type.cc index 678131b..a8c3657 100644 --- a/webkit/common/resource_type.cc +++ b/webkit/common/resource_type.cc @@ -40,6 +40,10 @@ ResourceType::Type ResourceType::FromTargetType( return ResourceType::FAVICON; case WebURLRequest::TargetIsXHR: return ResourceType::XHR; +#if defined(WEBKIT_HAS_TARGET_IS_PING) + case WebURLRequest::TargetIsPing: + return ResourceType::PING; +#endif default: NOTREACHED(); return ResourceType::SUB_RESOURCE; diff --git a/webkit/common/resource_type.h b/webkit/common/resource_type.h index d63c02c..014a722 100644 --- a/webkit/common/resource_type.h +++ b/webkit/common/resource_type.h @@ -29,6 +29,7 @@ class ResourceType { PREFETCH, // an explicitly requested prefetch FAVICON, // a favicon XHR, // a XMLHttpRequest + PING, // a ping request for <a ping> LAST_TYPE // Place holder so we don't need to change ValidType // everytime. }; |