Backout rev 994659cbc145 (bug 960312) for various test failures.

// Set when this text frame is mentioned in the userdata for mTextRun

#define TEXT_IN_TEXTRUN_USER_DATA  NS_FRAME_STATE_BIT(29)

// nsTextFrame.h has

// #define TEXT_IS_IN_SINGLE_CHAR_MI        NS_FRAME_STATE_BIT(30)

// nsTextFrame.h has

// #define TEXT_HAS_NONCOLLAPSED_CHARACTERS NS_FRAME_STATE_BIT(31)

// nsTextFrame.h has

// #define TEXT_IS_IN_TOKEN_MATHML          NS_FRAME_STATE_BIT(32)

// nsTextFrame.h has

// #define TEXT_IS_IN_SINGLE_CHAR_MI        NS_FRAME_STATE_BIT(59)

// Set when this text frame is mentioned in the userdata for the

// uninflated textrun property

#define TEXT_IN_UNINFLATED_TEXTRUN_USER_DATA NS_FRAME_STATE_BIT(60)

class nsTextPaintStyle;

class PropertyProvider;

// This state bit is set on text frames within token MathML elements if the

// token represents an <mi> tag whose inner HTML consists of a single

// non-whitespace character to allow special rendering behaviour.

#define TEXT_IS_IN_SINGLE_CHAR_MI        NS_FRAME_STATE_BIT(30)

// This state bit is set on frames that have some non-collapsed characters after

// reflow

#define TEXT_HAS_NONCOLLAPSED_CHARACTERS NS_FRAME_STATE_BIT(31)

// This state bit is set on children of token MathML elements

#define TEXT_IS_IN_TOKEN_MATHML          NS_FRAME_STATE_BIT(32)

// This state bit is set on token MathML elements if the token represents an

// <mi> tag whose inner HTML consists of a single non-whitespace character

// to allow special rendering behaviour.

#define TEXT_IS_IN_SINGLE_CHAR_MI        NS_FRAME_STATE_BIT(59)

#define TEXT_HAS_FONT_INFLATION          NS_FRAME_STATE_BIT(61)

typedef nsFrame nsTextFrameBase;