Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-28 11:28:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added nsHTMLAtoms::wrappedFramePseudo and changed ConstructFrame() to use

Browse Source 
it instead of nsHTMLAtoms::columnPseudo
This commit is contained in:
troy%netscape.com 1998-11-20 23:27:59 +00:00
parent 81ab6c6336
commit 4893fa0a92
11 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
content/html/content/src/nsHTMLAtoms.cpp
View File

@ -242,6 +242,7 @@ nsIAtom* nsHTMLAtoms::vspace;
nsIAtom* nsHTMLAtoms::wbr;
nsIAtom* nsHTMLAtoms::width;
nsIAtom* nsHTMLAtoms::wrap;
nsIAtom* nsHTMLAtoms::wrappedFramePseudo;
nsIAtom* nsHTMLAtoms::xmlRootPseudo;
nsIAtom* nsHTMLAtoms::zindex;
@ -473,6 +474,7 @@ void nsHTMLAtoms::AddrefAtoms()
wbr = NS_NewAtom("WBR");
width = NS_NewAtom("WIDTH");
wrap = NS_NewAtom("WRAP");
wrappedFramePseudo = NS_NewAtom(":WRAPPED-FRAME");
xmlRootPseudo = NS_NewAtom(":XML-ROOT");
zindex = NS_NewAtom("ZINDEX");
}
@ -695,6 +697,7 @@ void nsHTMLAtoms::ReleaseAtoms()
NS_RELEASE(wbr);
NS_RELEASE(width);
NS_RELEASE(wrap);
NS_RELEASE(wrappedFramePseudo);
NS_RELEASE(xmlRootPseudo);
NS_RELEASE(zindex);
}

1
content/html/content/src/nsHTMLAtoms.h
View File

@ -280,6 +280,7 @@ public:
static nsIAtom* wbr;
static nsIAtom* width;
static nsIAtom* wrap;
static nsIAtom* wrappedFramePseudo;
static nsIAtom* xmlRootPseudo;

6
content/html/style/src/nsHTMLStyleSheet.cpp
View File

@ -1742,11 +1742,11 @@ HTMLStyleSheetImpl::ConstructFrame(nsIPresContext* aPresContext,
wrapperFrame->SetStyleContext(aPresContext, scrolledPseudoStyle);
// The wrapped frame also gets a pseudo style context, but it doesn't
// inherit any background properties
// XXX We should define something like :WRAPPED-FRAME in ua.css
// inherit any background properties. It does inherit the 'display'
// property (very important that it does)
nsIStyleContext* wrappedPseudoStyle;
wrappedPseudoStyle = aPresContext->ResolvePseudoStyleContextFor
(aContent, nsHTMLAtoms::columnPseudo,
(aContent, nsHTMLAtoms::wrappedFramePseudo,
scrolledPseudoStyle);
NS_RELEASE(scrolledPseudoStyle);
aParentFrame = wrapperFrame;

1
content/shared/public/nsHTMLAtoms.h
View File

@ -280,6 +280,7 @@ public:
static nsIAtom* wbr;
static nsIAtom* width;
static nsIAtom* wrap;
static nsIAtom* wrappedFramePseudo;
static nsIAtom* xmlRootPseudo;

3
content/shared/src/nsHTMLAtoms.cpp
View File

@ -242,6 +242,7 @@ nsIAtom* nsHTMLAtoms::vspace;
nsIAtom* nsHTMLAtoms::wbr;
nsIAtom* nsHTMLAtoms::width;
nsIAtom* nsHTMLAtoms::wrap;
nsIAtom* nsHTMLAtoms::wrappedFramePseudo;
nsIAtom* nsHTMLAtoms::xmlRootPseudo;
nsIAtom* nsHTMLAtoms::zindex;
@ -473,6 +474,7 @@ void nsHTMLAtoms::AddrefAtoms()
wbr = NS_NewAtom("WBR");
width = NS_NewAtom("WIDTH");
wrap = NS_NewAtom("WRAP");
wrappedFramePseudo = NS_NewAtom(":WRAPPED-FRAME");
xmlRootPseudo = NS_NewAtom(":XML-ROOT");
zindex = NS_NewAtom("ZINDEX");
}
@ -695,6 +697,7 @@ void nsHTMLAtoms::ReleaseAtoms()
NS_RELEASE(wbr);
NS_RELEASE(width);
NS_RELEASE(wrap);
NS_RELEASE(wrappedFramePseudo);
NS_RELEASE(xmlRootPseudo);
NS_RELEASE(zindex);
}

