Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Side by Side Diff: net/base/data_url.cc

Issue 1986053003: Remove default charset of dataURL request (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: for RFC Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/fast/loader/data-url-charset.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // NOTE: based loosely on mozilla's nsDataChannel.cpp 5 // NOTE: based loosely on mozilla's nsDataChannel.cpp
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "net/base/data_url.h" 9 #include "net/base/data_url.h"
10 10
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 // specified in RFC2045. As specified in RFC2397, we use |charset| even if 72 // specified in RFC2045. As specified in RFC2397, we use |charset| even if
73 // |mime_type| is empty. 73 // |mime_type| is empty.
74 mime_type->assign("text/plain"); 74 mime_type->assign("text/plain");
75 } else if (!ParseMimeTypeWithoutParameter(*mime_type, NULL, NULL)) { 75 } else if (!ParseMimeTypeWithoutParameter(*mime_type, NULL, NULL)) {
76 // Fallback to the default as recommended in RFC2045 when the mediatype 76 // Fallback to the default as recommended in RFC2045 when the mediatype
77 // value is invalid. For this case, we don't respect |charset| but force it 77 // value is invalid. For this case, we don't respect |charset| but force it
78 // set to "US-ASCII". 78 // set to "US-ASCII".
79 mime_type->assign("text/plain"); 79 mime_type->assign("text/plain");
80 charset->assign("US-ASCII"); 80 charset->assign("US-ASCII");
81 } 81 }
82 if (charset->empty())
83 charset->assign("US-ASCII");
84 82
85 // The caller may not be interested in receiving the data. 83 // The caller may not be interested in receiving the data.
86 if (!data) 84 if (!data)
87 return true; 85 return true;
88 86
89 // Preserve spaces if dealing with text or xml input, same as mozilla: 87 // Preserve spaces if dealing with text or xml input, same as mozilla:
90 // https://bugzilla.mozilla.org/show_bug.cgi?id=138052 88 // https://bugzilla.mozilla.org/show_bug.cgi?id=138052
91 // but strip them otherwise: 89 // but strip them otherwise:
92 // https://bugzilla.mozilla.org/show_bug.cgi?id=37200 90 // https://bugzilla.mozilla.org/show_bug.cgi?id=37200
93 // (Spaces in a data URL should be escaped, which is handled below, so any 91 // (Spaces in a data URL should be escaped, which is handled below, so any
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 temp_data.resize(length + padding_needed, '='); 131 temp_data.resize(length + padding_needed, '=');
134 } 132 }
135 return base::Base64Decode(temp_data, data); 133 return base::Base64Decode(temp_data, data);
136 } 134 }
137 135
138 temp_data.swap(*data); 136 temp_data.swap(*data);
139 return true; 137 return true;
140 } 138 }
141 139
142 } // namespace net 140 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/fast/loader/data-url-charset.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698