Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added an attribute for holding the charset info to be used during a load.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@65633 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
tbogard%aol.net
2000-04-12 00:07:04 +00:00
parent 688ef1c934
commit 39e0862ae5
3 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mozilla/docshell/base/nsDocShell.cpp
View File

@@ -455,6 +455,23 @@ NS_IMETHODIMP nsDocShell::SetParentURIContentListener(nsIURIContentListener*
return mContentListener->SetParentContentListener(aParent);
}
NS_IMETHODIMP nsDocShell::GetDocumentCharsetInfo(nsIDocumentCharsetInfo**
aDocumentCharsetInfo)
{
NS_ENSURE_ARG_POINTER(aDocumentCharsetInfo);
*aDocumentCharsetInfo = mDocumentCharsetInfo;
NS_IF_ADDREF(*aDocumentCharsetInfo);
return NS_OK;
}
NS_IMETHODIMP nsDocShell::SetDocumentCharsetInfo(nsIDocumentCharsetInfo*
aDocumentCharsetInfo)
{
mDocumentCharsetInfo = aDocumentCharsetInfo;
return NS_OK;
}
NS_IMETHODIMP nsDocShell::GetAllowPlugins(PRBool* aAllowPlugins)
{
NS_ENSURE_ARG_POINTER(aAllowPlugins);
@@ -2287,7 +2304,7 @@ NS_IMETHODIMP nsDocShell::CreateFixupURI(const PRUnichar* aStringURI,
// if no scheme (protocol) is found, assume http.
if((colon=uriString.FindChar(':') == -1) ||// no colon at all
((fSlash > -1) && (colon > fSlash)) ||// the only colon comes after the first slash
((colon < uriString.Length()-1) && // the first char after the first colon is a digit (i.e. a port)
((colon < (((PRInt32)uriString.Length())-1)) && // the first char after the first colon is a digit (i.e. a port)
((port=uriString.CharAt(colon+1)) <= '9') && (port > '0')))
{
// find host name