зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1262359 (part 1) - Remove unused |hashRef| parameter from nsDataHandler::ParseURI(). r=jduell.
--HG-- extra : rebase_source : 416a8cb87d12bbd862652728141c2e68a1f4dfee
This commit is contained in:
Родитель
3198d86996
Коммит
e847bfec30
|
@ -29,10 +29,10 @@ nsDataChannel::OpenContentStream(bool async, nsIInputStream **result,
|
|||
rv = URI()->GetAsciiSpec(spec);
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
|
||||
nsCString contentType, contentCharset, dataBuffer, hashRef;
|
||||
nsCString contentType, contentCharset, dataBuffer;
|
||||
bool lBase64;
|
||||
rv = nsDataHandler::ParseURI(spec, contentType, contentCharset,
|
||||
lBase64, dataBuffer, hashRef);
|
||||
lBase64, dataBuffer);
|
||||
|
||||
NS_UnescapeURL(dataBuffer);
|
||||
|
||||
|
|
|
@ -77,9 +77,9 @@ nsDataHandler::NewURI(const nsACString &aSpec,
|
|||
rv = uri->SetRef(spec);
|
||||
} else {
|
||||
// Otherwise, we'll assume |spec| is a fully-specified data URI
|
||||
nsAutoCString contentType, contentCharset, dataBuffer, hashRef;
|
||||
nsAutoCString contentType, contentCharset, dataBuffer;
|
||||
bool base64;
|
||||
rv = ParseURI(spec, contentType, contentCharset, base64, dataBuffer, hashRef);
|
||||
rv = ParseURI(spec, contentType, contentCharset, base64, dataBuffer);
|
||||
if (NS_FAILED(rv))
|
||||
return rv;
|
||||
|
||||
|
@ -155,8 +155,8 @@ nsDataHandler::ParseURI(nsCString& spec,
|
|||
nsCString& contentType,
|
||||
nsCString& contentCharset,
|
||||
bool& isBase64,
|
||||
nsCString& dataBuffer,
|
||||
nsCString& hashRef) {
|
||||
nsCString& dataBuffer)
|
||||
{
|
||||
isBase64 = false;
|
||||
|
||||
// move past "data:"
|
||||
|
@ -227,10 +227,8 @@ nsDataHandler::ParseURI(nsCString& spec,
|
|||
char *data = comma + 1;
|
||||
if (!hash) {
|
||||
dataBuffer.Assign(data);
|
||||
hashRef.Truncate();
|
||||
} else {
|
||||
dataBuffer.Assign(data, hash - data);
|
||||
hashRef.Assign(hash);
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
|
|
|
@ -31,11 +31,10 @@ public:
|
|||
// (the given spec will temporarily be modified but will be returned
|
||||
// to the original before returning)
|
||||
static nsresult ParseURI(nsCString& spec,
|
||||
nsCString& contentType,
|
||||
nsCString& contentCharset,
|
||||
bool& isBase64,
|
||||
nsCString& dataBuffer,
|
||||
nsCString& hashRef);
|
||||
nsCString& contentType,
|
||||
nsCString& contentCharset,
|
||||
bool& isBase64,
|
||||
nsCString& dataBuffer);
|
||||
};
|
||||
|
||||
#endif /* nsDataHandler_h___ */
|
||||
|
|
Загрузка…
Ссылка в новой задаче