Bug 960312 - Move TEXT_IS_IN_SINGLE_CHAR_MI to a class specific frame state bit value. r=roc

This commit is contained in:
Cameron McCormack 2014-01-16 13:55:19 +11:00
parent 7e050001e3
commit 74b5546df5
2 changed files with 8 additions and 8 deletions

View File

@ -243,15 +243,15 @@ NS_DECLARE_FRAME_PROPERTY(TextFrameGlyphObservers, DestroyGlyphObserverList);
// Set when this text frame is mentioned in the userdata for mTextRun // Set when this text frame is mentioned in the userdata for mTextRun
#define TEXT_IN_TEXTRUN_USER_DATA NS_FRAME_STATE_BIT(29) #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 // nsTextFrame.h has
// #define TEXT_HAS_NONCOLLAPSED_CHARACTERS NS_FRAME_STATE_BIT(31) // #define TEXT_HAS_NONCOLLAPSED_CHARACTERS NS_FRAME_STATE_BIT(31)
// nsTextFrame.h has // nsTextFrame.h has
// #define TEXT_IS_IN_TOKEN_MATHML NS_FRAME_STATE_BIT(32) // #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 // Set when this text frame is mentioned in the userdata for the
// uninflated textrun property // uninflated textrun property
#define TEXT_IN_UNINFLATED_TEXTRUN_USER_DATA NS_FRAME_STATE_BIT(60) #define TEXT_IN_UNINFLATED_TEXTRUN_USER_DATA NS_FRAME_STATE_BIT(60)

View File

@ -17,6 +17,11 @@
class nsTextPaintStyle; class nsTextPaintStyle;
class PropertyProvider; 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 // This state bit is set on frames that have some non-collapsed characters after
// reflow // reflow
#define TEXT_HAS_NONCOLLAPSED_CHARACTERS NS_FRAME_STATE_BIT(31) #define TEXT_HAS_NONCOLLAPSED_CHARACTERS NS_FRAME_STATE_BIT(31)
@ -24,11 +29,6 @@ class PropertyProvider;
// This state bit is set on children of token MathML elements // This state bit is set on children of token MathML elements
#define TEXT_IS_IN_TOKEN_MATHML NS_FRAME_STATE_BIT(32) #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) #define TEXT_HAS_FONT_INFLATION NS_FRAME_STATE_BIT(61)
typedef nsFrame nsTextFrameBase; typedef nsFrame nsTextFrameBase;