b=128508 "freeze nsIChannel nsIRequest" r=gagan, sr=rpotts, a=asa

git-svn-id: svn://10.0.0.236/trunk@117002 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
darin%netscape.com
2002-03-20 22:50:33 +00:00
parent 8763a125c1
commit 8defbf5d26
171 changed files with 1894 additions and 1635 deletions

View File

@@ -691,13 +691,13 @@ nsMovieSoundRequest::OnStreamComplete(nsIStreamLoader *aLoader,
if (NS_FAILED(aStatus))
return NS_ERROR_FAILURE;
nsXPIDLCString contentType;
nsCAutoString contentType;
nsCOMPtr<nsIRequest> request;
aLoader->GetRequest(getter_AddRefs(request));
nsCOMPtr<nsIChannel> channel = do_QueryInterface(request);
if (channel)
channel->GetContentType(getter_Copies(contentType));
channel->GetContentType(contentType);
// we could use a Pointer data handler type, and avoid this
// allocation/copy, in QuickTime 5 and above.

View File

@@ -315,8 +315,7 @@ nsHTMLFormatConverter::ConvertFromHTMLToUnicode(const nsAutoString & aFromStr, n
parser->SetContentSink(sink);
nsAutoString contentType; contentType = NS_LITERAL_STRING("text/html");
parser->Parse(aFromStr, 0, contentType, PR_FALSE, PR_TRUE);
parser->Parse(aFromStr, 0, NS_LITERAL_CSTRING("text/html"), PR_FALSE, PR_TRUE);
return NS_OK;
} // ConvertFromHTMLToUnicode