Preliminary changes to support align="char"
git-svn-id: svn://10.0.0.236/trunk@17278 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
4f09c07271
commit
a7ffffa54d
@ -50,6 +50,8 @@ nsIAtom* nsHTMLAtoms::cellContentPseudo;
|
||||
nsIAtom* nsHTMLAtoms::cellpadding;
|
||||
nsIAtom* nsHTMLAtoms::cellspacing;
|
||||
nsIAtom* nsHTMLAtoms::ch;
|
||||
nsIAtom* nsHTMLAtoms::_char;
|
||||
nsIAtom* nsHTMLAtoms::charoff;
|
||||
nsIAtom* nsHTMLAtoms::charset;
|
||||
nsIAtom* nsHTMLAtoms::checked;
|
||||
nsIAtom* nsHTMLAtoms::choff;
|
||||
@ -283,6 +285,8 @@ void nsHTMLAtoms::AddrefAtoms()
|
||||
cellpadding = NS_NewAtom("CELLPADDING");
|
||||
cellspacing = NS_NewAtom("CELLSPACING");
|
||||
ch = NS_NewAtom("CH");
|
||||
_char = NS_NewAtom("CHAR");
|
||||
charoff = NS_NewAtom("CHAROFF");
|
||||
charset = NS_NewAtom("CHARSET");
|
||||
checked = NS_NewAtom("CHECKED");
|
||||
choff = NS_NewAtom("CHOFF");
|
||||
@ -513,6 +517,8 @@ void nsHTMLAtoms::ReleaseAtoms()
|
||||
NS_RELEASE(cellpadding);
|
||||
NS_RELEASE(cellspacing);
|
||||
NS_RELEASE(ch);
|
||||
NS_RELEASE(_char);
|
||||
NS_RELEASE(charoff);
|
||||
NS_RELEASE(charset);
|
||||
NS_RELEASE(checked);
|
||||
NS_RELEASE(choff);
|
||||
|
||||
@ -71,6 +71,8 @@ public:
|
||||
static nsIAtom* cellpadding;
|
||||
static nsIAtom* cellspacing;
|
||||
static nsIAtom* ch;
|
||||
static nsIAtom* _char;
|
||||
static nsIAtom* charoff;
|
||||
static nsIAtom* charset;
|
||||
static nsIAtom* checked;
|
||||
static nsIAtom* choff;
|
||||
|
||||
@ -71,6 +71,8 @@ public:
|
||||
static nsIAtom* cellpadding;
|
||||
static nsIAtom* cellspacing;
|
||||
static nsIAtom* ch;
|
||||
static nsIAtom* _char;
|
||||
static nsIAtom* charoff;
|
||||
static nsIAtom* charset;
|
||||
static nsIAtom* checked;
|
||||
static nsIAtom* choff;
|
||||
|
||||
@ -50,6 +50,8 @@ nsIAtom* nsHTMLAtoms::cellContentPseudo;
|
||||
nsIAtom* nsHTMLAtoms::cellpadding;
|
||||
nsIAtom* nsHTMLAtoms::cellspacing;
|
||||
nsIAtom* nsHTMLAtoms::ch;
|
||||
nsIAtom* nsHTMLAtoms::_char;
|
||||
nsIAtom* nsHTMLAtoms::charoff;
|
||||
nsIAtom* nsHTMLAtoms::charset;
|
||||
nsIAtom* nsHTMLAtoms::checked;
|
||||
nsIAtom* nsHTMLAtoms::choff;
|
||||
@ -283,6 +285,8 @@ void nsHTMLAtoms::AddrefAtoms()
|
||||
cellpadding = NS_NewAtom("CELLPADDING");
|
||||
cellspacing = NS_NewAtom("CELLSPACING");
|
||||
ch = NS_NewAtom("CH");
|
||||
_char = NS_NewAtom("CHAR");
|
||||
charoff = NS_NewAtom("CHAROFF");
|
||||
charset = NS_NewAtom("CHARSET");
|
||||
checked = NS_NewAtom("CHECKED");
|
||||
choff = NS_NewAtom("CHOFF");
|
||||
@ -513,6 +517,8 @@ void nsHTMLAtoms::ReleaseAtoms()
|
||||
NS_RELEASE(cellpadding);
|
||||
NS_RELEASE(cellspacing);
|
||||
NS_RELEASE(ch);
|
||||
NS_RELEASE(_char);
|
||||
NS_RELEASE(charoff);
|
||||
NS_RELEASE(charset);
|
||||
NS_RELEASE(checked);
|
||||
NS_RELEASE(choff);
|
||||
|
||||
@ -102,6 +102,11 @@ struct nsReflowState {
|
||||
availableHeight; // the available space in which to reflow
|
||||
nsIRenderingContext* rendContext; // rendering context to use for measurement
|
||||
PRPackedBool isTopOfPage; // is the current context at the top of a page?
|
||||
// the following data members are relevant if nsStyleText.mTextAlign is NS_STYLE_TEXT_ALIGN_CHAR
|
||||
PRPackedBool useAlignCharOffset;// if true, the reflow honors alignCharOffset and does not
|
||||
// set it. if false, the reflow sets alignCharOffset
|
||||
nscoord alignCharOffset; // distance from reference edge (as specified in nsStyleDisplay.mDirection)
|
||||
// to the align character (which will be specified in nsStyleTable)
|
||||
|
||||
// Note: there is no copy constructor, so the compiler can generate an
|
||||
// optimal one.
|
||||
|
||||
@ -50,6 +50,8 @@ nsIAtom* nsHTMLAtoms::cellContentPseudo;
|
||||
nsIAtom* nsHTMLAtoms::cellpadding;
|
||||
nsIAtom* nsHTMLAtoms::cellspacing;
|
||||
nsIAtom* nsHTMLAtoms::ch;
|
||||
nsIAtom* nsHTMLAtoms::_char;
|
||||
nsIAtom* nsHTMLAtoms::charoff;
|
||||
nsIAtom* nsHTMLAtoms::charset;
|
||||
nsIAtom* nsHTMLAtoms::checked;
|
||||
nsIAtom* nsHTMLAtoms::choff;
|
||||
@ -283,6 +285,8 @@ void nsHTMLAtoms::AddrefAtoms()
|
||||
cellpadding = NS_NewAtom("CELLPADDING");
|
||||
cellspacing = NS_NewAtom("CELLSPACING");
|
||||
ch = NS_NewAtom("CH");
|
||||
_char = NS_NewAtom("CHAR");
|
||||
charoff = NS_NewAtom("CHAROFF");
|
||||
charset = NS_NewAtom("CHARSET");
|
||||
checked = NS_NewAtom("CHECKED");
|
||||
choff = NS_NewAtom("CHOFF");
|
||||
@ -513,6 +517,8 @@ void nsHTMLAtoms::ReleaseAtoms()
|
||||
NS_RELEASE(cellpadding);
|
||||
NS_RELEASE(cellspacing);
|
||||
NS_RELEASE(ch);
|
||||
NS_RELEASE(_char);
|
||||
NS_RELEASE(charoff);
|
||||
NS_RELEASE(charset);
|
||||
NS_RELEASE(checked);
|
||||
NS_RELEASE(choff);
|
||||
|
||||
@ -71,6 +71,8 @@ public:
|
||||
static nsIAtom* cellpadding;
|
||||
static nsIAtom* cellspacing;
|
||||
static nsIAtom* ch;
|
||||
static nsIAtom* _char;
|
||||
static nsIAtom* charoff;
|
||||
static nsIAtom* charset;
|
||||
static nsIAtom* checked;
|
||||
static nsIAtom* choff;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user