corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DOM string changes. All nsString& in DOM interfaces (and interfaces needed by DOM implementations) have been changed to nsAReadableString& and nsAWritableString&. String implementation additions (sanctioned by scc) to support DOM needs. Bug 49091. r=vidur,jst,scc

Browse Source
This commit is contained in:
jst@netscape.com
2000-08-23 17:27:06 +00:00
parent eb24fe23ee
commit 3ba32f670e
629 changed files with 11664 additions and 10709 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
docshell/base/nsDocShell.cpp
View File

@@ -3404,7 +3404,7 @@ nsDocShell::OnNewURI(nsIURI *aURI, nsIChannel *aChannel, nsDocShellInfoLoadType
nsCOMPtr<nsIURI> baseURI = mCurrentURI;
PRInt32 millis = -1;
PRUnichar *uriAttrib = nsnull;
nsAutoString uriAttrib;
nsString result; result.AssignWithConversion (refreshHeader);
PRInt32 semiColon = result.FindCharInSet(";,");
@@ -3441,7 +3441,7 @@ nsDocShell::OnNewURI(nsIURI *aURI, nsIChannel *aChannel, nsDocShellInfoLoadType
if (loc > -1)
token.Cut(0, loc+1);
token.Trim(" \"'");
uriAttrib = token.ToNewUnicode();
uriAttrib = token;
} else {
// Increment to the next token.
if (semiColon > -1) {
@@ -3457,11 +3457,10 @@ nsDocShell::OnNewURI(nsIURI *aURI, nsIChannel *aChannel, nsDocShellInfoLoadType
} // end while
nsCOMPtr<nsIURI> uri;
if (!uriAttrib) {
if (!uriAttrib.Length()) {
uri = baseURI;
} else {
NS_NewURI(getter_AddRefs(uri), nsAutoString(uriAttrib), baseURI);
nsMemory::Free(uriAttrib);
NS_NewURI(getter_AddRefs(uri), uriAttrib, baseURI);
}
RefreshURI (uri, millis, PR_FALSE);