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

Landing (inside an INCLUDE_XUL ifdef) the code that checks for and sets

Browse Source 
the type of the web shell (to distinguish chrome frames from content
frames).
This commit is contained in:
hyatt%netscape.com 1999-04-16 08:14:28 +00:00
parent c4555bdd9f
commit 12859e8881
2 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
layout/generic/nsFrameFrame.cpp
View File

@ -662,7 +662,7 @@ nsHTMLFrameInnerFrame::CreateWebShell(nsIPresContext& aPresContext,
aPresContext.GetCompatibilityMode(&mode);
mWebShell->SetScrolling(GetScrolling(content, mode));
mWebShell->SetIsFrame(PR_TRUE);
nsString frameName;
if (GetName(content, frameName)) {
mWebShell->SetName(frameName);
@ -679,6 +679,27 @@ nsHTMLFrameInnerFrame::CreateWebShell(nsIPresContext& aPresContext,
if (nsnull != outerShell) {
outerShell->AddChild(mWebShell);
#ifdef INCLUDE_XUL
// Determine whether or not the frame is content or chrome.
nsIAtom* typeAtom = NS_NewAtom("type");
nsAutoString value;
content->GetAttribute(kNameSpaceID_None, typeAtom, value);
if (value.EqualsIgnoreCase("content"))
{
// The web shell's type is content.
mWebShell->SetWebShellType(nsWebShellContent);
}
else
{
// Inherit our type from our parent webshell. If it is
// chrome, we'll be chrome. If it is content, we'll be
// content.
nsWebShellType parentType;
outerShell->GetWebShellType(parentType);
mWebShell->SetWebShellType(parentType);
}
#endif // INCLUDE_XUL
// connect the container...
nsIWebShellContainer* outerContainer = nsnull;
container->QueryInterface(kIWebShellContainerIID, (void**) &outerContainer);

23
layout/html/document/src/nsFrameFrame.cpp
View File

@ -662,7 +662,7 @@ nsHTMLFrameInnerFrame::CreateWebShell(nsIPresContext& aPresContext,
aPresContext.GetCompatibilityMode(&mode);
mWebShell->SetScrolling(GetScrolling(content, mode));
mWebShell->SetIsFrame(PR_TRUE);
nsString frameName;
if (GetName(content, frameName)) {
mWebShell->SetName(frameName);
@ -679,6 +679,27 @@ nsHTMLFrameInnerFrame::CreateWebShell(nsIPresContext& aPresContext,
if (nsnull != outerShell) {
outerShell->AddChild(mWebShell);
#ifdef INCLUDE_XUL
// Determine whether or not the frame is content or chrome.
nsIAtom* typeAtom = NS_NewAtom("type");
nsAutoString value;
content->GetAttribute(kNameSpaceID_None, typeAtom, value);
if (value.EqualsIgnoreCase("content"))
{
// The web shell's type is content.
mWebShell->SetWebShellType(nsWebShellContent);
}
else
{
// Inherit our type from our parent webshell. If it is
// chrome, we'll be chrome. If it is content, we'll be
// content.
nsWebShellType parentType;
outerShell->GetWebShellType(parentType);
mWebShell->SetWebShellType(parentType);
}
#endif // INCLUDE_XUL
// connect the container...
nsIWebShellContainer* outerContainer = nsnull;
container->QueryInterface(kIWebShellContainerIID, (void**) &outerContainer);