diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-11 10:11:06 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-11 10:11:06 +0000 |
| commit | 56d44ae10da335d864814434cf9c5ff8e9641b4b (patch) | |
| tree | 74bdab1e26a197ecc52dd05a065bc3c1267da352 /webkit/glue/weburlloader_impl.cc | |
| parent | 04390799bdd8eada3630b70a59515b2a2aedaedc (diff) | |
| download | chromium_src-56d44ae10da335d864814434cf9c5ff8e9641b4b.zip chromium_src-56d44ae10da335d864814434cf9c5ff8e9641b4b.tar.gz chromium_src-56d44ae10da335d864814434cf9c5ff8e9641b4b.tar.bz2 | |
WebKit update 51960:51976.
The change to weburlloader_impl.cc comes from:
http://codereview.chromium.org/477008
Which is needed when picking up:
http://trac.webkit.org/changeset/51967
TBR=dglazkov
Review URL: http://codereview.chromium.org/487025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34341 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/weburlloader_impl.cc')
| -rw-r--r-- | webkit/glue/weburlloader_impl.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/webkit/glue/weburlloader_impl.cc b/webkit/glue/weburlloader_impl.cc index c64ab24..44d6f82 100644 --- a/webkit/glue/weburlloader_impl.cc +++ b/webkit/glue/weburlloader_impl.cc @@ -105,10 +105,18 @@ ResourceType::Type FromTargetType(WebURLRequest::TargetType type) { switch (type) { case WebURLRequest::TargetIsMainFrame: return ResourceType::MAIN_FRAME; - case WebURLRequest::TargetIsSubFrame: + case WebURLRequest::TargetIsSubframe: return ResourceType::SUB_FRAME; - case WebURLRequest::TargetIsSubResource: + case WebURLRequest::TargetIsSubresource: return ResourceType::SUB_RESOURCE; + case WebURLRequest::TargetIsStyleSheet: + return ResourceType::STYLESHEET; + case WebURLRequest::TargetIsScript: + return ResourceType::SCRIPT; + case WebURLRequest::TargetIsFontResource: + return ResourceType::FONT_RESOURCE; + case WebURLRequest::TargetIsImage: + return ResourceType::IMAGE; case WebURLRequest::TargetIsObject: return ResourceType::OBJECT; case WebURLRequest::TargetIsMedia: |