Chromium Code Reviews| Index: net/base/data_url.cc |
| diff --git a/net/base/data_url.cc b/net/base/data_url.cc |
| index 9699136c85fd5cff3f62270b9336e35bd4d51f74..327e62423a11b54354c0226420678078ddbcde1c 100644 |
| --- a/net/base/data_url.cc |
| +++ b/net/base/data_url.cc |
| @@ -23,20 +23,20 @@ bool DataURL::Parse(const GURL& url, std::string* mime_type, |
| std::string* charset, std::string* data) { |
| DCHECK(mime_type->empty()); |
| DCHECK(charset->empty()); |
| - std::string::const_iterator begin = url.spec().begin(); |
| - std::string::const_iterator end = url.spec().end(); |
| - std::string::const_iterator after_colon = std::find(begin, end, ':'); |
| - if (after_colon == end) |
| + if (!url.SchemeIs("data")) |
|
asanka
2014/06/16 17:45:48
Make this a DCHECK instead.
Erik Dahlström (inactive)
2014/06/17 13:10:21
Done.
|
| return false; |
| - ++after_colon; |
| - std::string::const_iterator comma = std::find(after_colon, end, ','); |
| + const std::string path = url.path(); |
| + std::string::const_iterator begin = path.begin(); |
| + std::string::const_iterator end = path.end(); |
| + |
| + std::string::const_iterator comma = std::find(begin, end, ','); |
| if (comma == end) |
| return false; |
| std::vector<std::string> meta_data; |
| - std::string unparsed_meta_data(after_colon, comma); |
| + std::string unparsed_meta_data(begin, comma); |
| base::SplitString(unparsed_meta_data, ';', &meta_data); |
| std::vector<std::string>::iterator iter = meta_data.begin(); |