зеркало из https://github.com/mozilla/pjs.git
Added nsHTMLAtoms::wrappedFramePseudo and changed ConstructFrame() to use
it instead of nsHTMLAtoms::columnPseudo
This commit is contained in:
troy%netscape.com
Родитель
017d2db32f
Коммит
21e1f648b1
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -280,6 +280,7 @@ public:
|
|||
static nsIAtom* wbr;
|
||||
static nsIAtom* width;
|
||||
static nsIAtom* wrap;
|
||||
static nsIAtom* wrappedFramePseudo;
|
||||
|
||||
static nsIAtom* xmlRootPseudo;
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -280,6 +280,7 @@ public:
|
|||
static nsIAtom* wbr;
|
||||
static nsIAtom* width;
|
||||
static nsIAtom* wrap;
|
||||
static nsIAtom* wrappedFramePseudo;
|
||||
|
||||
static nsIAtom* xmlRootPseudo;
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -280,6 +280,7 @@ public:
|
|||
static nsIAtom* wbr;
|
||||
static nsIAtom* width;
|
||||
static nsIAtom* wrap;
|
||||
static nsIAtom* wrappedFramePseudo;
|
||||
|
||||
static nsIAtom* xmlRootPseudo;
|
||||
|
||||
|
|
|
|||
|
|
@ -499,6 +499,10 @@ NOFRAMES {
|
|||
display: inherit;
|
||||
}
|
||||
|
||||
:WRAPPED-FRAME {
|
||||
display: inherit;
|
||||
}
|
||||
|
||||
:XML-ROOT {
|
||||
background-color: inherit;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -499,6 +499,10 @@ NOFRAMES {
|
|||
display: inherit;
|
||||
}
|
||||
|
||||
:WRAPPED-FRAME {
|
||||
display: inherit;
|
||||
}
|
||||
|
||||
:XML-ROOT {
|
||||
background-color: inherit;
|
||||
}
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче