diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-18 18:32:45 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-18 18:38:07 +0000 |
| commit | 513209b27ff55e2841eac0e4120199c23acce758 (patch) | |
| tree | aeba30bb08c5f47c57003544e378a377c297eee6 /net/base/mime_util.cc | |
| parent | 164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff) | |
| download | external_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2 | |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'net/base/mime_util.cc')
| -rw-r--r-- | net/base/mime_util.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc index a580997..ddcfc4b 100644 --- a/net/base/mime_util.cc +++ b/net/base/mime_util.cc @@ -82,6 +82,7 @@ static const MimeInfo primary_mappings[] = { { "text/xml", "xml" }, { "image/gif", "gif" }, { "image/jpeg", "jpeg,jpg" }, + { "image/webp", "webp" }, { "image/png", "png" }, { "video/mp4", "mp4,m4v" }, { "audio/x-m4a", "m4a" }, @@ -192,6 +193,7 @@ static const char* const supported_image_types[] = { "image/jpeg", "image/pjpeg", "image/jpg", + "image/webp", "image/png", "image/gif", "image/bmp", @@ -547,6 +549,7 @@ static const char* kStandardImageTypes[] = { "image/gif", "image/ief", "image/jpeg", + "image/webp", "image/pict", "image/pipeg", "image/png", @@ -660,7 +663,6 @@ void HashSetToVector(base::hash_set<T>* source, std::vector<T>* target) { target->at(old_target_size + i) = *iter; } } - } void GetImageExtensions(std::vector<FilePath::StringType>* extensions) { |