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

connected prefs to the webshell

Browse Source
This commit is contained in:
peterl%netscape.com 1998-07-31 05:58:41 +00:00
parent d3024f8eb7
commit bc1d1dbcbb
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layout/html/document/src/Makefile
View File

@ -53,7 +53,7 @@ INCLUDES += \
MODULE = raptor
REQUIRES = xpcom raptor dom netlib js
REQUIRES = xpcom raptor dom netlib js pref
MKSHLIB :=

4
layout/html/document/src/makefile.win
View File

@ -19,7 +19,7 @@ DEPTH=..\..\..\..
LIBRARY_NAME=raptorhtmldoc_s
MODULE=raptor
REQUIRES=xpcom raptor
REQUIRES=xpcom raptor pref
DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
@ -50,7 +50,7 @@ EXPORTS = \
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\js \
-I..\..\base\src -I..\..\forms\src \
-I..\..\style\src -I..\..\table\src -I$(PUBLIC)\dom \
-I$(PUBLIC)\netlib -I..\..\..\base\src
-I$(PUBLIC)\netlib -I..\..\..\base\src -I$(PUBLIC)\pref
LCFLAGS = \
$(LCFLAGS) \

7
layout/html/document/src/nsHTMLFrame.cpp
View File

@ -38,6 +38,7 @@
#include "nsIStyleContext.h"
#include "nsCSSLayout.h"
#include "nsIDocumentLoader.h"
#include "nsIPref.h"
//#include "nsIDocumentWidget.h"
#include "nsHTMLFrameset.h"
class nsHTMLFrame;
@ -511,6 +512,12 @@ nsHTMLFrameInnerFrame::CreateWebShell(nsIPresContext& aPresContext,
container->QueryInterface(kIWebShellIID, (void**) &outerShell);
if (nsnull != outerShell) {
outerShell->AddChild(mWebShell);
nsIPref* outerPrefs = nsnull; // connect the prefs
outerShell->GetPrefs(outerPrefs);
if (nsnull != outerPrefs) {
mWebShell->SetPrefs(outerPrefs);
NS_RELEASE(outerPrefs);
}
NS_RELEASE(outerShell);
}
NS_RELEASE(container);