3
layout/html/base/src/nsHTMLAtoms.cpp
View File

@ -242,6 +242,7 @@ nsIAtom* nsHTMLAtoms::vspace;
nsIAtom* nsHTMLAtoms::wbr;
nsIAtom* nsHTMLAtoms::width;
nsIAtom* nsHTMLAtoms::wrap;
nsIAtom* nsHTMLAtoms::wrappedFramePseudo;
nsIAtom* nsHTMLAtoms::xmlRootPseudo;
nsIAtom* nsHTMLAtoms::zindex;
@ -473,6 +474,7 @@ void nsHTMLAtoms::AddrefAtoms()
wbr = NS_NewAtom("WBR");
width = NS_NewAtom("WIDTH");
wrap = NS_NewAtom("WRAP");
wrappedFramePseudo = NS_NewAtom(":WRAPPED-FRAME");
xmlRootPseudo = NS_NewAtom(":XML-ROOT");
zindex = NS_NewAtom("ZINDEX");
}
@ -695,6 +697,7 @@ void nsHTMLAtoms::ReleaseAtoms()
NS_RELEASE(wbr);
NS_RELEASE(width);
NS_RELEASE(wrap);
NS_RELEASE(wrappedFramePseudo);
NS_RELEASE(xmlRootPseudo);
NS_RELEASE(zindex);
}

1
layout/html/base/src/nsHTMLAtoms.h
View File

@ -280,6 +280,7 @@ public:
static nsIAtom* wbr;
static nsIAtom* width;
static nsIAtom* wrap;
static nsIAtom* wrappedFramePseudo;
static nsIAtom* xmlRootPseudo;

4
layout/html/document/src/ua.css
View File

@ -499,6 +499,10 @@ NOFRAMES {
display: inherit;
}
:WRAPPED-FRAME {
display: inherit;
}
:XML-ROOT {
background-color: inherit;
}

6
layout/html/style/src/nsHTMLStyleSheet.cpp
View File

@ -1742,11 +1742,11 @@ HTMLStyleSheetImpl::ConstructFrame(nsIPresContext* aPresContext,
wrapperFrame->SetStyleContext(aPresContext, scrolledPseudoStyle);
// The wrapped frame also gets a pseudo style context, but it doesn't
// inherit any background properties
// XXX We should define something like :WRAPPED-FRAME in ua.css
// inherit any background properties. It does inherit the 'display'
// property (very important that it does)
nsIStyleContext* wrappedPseudoStyle;
wrappedPseudoStyle = aPresContext->ResolvePseudoStyleContextFor
(aContent, nsHTMLAtoms::columnPseudo,
(aContent, nsHTMLAtoms::wrappedFramePseudo,
scrolledPseudoStyle);
NS_RELEASE(scrolledPseudoStyle);
aParentFrame = wrapperFrame;

6
layout/style/nsHTMLStyleSheet.cpp
View File

@ -1742,11 +1742,11 @@ HTMLStyleSheetImpl::ConstructFrame(nsIPresContext* aPresContext,
wrapperFrame->SetStyleContext(aPresContext, scrolledPseudoStyle);
// The wrapped frame also gets a pseudo style context, but it doesn't
// inherit any background properties
// XXX We should define something like :WRAPPED-FRAME in ua.css
// inherit any background properties. It does inherit the 'display'
// property (very important that it does)
nsIStyleContext* wrappedPseudoStyle;
wrappedPseudoStyle = aPresContext->ResolvePseudoStyleContextFor
(aContent, nsHTMLAtoms::columnPseudo,
(aContent, nsHTMLAtoms::wrappedFramePseudo,
scrolledPseudoStyle);
NS_RELEASE(scrolledPseudoStyle);
aParentFrame = wrapperFrame;

4
layout/style/ua.css
View File

@ -499,6 +499,10 @@ NOFRAMES {
display: inherit;
}
:WRAPPED-FRAME {
display: inherit;
}
:XML-ROOT {
background-color: inherit;
}