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

Moving nsIContentViewer over from webshell to docshell, converting from .h to .idl. Needed for bug 46200, r=moa=adam@netscape.com, a=alecf

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@82496 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
disttsc%bart.nl
2000-11-09 20:30:35 +00:00
parent 23fe304558
commit b34ed638cd
15 changed files with 69 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,6 +46,7 @@
#include "nsIHTTPEventSink.h"
#include "nsISecurityEventSink.h"
#include "nsScriptSecurityManager.h"
#include "nsDocumentCharsetInfoCID.h"
// Local Includes
#include "nsDocShell.h"
@@ -124,10 +125,10 @@ nsDocShell::nsDocShell() :
mLastViewMode(viewNormal),
mRestoreViewMode(PR_FALSE),
mEODForCurrentDocument (PR_FALSE),
mURIResultedInDocument(PR_FALSE),
mUseExternalProtocolHandler (PR_FALSE),
mParent(nsnull),
mTreeOwner(nsnull),
mURIResultedInDocument(PR_FALSE),
mChromeEventHandler(nsnull)
{
NS_INIT_REFCNT();
@@ -1110,7 +1111,8 @@ NS_IMETHODIMP nsDocShell::AddChild(nsIDocShellTreeItem *aChild)
if (NS_FAILED(res)) return NS_OK;
// set the child's parentCharset
res = dcInfo->SetParentCharset(&parentCS);
nsCOMPtr<nsIAtom> parentCSAtom(dont_AddRef(NS_NewAtom(parentCS)));
res = dcInfo->SetParentCharset(parentCSAtom);
if (NS_FAILED(res)) return NS_OK;
// printf("### 1 >>> Adding child. Parent CS = %s. ItemType = %d.\n", parentCS.ToNewCString(), mItemType);