Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for bug # 151061. Mozilla loses base uri for wyciwyg documents. r=caillon sr=jst.

Browse Source
This commit is contained in:
radha%netscape.com 2002-09-19 21:59:34 +00:00
parent 16849ef0da
commit aa45d396af
2 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
docshell/base/nsDocShell.cpp
View File

@ -3949,6 +3949,22 @@ nsDocShell::Embed(nsIContentViewer * aContentViewer,
nsresult rv = SetupNewViewer(aContentViewer);
// If we are loading a wyciwyg url from history, change the base URI for
// the document to the original http url that created the document.write().
// This makes sure that all relative urls in a document.written page loaded
// via history work properly.
PRBool historyLoad = PR_FALSE, isWyciwyg = PR_FALSE;
if (mLoadType & LOAD_CMD_HISTORY ||
mLoadType == LOAD_RELOAD_NORMAL ||
mLoadType == LOAD_RELOAD_CHARSET_CHANGE)
historyLoad = PR_TRUE;
rv = mCurrentURI->SchemeIs("wyciwyg", &isWyciwyg);
if (historyLoad && NS_SUCCEEDED(rv) && isWyciwyg)
SetBaseUrlForWyciwyg(aContentViewer);
// XXX What if SetupNewViewer fails?
if (mLSHE)
mOSHE = mLSHE;
@ -6753,3 +6769,32 @@ nsDocShell::InterfaceRequestorProxy::GetInterface(const nsIID & aIID, void **aSi
*aSink = nsnull;
return NS_NOINTERFACE;
}
nsresult
nsDocShell::SetBaseUrlForWyciwyg(nsIContentViewer * aContentViewer)
{
nsCOMPtr<nsIURI> baseURI;
nsCOMPtr<nsIDocument> document;
nsresult rv = NS_OK;
if (!aContentViewer)
return NS_ERROR_FAILURE;
// Create the fixup object if necessary
if (!mURIFixup)
mURIFixup = do_GetService(NS_URIFIXUP_CONTRACTID, &rv);
if (mURIFixup)
rv = mURIFixup->CreateExposableURI(mCurrentURI, getter_AddRefs(baseURI));
// Get the current document and set the base uri
if (baseURI) {
nsCOMPtr<nsIDocumentViewer> docViewer(do_QueryInterface(aContentViewer));
if (docViewer) {
rv = docViewer->GetDocument(*getter_AddRefs(document));
if (document)
rv = document->SetBaseURL(baseURI);
}
}
return rv;
}

2
docshell/base/nsDocShell.h
View File

@ -251,6 +251,8 @@ protected:
NS_IMETHOD DisplayLoadError(nsresult aError, nsIURI *aURI, const PRUnichar *aURL);
NS_IMETHOD LoadErrorPage(nsIURI *aURI, const PRUnichar *aURL, const PRUnichar *aPage, const PRUnichar *aDescription);
nsresult SetBaseUrlForWyciwyg(nsIContentViewer * aContentViewer);
static inline PRUint32
PRTimeToSeconds(PRTime t_usec)
{