diff --git a/mozilla/content/html/style/src/nsICSSDeclaration.h b/mozilla/content/html/style/src/nsICSSDeclaration.h
index 238ec267f5c..d7c01894d96 100644
--- a/mozilla/content/html/style/src/nsICSSDeclaration.h
+++ b/mozilla/content/html/style/src/nsICSSDeclaration.h
@@ -24,155 +24,13 @@
#include "stdio.h"
#include "nsString.h"
#include "nsCoord.h"
+#include "nsCSSValue.h"
-enum nsCSSUnit {
- eCSSUnit_Null = 0, // (n/a) null unit, value is not specified
- eCSSUnit_Auto = 1, // (n/a) value is algorithmic
- eCSSUnit_Inherit = 2, // (n/a) value is inherited
- eCSSUnit_None = 3, // (n/a) value is none
- eCSSUnit_Normal = 4, // (n/a) value is normal (algorithmic, different than auto)
- eCSSUnit_String = 10, // (nsString) a string value
- eCSSUnit_Integer = 50, // (int) simple value
- eCSSUnit_Enumerated = 51, // (int) value has enumerated meaning
- eCSSUnit_Color = 80, // (color) an RGBA value
- eCSSUnit_Percent = 90, // (float) 1.0 == 100%) value is percentage of something
- eCSSUnit_Number = 91, // (float) value is numeric (usually multiplier, different behavior that percent)
-
- // US English
- eCSSUnit_Inch = 100, // (float) Standard length
- eCSSUnit_Foot = 101, // (float) 12 inches
- eCSSUnit_Mile = 102, // (float) 5280 feet
-
- // Metric
- eCSSUnit_Millimeter = 207, // (float) 1/1000 meter
- eCSSUnit_Centimeter = 208, // (float) 1/100 meter
- eCSSUnit_Meter = 210, // (float) Standard length
- eCSSUnit_Kilometer = 213, // (float) 1000 meters
-
- // US Typographic
- eCSSUnit_Point = 300, // (float) 1/72 inch
- eCSSUnit_Pica = 301, // (float) 12 points == 1/6 inch
-
- // European Typographic
- eCSSUnit_Didot = 400, // (float) 15 didots == 16 points
- eCSSUnit_Cicero = 401, // (float) 12 didots
-
- // relative units
- // Font relative measure
- eCSSUnit_EM = 800, // (float) == current font size
- eCSSUnit_EN = 801, // (float) .5 em
- eCSSUnit_XHeight = 802, // (float) distance from top of lower case x to baseline
- eCSSUnit_CapHeight = 803, // (float) distance from top of uppercase case H to baseline
-
- // Screen relative measure
- eCSSUnit_Pixel = 900 // (float)
-};
-
struct nsCSSStruct {
virtual const nsID& GetID(void) = 0;
};
-class nsCSSValue {
-public:
- nsCSSValue(nsCSSUnit aUnit = eCSSUnit_Null); // for valueless units only (null, auto, inherit, none, normal)
- nsCSSValue(PRInt32 aValue, nsCSSUnit aUnit);
- nsCSSValue(float aValue, nsCSSUnit aUnit);
- nsCSSValue(const nsString& aValue);
- nsCSSValue(nscolor aValue);
- nsCSSValue(const nsCSSValue& aCopy);
- ~nsCSSValue(void);
-
- nsCSSValue& operator=(const nsCSSValue& aCopy);
- PRBool operator==(const nsCSSValue& aOther) const;
-
- nsCSSUnit GetUnit(void) const { return mUnit; };
- PRBool IsLengthUnit(void) const
- { return PRBool(eCSSUnit_Inch <= mUnit); }
- PRBool IsFixedLengthUnit(void) const
- { return PRBool((eCSSUnit_Inch <= mUnit) && (mUnit < eCSSUnit_EM)); }
- PRBool IsRelativeLengthUnit(void) const
- { return PRBool(eCSSUnit_EM <= mUnit); }
-
- PRInt32 GetIntValue(void) const;
- float GetPercentValue(void) const;
- float GetFloatValue(void) const;
- nsString& GetStringValue(nsString& aBuffer) const;
- nscolor GetColorValue(void) const;
- nscoord GetLengthTwips(void) const;
-
- void Reset(void); // sets to null
- void SetIntValue(PRInt32 aValue, nsCSSUnit aUnit);
- void SetPercentValue(float aValue);
- void SetFloatValue(float aValue, nsCSSUnit aUnit);
- void SetStringValue(const nsString& aValue);
- void SetColorValue(nscolor aValue);
- void SetAutoValue(void);
- void SetInheritValue(void);
- void SetNoneValue(void);
- void SetNormalValue(void);
-
- // debugging methods only
- void AppendToString(nsString& aBuffer, PRInt32 aPropID = -1) const;
- void ToString(nsString& aBuffer, PRInt32 aPropID = -1) const;
-
-protected:
- nsCSSUnit mUnit;
- union {
- PRInt32 mInt;
- float mFloat;
- nsString* mString;
- nscolor mColor;
- } mValue;
-};
-
-inline PRInt32 nsCSSValue::GetIntValue(void) const
-{
- NS_ASSERTION((mUnit == eCSSUnit_Integer) ||
- (mUnit == eCSSUnit_Enumerated), "not an int value");
- if ((mUnit == eCSSUnit_Integer) ||
- (mUnit == eCSSUnit_Enumerated)) {
- return mValue.mInt;
- }
- return 0;
-}
-
-inline float nsCSSValue::GetPercentValue(void) const
-{
- NS_ASSERTION((mUnit == eCSSUnit_Percent), "not a percent value");
- if ((mUnit == eCSSUnit_Percent)) {
- return mValue.mFloat;
- }
- return 0.0f;
-}
-
-inline float nsCSSValue::GetFloatValue(void) const
-{
- NS_ASSERTION((mUnit >= eCSSUnit_Number), "not a float value");
- if ((mUnit >= eCSSUnit_Number)) {
- return mValue.mFloat;
- }
- return 0.0f;
-}
-
-inline nsString& nsCSSValue::GetStringValue(nsString& aBuffer) const
-{
- NS_ASSERTION((mUnit == eCSSUnit_String), "not a string value");
- aBuffer.Truncate();
- if ((mUnit == eCSSUnit_String) && (nsnull != mValue.mString)) {
- aBuffer.Append(*(mValue.mString));
- }
- return aBuffer;
-}
-
-inline nscolor nsCSSValue::GetColorValue(void) const
-{
- NS_ASSERTION((mUnit == eCSSUnit_Color), "not a color value");
- if (mUnit == eCSSUnit_Color) {
- return mValue.mColor;
- }
- return NS_RGB(0,0,0);
-}
// SID for the nsCSSFont struct {f645dbf8-b48a-11d1-9ca5-0060088f9ff7}
#define NS_CSS_FONT_SID \
@@ -202,10 +60,33 @@ inline nscolor nsCSSValue::GetColorValue(void) const
#define NS_CSS_LIST_SID \
{0x603f8266, 0xb48b, 0x11d1, {0x9c, 0xa5, 0x00, 0x60, 0x08, 0x8f, 0x9f, 0xf7}}
+// SID for the nsCSSTable struct {16aa4b30-5a3b-11d2-803b-006008159b5a}
+#define NS_CSS_TABLE_SID \
+{0x16aa4b30, 0x5a3b, 0x11d2, {0x80, 0x3b, 0x00, 0x60, 0x08, 0x15, 0x9b, 0x5a}}
+
+// SID for the nsCSSBreaks struct {15124c20-5a3b-11d2-803b-006008159b5a}
+#define NS_CSS_BREAKS_SID \
+{0x15124c20, 0x5a3b, 0x11d2, {0x80, 0x3b, 0x00, 0x60, 0x08, 0x15, 0x9b, 0x5a}}
+
+// SID for the nsCSSPage struct {15dd8810-5a3b-11d2-803b-006008159b5a}
+#define NS_CSS_PAGE_SID \
+{0x15dd8810, 0x5a3b, 0x11d2, {0x80, 0x3b, 0x00, 0x60, 0x08, 0x15, 0x9b, 0x5a}}
+
+// SID for the nsCSSContent struct {1629ef70-5a3b-11d2-803b-006008159b5a}
+#define NS_CSS_CONTENT_SID \
+{0x1629ef70, 0x5a3b, 0x11d2, {0x80, 0x3b, 0x00, 0x60, 0x08, 0x15, 0x9b, 0x5a}}
+
+// SID for the nsCSSAural struct {166d2bb0-5a3b-11d2-803b-006008159b5a}
+#define NS_CSS_AURAL_SID \
+{0x166d2bb0, 0x5a3b, 0x11d2, {0x80, 0x3b, 0x00, 0x60, 0x08, 0x15, 0x9b, 0x5a}}
+
+
// IID for the nsICSSDeclaration interface {7b36b9ac-b48d-11d1-9ca5-0060088f9ff7}
#define NS_ICSS_DECLARATION_IID \
{0x7b36b9ac, 0xb48d, 0x11d1, {0x9c, 0xa5, 0x00, 0x60, 0x08, 0x8f, 0x9f, 0xf7}}
+
+
struct nsCSSFont : public nsCSSStruct {
const nsID& GetID(void);
void List(FILE* out = stdout, PRInt32 aIndent = 0) const;
@@ -215,6 +96,8 @@ struct nsCSSFont : public nsCSSStruct {
nsCSSValue mVariant;
nsCSSValue mWeight;
nsCSSValue mSize;
+ nsCSSValue mSizeAdjust; // NEW
+ nsCSSValue mStretch; // NEW
};
struct nsCSSColor : public nsCSSStruct {
@@ -234,7 +117,20 @@ struct nsCSSColor : public nsCSSStruct {
nsCSSValue mOpacity;
};
+struct nsCSSShadow {
+ nsCSSShadow(void);
+ ~nsCSSShadow(void);
+
+ nsCSSValue mColor;
+ nsCSSValue mXOffset;
+ nsCSSValue mYOffset;
+ nsCSSValue mRadius;
+ nsCSSShadow* mNext;
+};
+
struct nsCSSText : public nsCSSStruct {
+ nsCSSText(void);
+ ~nsCSSText(void);
const nsID& GetID(void);
void List(FILE* out = stdout, PRInt32 aIndent = 0) const;
@@ -245,6 +141,8 @@ struct nsCSSText : public nsCSSStruct {
nsCSSValue mTextTransform;
nsCSSValue mTextAlign;
nsCSSValue mTextIndent;
+ nsCSSShadow* mTextShadow; // NEW
+ nsCSSValue mUnicodeBidi; // NEW
nsCSSValue mLineHeight;
nsCSSValue mWhiteSpace;
};
@@ -283,20 +181,28 @@ struct nsCSSMargin : public nsCSSStruct {
nsCSSRect* mMargin;
nsCSSRect* mPadding;
- nsCSSRect* mBorder;
- nsCSSRect* mColor;
- nsCSSRect* mStyle;
+ nsCSSRect* mBorderWidth; // CHANGED
+ nsCSSRect* mBorderColor; // CHANGED
+ nsCSSRect* mBorderStyle; // CHANGED
+ nsCSSValue mOutlineWidth; // NEW
+ nsCSSValue mOutlineColor; // NEW
+ nsCSSValue mOutlineStyle; // NEW
};
struct nsCSSPosition : public nsCSSStruct {
+ nsCSSPosition(void);
+ ~nsCSSPosition(void);
const nsID& GetID(void);
void List(FILE* out = stdout, PRInt32 aIndent = 0) const;
nsCSSValue mPosition;
nsCSSValue mWidth;
+ nsCSSValue mMinWidth; // NEW
+ nsCSSValue mMaxWidth; // NEW
nsCSSValue mHeight;
- nsCSSValue mLeft;
- nsCSSValue mTop;
+ nsCSSValue mMinHeight; // NEW
+ nsCSSValue mMaxHeight; // NEW
+ nsCSSRect* mOffset; // NEW
nsCSSValue mZIndex;
};
@@ -309,6 +215,71 @@ struct nsCSSList : public nsCSSStruct {
nsCSSValue mPosition;
};
+struct nsCSSTable : public nsCSSStruct { // NEW
+ const nsID& GetID(void);
+ void List(FILE* out = stdout, PRInt32 aIndent = 0) const;
+
+ nsCSSValue mBorderCollapse;
+ nsCSSValue mBorderSpacing;
+ nsCSSValue mCaptionSide;
+ nsCSSValue mEmptyCells;
+ nsCSSValue mLayout;
+};
+
+struct nsCSSBreaks : public nsCSSStruct { // NEW
+ const nsID& GetID(void);
+ void List(FILE* out = stdout, PRInt32 aIndent = 0) const;
+
+ nsCSSValue mOrphans;
+ nsCSSValue mWidows;
+ nsCSSValue mPage;
+ nsCSSValue mPageBreakAfter;
+ nsCSSValue mPageBreakBefore;
+ nsCSSValue mPageBreakInside;
+};
+
+struct nsCSSPage : public nsCSSStruct { // NEW
+ const nsID& GetID(void);
+ void List(FILE* out = stdout, PRInt32 aIndent = 0) const;
+
+ nsCSSValue mMarks;
+ nsCSSValue mSize;
+};
+
+struct nsCSSContent : public nsCSSStruct { // NEW
+ const nsID& GetID(void);
+ void List(FILE* out = stdout, PRInt32 aIndent = 0) const;
+
+ nsCSSValue mContent;
+ nsCSSValue mCounterIncrement;
+ nsCSSValue mCounterReset;
+ nsCSSValue mMarkerOffset;
+ nsCSSValue mQuotes;
+};
+
+struct nsCSSAural : public nsCSSStruct { // NEW
+ const nsID& GetID(void);
+ void List(FILE* out = stdout, PRInt32 aIndent = 0) const;
+
+ nsCSSValue mAzimuth;
+ nsCSSValue mElevation;
+ nsCSSValue mCueAfter;
+ nsCSSValue mCueBefore;
+ nsCSSValue mPauseAfter;
+ nsCSSValue mPauseBefore;
+ nsCSSValue mPitch;
+ nsCSSValue mPitchRange;
+ nsCSSValue mPlayDuring;
+ nsCSSValue mRichness;
+ nsCSSValue mSpeak;
+ nsCSSValue mSpeakHeader;
+ nsCSSValue mSpeakNumeral;
+ nsCSSValue mSpeakPunctuation;
+ nsCSSValue mSpeechRate;
+ nsCSSValue mStress;
+ nsCSSValue mVoiceFamily;
+ nsCSSValue mVolume;
+};
class nsICSSDeclaration : public nsISupports {
public:
diff --git a/mozilla/content/shared/src/nsCSSProps.cpp b/mozilla/content/shared/src/nsCSSProps.cpp
index 509329f5634..260c61eab6d 100644
--- a/mozilla/content/shared/src/nsCSSProps.cpp
+++ b/mozilla/content/shared/src/nsCSSProps.cpp
@@ -6,13 +6,12 @@
#include "plstr.h"
#include "nsCSSProps.h"
-
-#define TOTAL_KEYWORDS 80
+#define TOTAL_KEYWORDS 136
#define MIN_WORD_LENGTH 3
#define MAX_WORD_LENGTH 21
-#define MIN_HASH_VALUE 6
-#define MAX_HASH_VALUE 261
-/* maximum key range = 256, duplicates = 0 */
+#define MIN_HASH_VALUE 5
+#define MAX_HASH_VALUE 659
+/* maximum key range = 655, duplicates = 0 */
struct StaticNameTable {
@@ -51,178 +50,327 @@ PRInt32 nsCSSProps::LookupName(const char* str)
{
static unsigned short asso_values[] =
{
- 262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
- 262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
- 262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
- 262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
- 262, 262, 262, 262, 262, 65, 262, 262, 262, 262,
- 262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
- 262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
- 262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
- 262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
- 262, 262, 262, 262, 262, 262, 262, 45, 0, 85,
- 100, 25, 5, 0, 80, 0, 262, 262, 25, 90,
- 0, 0, 5, 262, 0, 65, 40, 20, 0, 80,
- 10, 25, 5, 262, 262, 262, 262, 262,
+ 660, 660, 660, 660, 660, 660, 660, 660, 660, 660,
+ 660, 660, 660, 660, 660, 660, 660, 660, 660, 660,
+ 660, 660, 660, 660, 660, 660, 660, 660, 660, 660,
+ 660, 660, 660, 660, 660, 660, 660, 660, 660, 660,
+ 660, 660, 660, 660, 660, 95, 660, 660, 660, 660,
+ 660, 660, 660, 660, 660, 660, 660, 660, 660, 660,
+ 660, 660, 660, 660, 660, 660, 660, 660, 660, 660,
+ 660, 660, 660, 660, 660, 660, 660, 660, 660, 660,
+ 660, 660, 660, 660, 660, 660, 660, 660, 660, 660,
+ 660, 660, 660, 660, 660, 660, 660, 5, 0, 150,
+ 5, 15, 125, 15, 235, 190, 660, 0, 60, 35,
+ 110, 0, 0, 10, 0, 0, 40, 80, 0, 35,
+ 15, 110, 45, 660, 660, 660, 660, 660,
};
static unsigned char lengthtable[] =
{
- 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 6, 12, 8,
- 0, 10, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0,
- 0, 0, 19, 0, 11, 0, 3, 4, 0, 11, 0, 0, 0, 0,
- 0, 7, 18, 0, 0, 0, 12, 0, 14, 0, 11, 17, 0, 19,
- 0, 0, 0, 0, 0, 5, 21, 7, 0, 0, 0, 0, 17, 18,
- 0, 0, 16, 0, 0, 0, 5, 21, 12, 0, 4, 0, 0, 12,
- 0, 19, 0, 16, 17, 13, 9, 10, 16, 17, 0, 0, 0, 6,
- 7, 8, 19, 5, 11, 0, 0, 4, 10, 0, 0, 0, 14, 10,
- 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 11, 0, 18, 0,
- 0, 6, 12, 0, 0, 0, 16, 0, 0, 9, 10, 21, 0, 0,
- 0, 10, 11, 12, 0, 0, 10, 0, 17, 8, 0, 5, 0, 12,
- 0, 0, 15, 0, 12, 0, 0, 0, 16, 7, 0, 0, 0, 0,
- 0, 13, 9, 0, 11, 0, 0, 0, 0, 6, 0, 0, 14, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14,
- 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 15, 0, 0, 0,
- 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 11,
+ 0, 0, 0, 0, 0, 5, 6, 0, 0, 0, 10, 0, 12, 0,
+ 0, 0, 0, 0, 0, 19, 10, 0, 0, 0, 4, 5, 16, 0,
+ 0, 0, 0, 16, 0, 0, 19, 15, 6, 17, 0, 0, 0, 0,
+ 12, 3, 0, 5, 6, 0, 13, 0, 0, 11, 0, 0, 0, 0,
+ 0, 0, 18, 0, 0, 0, 17, 0, 0, 0, 0, 0, 0, 0,
+ 0, 21, 0, 18, 0, 0, 6, 12, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 11, 12, 0, 0, 0, 6, 0,
+ 0, 0, 0, 11, 0, 8, 0, 10, 0, 12, 13, 0, 0, 11,
+ 17, 0, 0, 0, 0, 7, 0, 4, 0, 0, 0, 0, 0, 0,
+ 11, 17, 0, 0, 0, 0, 0, 0, 19, 0, 0, 7, 0, 0,
+ 0, 0, 12, 0, 14, 0, 0, 17, 0, 9, 10, 21, 0, 0,
+ 0, 5, 11, 7, 0, 0, 10, 0, 0, 0, 0, 0, 16, 17,
+ 18, 4, 0, 16, 0, 13, 0, 0, 0, 7, 13, 0, 10, 0,
+ 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 12, 13, 0, 0, 11, 0, 13, 14, 0, 0, 12, 0, 4,
+ 0, 11, 7, 8, 4, 5, 0, 12, 0, 14, 0, 0, 17, 0,
+ 0, 15, 16, 17, 0, 0, 5, 6, 12, 13, 9, 5, 6, 0,
+ 0, 0, 0, 0, 12, 0, 0, 0, 21, 0, 3, 0, 0, 0,
+ 0, 0, 19, 0, 11, 0, 8, 0, 10, 11, 0, 0, 0, 0,
+ 6, 0, 0, 0, 10, 0, 12, 13, 0, 10, 0, 0, 13, 0,
+ 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 10, 0, 0, 18,
+ 14, 0, 11, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 7,
+ 8, 0, 0, 11, 0, 0, 0, 0, 0, 7, 0, 9, 15, 6,
+ 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 7, 0, 0, 0,
+ 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0,
+ 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 9, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0,
+ 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 5, 0, 0, 0, 0, 0, 16, 0, 0, 9, 0,
+ 0, 0, 13, 14, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 9,
};
static struct StaticNameTable wordlist[] =
{
- {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
- {"border", 9},
- {"",}, {"",}, {"",}, {"",},
- {"filter", 40},
- {"border-color", 14},
- {"position", 68},
- {"",},
- {"border-top", 24},
+ {"",}, {"",}, {"",}, {"",}, {"",},
+ {"speak", 109},
+ {"border", 10},
{"",}, {"",}, {"",},
- {"border-bottom-color", 11},
- {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"border-top", 27},
+ {"",},
+ {"border-color", 16},
{"",}, {"",}, {"",}, {"",}, {"",}, {"",},
- {"visibility", 75},
+ {"border-bottom-color", 12},
+ {"background", 1},
+ {"",}, {"",}, {"",},
+ {"page", 94},
+ {"pause", 98},
+ {"page-break-after", 95},
+ {"",}, {"",}, {"",}, {"",},
+ {"border-top-style", 29},
+ {"",}, {"",},
+ {"border-bottom-style", 13},
+ {"border-collapse", 15},
+ {"volume", 130},
+ {"page-break-before", 96},
+ {"",}, {"",}, {"",}, {"",},
+ {"border-style", 26},
+ {"top", 125},
+ {"",},
+ {"marks", 77},
+ {"stress", 114},
+ {"",},
+ {"border-bottom", 11},
+ {"",}, {"",},
+ {"border-left", 17},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"border-right-color", 22},
+ {"",}, {"",}, {"",},
+ {"background-repeat", 9},
{"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
- {"border-bottom-style", 12},
+ {"background-attachment", 2},
{"",},
- {"font-family", 43},
- {"",},
- {"top", 73},
- {"font", 42},
- {"",},
- {"border-left", 15},
- {"",}, {"",}, {"",}, {"",}, {"",},
- {"padding", 63},
- {"border-right-color", 20},
- {"",}, {"",}, {"",},
- {"border-style", 23},
- {"",},
- {"letter-spacing", 50},
- {"",},
- {"padding-top", 67},
- {"background-filter", 3},
- {"",},
- {"background-position", 5},
- {"",}, {"",}, {"",}, {"",}, {"",},
- {"float", 41},
- {"background-x-position", 6},
- {"opacity", 61},
- {"",}, {"",}, {"",}, {"",},
- {"border-left-color", 16},
- {"border-right-style", 21},
+ {"border-right-style", 23},
{"",}, {"",},
- {"background-image", 4},
- {"",}, {"",}, {"",},
- {"color", 35},
- {"background-y-position", 7},
- {"border-right", 19},
- {"",},
- {"left", 49},
- {"",}, {"",},
- {"font-variant", 46},
- {"",},
- {"border-bottom-width", 13},
- {"",},
- {"border-top-color", 25},
- {"background-repeat", 8},
- {"border-bottom", 10},
- {"font-size", 44},
- {"font-style", 45},
- {"border-top-style", 26},
- {"border-left-style", 17},
- {"",}, {"",}, {"",},
- {"cursor", 36},
- {"z-index", 79},
- {"overflow", 62},
- {"list-style-position", 54},
- {"clear", 29},
- {"text-indent", 71},
- {"",}, {"",},
- {"clip", 30},
- {"text-align", 69},
- {"",}, {"",}, {"",},
- {"vertical-align", 74},
- {"list-style", 52},
- {"",}, {"",}, {"",}, {"",}, {"",},
- {"list-style-image", 53},
- {"",}, {"",}, {"",}, {"",},
- {"font-weight", 47},
- {"",},
- {"border-right-width", 22},
- {"",}, {"",},
- {"margin", 56},
- {"padding-left", 65},
- {"",}, {"",}, {"",},
- {"background-color", 2},
- {"",}, {"",},
- {"direction", 38},
- {"margin-top", 60},
- {"background-attachment", 1},
- {"",}, {"",}, {"",},
- {"background", 0},
- {"line-height", 51},
- {"word-spacing", 78},
- {"",}, {"",},
- {"clip-right", 33},
- {"",},
- {"border-left-width", 18},
- {"clip-top", 34},
- {"",},
- {"width", 77},
- {"",},
- {"cursor-image", 37},
- {"",}, {"",},
- {"list-style-type", 55},
- {"",},
- {"border-width", 28},
- {"",}, {"",}, {"",},
- {"border-top-width", 27},
- {"display", 39},
- {"",}, {"",}, {"",}, {"",}, {"",},
- {"padding-right", 66},
- {"clip-left", 32},
- {"",},
- {"margin-left", 58},
- {"",}, {"",}, {"",}, {"",},
- {"height", 48},
- {"",}, {"",},
- {"padding-bottom", 64},
+ {"bottom", 32},
+ {"word-spacing", 134},
{"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
- {"",}, {"",}, {"",}, {"",}, {"",},
- {"text-transform", 72},
+ {"",}, {"",}, {"",}, {"",},
+ {"play-during", 103},
+ {"border-right", 21},
+ {"",}, {"",}, {"",},
+ {"quotes", 105},
+ {"",}, {"",}, {"",}, {"",},
+ {"text-shadow", 119},
{"",},
- {"clip-bottom", 31},
- {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
- {"text-decoration", 70},
+ {"overflow", 88},
+ {"",},
+ {"max-height", 78},
+ {"",},
+ {"speak-header", 110},
+ {"marker-offset", 76},
+ {"",}, {"",},
+ {"pause-after", 99},
+ {"border-left-color", 18},
+ {"",}, {"",}, {"",}, {"",},
+ {"orphans", 83},
+ {"",},
+ {"left", 64},
{"",}, {"",}, {"",}, {"",}, {"",}, {"",},
- {"margin-right", 59},
+ {"padding-top", 93},
+ {"border-left-style", 19},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"background-position", 6},
+ {"",}, {"",},
+ {"padding", 89},
+ {"",}, {"",}, {"",}, {"",},
+ {"pause-before", 100},
+ {"",},
+ {"text-transform", 124},
+ {"",}, {"",},
+ {"background-filter", 4},
+ {"",},
+ {"font-size", 57},
+ {"font-style", 60},
+ {"background-x-position", 7},
+ {"",}, {"",}, {"",},
+ {"color", 40},
+ {"empty-cells", 52},
+ {"opacity", 82},
+ {"",}, {"",},
+ {"margin-top", 75},
+ {"",}, {"",}, {"",}, {"",}, {"",},
+ {"border-top-color", 28},
+ {"text-shadow-color", 120},
+ {"text-shadow-radius", 123},
+ {"font", 55},
+ {"",},
+ {"background-color", 3},
+ {"",},
+ {"speak-numeral", 111},
+ {"",}, {"",}, {"",},
+ {"z-index", 135},
+ {"text-shadow-x", 121},
+ {"",},
+ {"text-align", 116},
+ {"",}, {"",}, {"",}, {"",}, {"",},
+ {"font-size-adjust", 58},
{"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
{"",},
- {"margin-bottom", 57},
- {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
- {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"caption-side", 33},
+ {"margin-bottom", 72},
+ {"",}, {"",},
+ {"margin-left", 73},
+ {"",},
+ {"outline-color", 85},
+ {"padding-bottom", 90},
+ {"",}, {"",},
+ {"padding-left", 91},
+ {"",},
+ {"size", 108},
+ {"",},
+ {"font-weight", 62},
+ {"outline", 84},
+ {"richness", 106},
+ {"clip", 35},
+ {"clear", 34},
+ {"",},
+ {"font-variant", 61},
+ {"",},
+ {"border-spacing", 25},
+ {"",}, {"",},
+ {"counter-increment", 42},
+ {"",}, {"",},
+ {"text-decoration", 117},
+ {"background-image", 5},
+ {"page-break-inside", 97},
+ {"",}, {"",},
+ {"float", 54},
+ {"widows", 132},
+ {"table-layout", 115},
+ {"counter-reset", 43},
+ {"elevation", 51},
+ {"right", 107},
+ {"cursor", 47},
+ {"",}, {"",}, {"",}, {"",}, {"",},
+ {"margin-right", 74},
+ {"",}, {"",}, {"",},
+ {"background-y-position", 8},
+ {"",},
+ {"cue", 44},
+ {"",}, {"",}, {"",}, {"",}, {"",},
+ {"border-bottom-width", 14},
+ {"",},
+ {"clip-bottom", 36},
+ {"",},
+ {"clip-top", 39},
+ {"",},
+ {"clip-right", 38},
+ {"speech-rate", 113},
{"",}, {"",}, {"",}, {"",},
- {"white-space", 76},
+ {"margin", 71},
+ {"",}, {"",}, {"",},
+ {"cue-before", 46},
+ {"",},
+ {"cursor-image", 48},
+ {"text-shadow-y", 122},
+ {"",},
+ {"list-style", 67},
+ {"",}, {"",},
+ {"outline-style", 86},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"border-top-width", 30},
+ {"",}, {"",}, {"",},
+ {"min-height", 80},
+ {"",}, {"",},
+ {"border-right-width", 24},
+ {"letter-spacing", 65},
+ {"",},
+ {"text-indent", 118},
+ {"",}, {"",}, {"",}, {"",}, {"",},
+ {"speak-punctuation", 112},
+ {"",}, {"",}, {"",}, {"",},
+ {"content", 41},
+ {"position", 104},
+ {"",}, {"",},
+ {"pitch-range", 102},
+ {"",}, {"",}, {"",}, {"",}, {"",},
+ {"display", 50},
+ {"",},
+ {"clip-left", 37},
+ {"list-style-type", 70},
+ {"filter", 53},
+ {"",}, {"",}, {"",}, {"",}, {"",},
+ {"voice-family", 129},
+ {"",}, {"",}, {"",}, {"",},
+ {"azimuth", 0},
+ {"",}, {"",}, {"",},
+ {"height", 63},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",},
+ {"border-left-width", 20},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"direction", 49},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"cue-after", 45},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"font-family", 56},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"list-style-position", 69},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",},
+ {"white-space", 131},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",},
+ {"padding-right", 92},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"pitch", 101},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"width", 133},
+ {"",}, {"",}, {"",}, {"",}, {"",},
+ {"list-style-image", 68},
+ {"",}, {"",},
+ {"max-width", 79},
+ {"",}, {"",}, {"",},
+ {"outline-width", 87},
+ {"vertical-align", 127},
+ {"",}, {"",},
+ {"border-width", 31},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"visibility", 128},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"line-height", 66},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",},
+ {"unicode-bidi", 126},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"font-stretch", 59},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"min-width", 81},
};
if (str != NULL) {
@@ -283,87 +431,140 @@ PRInt32 nsCSSProps::LookupName(const char* str)
}
const nsCSSProps::NameTableEntry nsCSSProps::kNameTable[] = {
- { "background", 0 },
- { "background-attachment", 1 },
- { "background-color", 2 },
- { "background-filter", 3 },
- { "background-image", 4 },
- { "background-position", 5 },
- { "background-x-position", 6 },
- { "background-y-position", 7 },
- { "background-repeat", 8 },
- { "border", 9 },
- { "border-bottom", 10 },
- { "border-bottom-color", 11 },
- { "border-bottom-style", 12 },
- { "border-bottom-width", 13 },
- { "border-color", 14 },
- { "border-left", 15 },
- { "border-left-color", 16 },
- { "border-left-style", 17 },
- { "border-left-width", 18 },
- { "border-right", 19 },
- { "border-right-color", 20 },
- { "border-right-style", 21 },
- { "border-right-width", 22 },
- { "border-style", 23 },
- { "border-top", 24 },
- { "border-top-color", 25 },
- { "border-top-style", 26 },
- { "border-top-width", 27 },
- { "border-width", 28 },
- { "clear", 29 },
- { "clip", 30 },
- { "clip-bottom", 31 },
- { "clip-left", 32 },
- { "clip-right", 33 },
- { "clip-top", 34 },
- { "color", 35 },
- { "cursor", 36 },
- { "cursor-image", 37 },
- { "direction", 38 },
- { "display", 39 },
- { "filter", 40 },
- { "float", 41 },
- { "font", 42 },
- { "font-family", 43 },
- { "font-size", 44 },
- { "font-style", 45 },
- { "font-variant", 46 },
- { "font-weight", 47 },
- { "height", 48 },
- { "left", 49 },
- { "letter-spacing", 50 },
- { "line-height", 51 },
- { "list-style", 52 },
- { "list-style-image", 53 },
- { "list-style-position", 54 },
- { "list-style-type", 55 },
- { "margin", 56 },
- { "margin-bottom", 57 },
- { "margin-left", 58 },
- { "margin-right", 59 },
- { "margin-top", 60 },
- { "opacity", 61 },
- { "overflow", 62 },
- { "padding", 63 },
- { "padding-bottom", 64 },
- { "padding-left", 65 },
- { "padding-right", 66 },
- { "padding-top", 67 },
- { "position", 68 },
- { "text-align", 69 },
- { "text-decoration", 70 },
- { "text-indent", 71 },
- { "text-transform", 72 },
- { "top", 73 },
- { "vertical-align", 74 },
- { "visibility", 75 },
- { "white-space", 76 },
- { "width", 77 },
- { "word-spacing", 78 },
- { "z-index", 79 },
+ { "azimuth", 0 },
+ { "background", 1 },
+ { "background-attachment", 2 },
+ { "background-color", 3 },
+ { "background-filter", 4 },
+ { "background-image", 5 },
+ { "background-position", 6 },
+ { "background-x-position", 7 },
+ { "background-y-position", 8 },
+ { "background-repeat", 9 },
+ { "border", 10 },
+ { "border-bottom", 11 },
+ { "border-bottom-color", 12 },
+ { "border-bottom-style", 13 },
+ { "border-bottom-width", 14 },
+ { "border-collapse", 15 },
+ { "border-color", 16 },
+ { "border-left", 17 },
+ { "border-left-color", 18 },
+ { "border-left-style", 19 },
+ { "border-left-width", 20 },
+ { "border-right", 21 },
+ { "border-right-color", 22 },
+ { "border-right-style", 23 },
+ { "border-right-width", 24 },
+ { "border-spacing", 25 },
+ { "border-style", 26 },
+ { "border-top", 27 },
+ { "border-top-color", 28 },
+ { "border-top-style", 29 },
+ { "border-top-width", 30 },
+ { "border-width", 31 },
+ { "bottom", 32 },
+ { "caption-side", 33 },
+ { "clear", 34 },
+ { "clip", 35 },
+ { "clip-bottom", 36 },
+ { "clip-left", 37 },
+ { "clip-right", 38 },
+ { "clip-top", 39 },
+ { "color", 40 },
+ { "content", 41 },
+ { "counter-increment", 42 },
+ { "counter-reset", 43 },
+ { "cue", 44 },
+ { "cue-after", 45 },
+ { "cue-before", 46 },
+ { "cursor", 47 },
+ { "cursor-image", 48 },
+ { "direction", 49 },
+ { "display", 50 },
+ { "elevation", 51 },
+ { "empty-cells", 52 },
+ { "filter", 53 },
+ { "float", 54 },
+ { "font", 55 },
+ { "font-family", 56 },
+ { "font-size", 57 },
+ { "font-size-adjust", 58 },
+ { "font-stretch", 59 },
+ { "font-style", 60 },
+ { "font-variant", 61 },
+ { "font-weight", 62 },
+ { "height", 63 },
+ { "left", 64 },
+ { "letter-spacing", 65 },
+ { "line-height", 66 },
+ { "list-style", 67 },
+ { "list-style-image", 68 },
+ { "list-style-position", 69 },
+ { "list-style-type", 70 },
+ { "margin", 71 },
+ { "margin-bottom", 72 },
+ { "margin-left", 73 },
+ { "margin-right", 74 },
+ { "margin-top", 75 },
+ { "marker-offset", 76 },
+ { "marks", 77 },
+ { "max-height", 78 },
+ { "max-width", 79 },
+ { "min-height", 80 },
+ { "min-width", 81 },
+ { "opacity", 82 },
+ { "orphans", 83 },
+ { "outline", 84 },
+ { "outline-color", 85 },
+ { "outline-style", 86 },
+ { "outline-width", 87 },
+ { "overflow", 88 },
+ { "padding", 89 },
+ { "padding-bottom", 90 },
+ { "padding-left", 91 },
+ { "padding-right", 92 },
+ { "padding-top", 93 },
+ { "page", 94 },
+ { "page-break-after", 95 },
+ { "page-break-before", 96 },
+ { "page-break-inside", 97 },
+ { "pause", 98 },
+ { "pause-after", 99 },
+ { "pause-before", 100 },
+ { "pitch", 101 },
+ { "pitch-range", 102 },
+ { "play-during", 103 },
+ { "position", 104 },
+ { "quotes", 105 },
+ { "richness", 106 },
+ { "right", 107 },
+ { "size", 108 },
+ { "speak", 109 },
+ { "speak-header", 110 },
+ { "speak-numeral", 111 },
+ { "speak-punctuation", 112 },
+ { "speech-rate", 113 },
+ { "stress", 114 },
+ { "table-layout", 115 },
+ { "text-align", 116 },
+ { "text-decoration", 117 },
+ { "text-indent", 118 },
+ { "text-shadow", 119 },
+ { "text-shadow-color", 120 },
+ { "text-shadow-x", 121 },
+ { "text-shadow-y", 122 },
+ { "text-shadow-radius", 123 },
+ { "text-transform", 124 },
+ { "top", 125 },
+ { "unicode-bidi", 126 },
+ { "vertical-align", 127 },
+ { "visibility", 128 },
+ { "voice-family", 129 },
+ { "volume", 130 },
+ { "white-space", 131 },
+ { "widows", 132 },
+ { "width", 133 },
+ { "word-spacing", 134 },
+ { "z-index", 135 },
};
-
-
-
diff --git a/mozilla/layout/html/style/src/nsCSSPropIDs.h b/mozilla/layout/html/style/src/nsCSSPropIDs.h
index 8fde939de5f..9ee21d83df2 100644
--- a/mozilla/layout/html/style/src/nsCSSPropIDs.h
+++ b/mozilla/layout/html/style/src/nsCSSPropIDs.h
@@ -1,82 +1,138 @@
/* Do not edit - generated by genhash.pl */
-#define PROP_BACKGROUND 0
-#define PROP_BACKGROUND_ATTACHMENT 1
-#define PROP_BACKGROUND_COLOR 2
-#define PROP_BACKGROUND_FILTER 3
-#define PROP_BACKGROUND_IMAGE 4
-#define PROP_BACKGROUND_POSITION 5
-#define PROP_BACKGROUND_X_POSITION 6
-#define PROP_BACKGROUND_Y_POSITION 7
-#define PROP_BACKGROUND_REPEAT 8
-#define PROP_BORDER 9
-#define PROP_BORDER_BOTTOM 10
-#define PROP_BORDER_BOTTOM_COLOR 11
-#define PROP_BORDER_BOTTOM_STYLE 12
-#define PROP_BORDER_BOTTOM_WIDTH 13
-#define PROP_BORDER_COLOR 14
-#define PROP_BORDER_LEFT 15
-#define PROP_BORDER_LEFT_COLOR 16
-#define PROP_BORDER_LEFT_STYLE 17
-#define PROP_BORDER_LEFT_WIDTH 18
-#define PROP_BORDER_RIGHT 19
-#define PROP_BORDER_RIGHT_COLOR 20
-#define PROP_BORDER_RIGHT_STYLE 21
-#define PROP_BORDER_RIGHT_WIDTH 22
-#define PROP_BORDER_STYLE 23
-#define PROP_BORDER_TOP 24
-#define PROP_BORDER_TOP_COLOR 25
-#define PROP_BORDER_TOP_STYLE 26
-#define PROP_BORDER_TOP_WIDTH 27
-#define PROP_BORDER_WIDTH 28
-#define PROP_CLEAR 29
-#define PROP_CLIP 30
-#define PROP_CLIP_BOTTOM 31
-#define PROP_CLIP_LEFT 32
-#define PROP_CLIP_RIGHT 33
-#define PROP_CLIP_TOP 34
-#define PROP_COLOR 35
-#define PROP_CURSOR 36
-#define PROP_CURSOR_IMAGE 37
-#define PROP_DIRECTION 38
-#define PROP_DISPLAY 39
-#define PROP_FILTER 40
-#define PROP_FLOAT 41
-#define PROP_FONT 42
-#define PROP_FONT_FAMILY 43
-#define PROP_FONT_SIZE 44
-#define PROP_FONT_STYLE 45
-#define PROP_FONT_VARIANT 46
-#define PROP_FONT_WEIGHT 47
-#define PROP_HEIGHT 48
-#define PROP_LEFT 49
-#define PROP_LETTER_SPACING 50
-#define PROP_LINE_HEIGHT 51
-#define PROP_LIST_STYLE 52
-#define PROP_LIST_STYLE_IMAGE 53
-#define PROP_LIST_STYLE_POSITION 54
-#define PROP_LIST_STYLE_TYPE 55
-#define PROP_MARGIN 56
-#define PROP_MARGIN_BOTTOM 57
-#define PROP_MARGIN_LEFT 58
-#define PROP_MARGIN_RIGHT 59
-#define PROP_MARGIN_TOP 60
-#define PROP_OPACITY 61
-#define PROP_OVERFLOW 62
-#define PROP_PADDING 63
-#define PROP_PADDING_BOTTOM 64
-#define PROP_PADDING_LEFT 65
-#define PROP_PADDING_RIGHT 66
-#define PROP_PADDING_TOP 67
-#define PROP_POSITION 68
-#define PROP_TEXT_ALIGN 69
-#define PROP_TEXT_DECORATION 70
-#define PROP_TEXT_INDENT 71
-#define PROP_TEXT_TRANSFORM 72
-#define PROP_TOP 73
-#define PROP_VERTICAL_ALIGN 74
-#define PROP_VISIBILITY 75
-#define PROP_WHITE_SPACE 76
-#define PROP_WIDTH 77
-#define PROP_WORD_SPACING 78
-#define PROP_Z_INDEX 79
-#define PROP_MAX 80
+#define PROP_AZIMUTH 0
+#define PROP_BACKGROUND 1
+#define PROP_BACKGROUND_ATTACHMENT 2
+#define PROP_BACKGROUND_COLOR 3
+#define PROP_BACKGROUND_FILTER 4
+#define PROP_BACKGROUND_IMAGE 5
+#define PROP_BACKGROUND_POSITION 6
+#define PROP_BACKGROUND_X_POSITION 7
+#define PROP_BACKGROUND_Y_POSITION 8
+#define PROP_BACKGROUND_REPEAT 9
+#define PROP_BORDER 10
+#define PROP_BORDER_BOTTOM 11
+#define PROP_BORDER_BOTTOM_COLOR 12
+#define PROP_BORDER_BOTTOM_STYLE 13
+#define PROP_BORDER_BOTTOM_WIDTH 14
+#define PROP_BORDER_COLLAPSE 15
+#define PROP_BORDER_COLOR 16
+#define PROP_BORDER_LEFT 17
+#define PROP_BORDER_LEFT_COLOR 18
+#define PROP_BORDER_LEFT_STYLE 19
+#define PROP_BORDER_LEFT_WIDTH 20
+#define PROP_BORDER_RIGHT 21
+#define PROP_BORDER_RIGHT_COLOR 22
+#define PROP_BORDER_RIGHT_STYLE 23
+#define PROP_BORDER_RIGHT_WIDTH 24
+#define PROP_BORDER_SPACING 25
+#define PROP_BORDER_STYLE 26
+#define PROP_BORDER_TOP 27
+#define PROP_BORDER_TOP_COLOR 28
+#define PROP_BORDER_TOP_STYLE 29
+#define PROP_BORDER_TOP_WIDTH 30
+#define PROP_BORDER_WIDTH 31
+#define PROP_BOTTOM 32
+#define PROP_CAPTION_SIDE 33
+#define PROP_CLEAR 34
+#define PROP_CLIP 35
+#define PROP_CLIP_BOTTOM 36
+#define PROP_CLIP_LEFT 37
+#define PROP_CLIP_RIGHT 38
+#define PROP_CLIP_TOP 39
+#define PROP_COLOR 40
+#define PROP_CONTENT 41
+#define PROP_COUNTER_INCREMENT 42
+#define PROP_COUNTER_RESET 43
+#define PROP_CUE 44
+#define PROP_CUE_AFTER 45
+#define PROP_CUE_BEFORE 46
+#define PROP_CURSOR 47
+#define PROP_CURSOR_IMAGE 48
+#define PROP_DIRECTION 49
+#define PROP_DISPLAY 50
+#define PROP_ELEVATION 51
+#define PROP_EMPTY_CELLS 52
+#define PROP_FILTER 53
+#define PROP_FLOAT 54
+#define PROP_FONT 55
+#define PROP_FONT_FAMILY 56
+#define PROP_FONT_SIZE 57
+#define PROP_FONT_SIZE_ADJUST 58
+#define PROP_FONT_STRETCH 59
+#define PROP_FONT_STYLE 60
+#define PROP_FONT_VARIANT 61
+#define PROP_FONT_WEIGHT 62
+#define PROP_HEIGHT 63
+#define PROP_LEFT 64
+#define PROP_LETTER_SPACING 65
+#define PROP_LINE_HEIGHT 66
+#define PROP_LIST_STYLE 67
+#define PROP_LIST_STYLE_IMAGE 68
+#define PROP_LIST_STYLE_POSITION 69
+#define PROP_LIST_STYLE_TYPE 70
+#define PROP_MARGIN 71
+#define PROP_MARGIN_BOTTOM 72
+#define PROP_MARGIN_LEFT 73
+#define PROP_MARGIN_RIGHT 74
+#define PROP_MARGIN_TOP 75
+#define PROP_MARKER_OFFSET 76
+#define PROP_MARKS 77
+#define PROP_MAX_HEIGHT 78
+#define PROP_MAX_WIDTH 79
+#define PROP_MIN_HEIGHT 80
+#define PROP_MIN_WIDTH 81
+#define PROP_OPACITY 82
+#define PROP_ORPHANS 83
+#define PROP_OUTLINE 84
+#define PROP_OUTLINE_COLOR 85
+#define PROP_OUTLINE_STYLE 86
+#define PROP_OUTLINE_WIDTH 87
+#define PROP_OVERFLOW 88
+#define PROP_PADDING 89
+#define PROP_PADDING_BOTTOM 90
+#define PROP_PADDING_LEFT 91
+#define PROP_PADDING_RIGHT 92
+#define PROP_PADDING_TOP 93
+#define PROP_PAGE 94
+#define PROP_PAGE_BREAK_AFTER 95
+#define PROP_PAGE_BREAK_BEFORE 96
+#define PROP_PAGE_BREAK_INSIDE 97
+#define PROP_PAUSE 98
+#define PROP_PAUSE_AFTER 99
+#define PROP_PAUSE_BEFORE 100
+#define PROP_PITCH 101
+#define PROP_PITCH_RANGE 102
+#define PROP_PLAY_DURING 103
+#define PROP_POSITION 104
+#define PROP_QUOTES 105
+#define PROP_RICHNESS 106
+#define PROP_RIGHT 107
+#define PROP_SIZE 108
+#define PROP_SPEAK 109
+#define PROP_SPEAK_HEADER 110
+#define PROP_SPEAK_NUMERAL 111
+#define PROP_SPEAK_PUNCTUATION 112
+#define PROP_SPEECH_RATE 113
+#define PROP_STRESS 114
+#define PROP_TABLE_LAYOUT 115
+#define PROP_TEXT_ALIGN 116
+#define PROP_TEXT_DECORATION 117
+#define PROP_TEXT_INDENT 118
+#define PROP_TEXT_SHADOW 119
+#define PROP_TEXT_SHADOW_COLOR 120
+#define PROP_TEXT_SHADOW_X 121
+#define PROP_TEXT_SHADOW_Y 122
+#define PROP_TEXT_SHADOW_RADIUS 123
+#define PROP_TEXT_TRANSFORM 124
+#define PROP_TOP 125
+#define PROP_UNICODE_BIDI 126
+#define PROP_VERTICAL_ALIGN 127
+#define PROP_VISIBILITY 128
+#define PROP_VOICE_FAMILY 129
+#define PROP_VOLUME 130
+#define PROP_WHITE_SPACE 131
+#define PROP_WIDOWS 132
+#define PROP_WIDTH 133
+#define PROP_WORD_SPACING 134
+#define PROP_Z_INDEX 135
+#define PROP_MAX 136
diff --git a/mozilla/layout/html/style/src/nsCSSProps.cpp b/mozilla/layout/html/style/src/nsCSSProps.cpp
index 509329f5634..260c61eab6d 100644
--- a/mozilla/layout/html/style/src/nsCSSProps.cpp
+++ b/mozilla/layout/html/style/src/nsCSSProps.cpp
@@ -6,13 +6,12 @@
#include "plstr.h"
#include "nsCSSProps.h"
-
-#define TOTAL_KEYWORDS 80
+#define TOTAL_KEYWORDS 136
#define MIN_WORD_LENGTH 3
#define MAX_WORD_LENGTH 21
-#define MIN_HASH_VALUE 6
-#define MAX_HASH_VALUE 261
-/* maximum key range = 256, duplicates = 0 */
+#define MIN_HASH_VALUE 5
+#define MAX_HASH_VALUE 659
+/* maximum key range = 655, duplicates = 0 */
struct StaticNameTable {
@@ -51,178 +50,327 @@ PRInt32 nsCSSProps::LookupName(const char* str)
{
static unsigned short asso_values[] =
{
- 262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
- 262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
- 262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
- 262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
- 262, 262, 262, 262, 262, 65, 262, 262, 262, 262,
- 262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
- 262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
- 262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
- 262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
- 262, 262, 262, 262, 262, 262, 262, 45, 0, 85,
- 100, 25, 5, 0, 80, 0, 262, 262, 25, 90,
- 0, 0, 5, 262, 0, 65, 40, 20, 0, 80,
- 10, 25, 5, 262, 262, 262, 262, 262,
+ 660, 660, 660, 660, 660, 660, 660, 660, 660, 660,
+ 660, 660, 660, 660, 660, 660, 660, 660, 660, 660,
+ 660, 660, 660, 660, 660, 660, 660, 660, 660, 660,
+ 660, 660, 660, 660, 660, 660, 660, 660, 660, 660,
+ 660, 660, 660, 660, 660, 95, 660, 660, 660, 660,
+ 660, 660, 660, 660, 660, 660, 660, 660, 660, 660,
+ 660, 660, 660, 660, 660, 660, 660, 660, 660, 660,
+ 660, 660, 660, 660, 660, 660, 660, 660, 660, 660,
+ 660, 660, 660, 660, 660, 660, 660, 660, 660, 660,
+ 660, 660, 660, 660, 660, 660, 660, 5, 0, 150,
+ 5, 15, 125, 15, 235, 190, 660, 0, 60, 35,
+ 110, 0, 0, 10, 0, 0, 40, 80, 0, 35,
+ 15, 110, 45, 660, 660, 660, 660, 660,
};
static unsigned char lengthtable[] =
{
- 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 6, 12, 8,
- 0, 10, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0,
- 0, 0, 19, 0, 11, 0, 3, 4, 0, 11, 0, 0, 0, 0,
- 0, 7, 18, 0, 0, 0, 12, 0, 14, 0, 11, 17, 0, 19,
- 0, 0, 0, 0, 0, 5, 21, 7, 0, 0, 0, 0, 17, 18,
- 0, 0, 16, 0, 0, 0, 5, 21, 12, 0, 4, 0, 0, 12,
- 0, 19, 0, 16, 17, 13, 9, 10, 16, 17, 0, 0, 0, 6,
- 7, 8, 19, 5, 11, 0, 0, 4, 10, 0, 0, 0, 14, 10,
- 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 11, 0, 18, 0,
- 0, 6, 12, 0, 0, 0, 16, 0, 0, 9, 10, 21, 0, 0,
- 0, 10, 11, 12, 0, 0, 10, 0, 17, 8, 0, 5, 0, 12,
- 0, 0, 15, 0, 12, 0, 0, 0, 16, 7, 0, 0, 0, 0,
- 0, 13, 9, 0, 11, 0, 0, 0, 0, 6, 0, 0, 14, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14,
- 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 15, 0, 0, 0,
- 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 11,
+ 0, 0, 0, 0, 0, 5, 6, 0, 0, 0, 10, 0, 12, 0,
+ 0, 0, 0, 0, 0, 19, 10, 0, 0, 0, 4, 5, 16, 0,
+ 0, 0, 0, 16, 0, 0, 19, 15, 6, 17, 0, 0, 0, 0,
+ 12, 3, 0, 5, 6, 0, 13, 0, 0, 11, 0, 0, 0, 0,
+ 0, 0, 18, 0, 0, 0, 17, 0, 0, 0, 0, 0, 0, 0,
+ 0, 21, 0, 18, 0, 0, 6, 12, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 11, 12, 0, 0, 0, 6, 0,
+ 0, 0, 0, 11, 0, 8, 0, 10, 0, 12, 13, 0, 0, 11,
+ 17, 0, 0, 0, 0, 7, 0, 4, 0, 0, 0, 0, 0, 0,
+ 11, 17, 0, 0, 0, 0, 0, 0, 19, 0, 0, 7, 0, 0,
+ 0, 0, 12, 0, 14, 0, 0, 17, 0, 9, 10, 21, 0, 0,
+ 0, 5, 11, 7, 0, 0, 10, 0, 0, 0, 0, 0, 16, 17,
+ 18, 4, 0, 16, 0, 13, 0, 0, 0, 7, 13, 0, 10, 0,
+ 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 12, 13, 0, 0, 11, 0, 13, 14, 0, 0, 12, 0, 4,
+ 0, 11, 7, 8, 4, 5, 0, 12, 0, 14, 0, 0, 17, 0,
+ 0, 15, 16, 17, 0, 0, 5, 6, 12, 13, 9, 5, 6, 0,
+ 0, 0, 0, 0, 12, 0, 0, 0, 21, 0, 3, 0, 0, 0,
+ 0, 0, 19, 0, 11, 0, 8, 0, 10, 11, 0, 0, 0, 0,
+ 6, 0, 0, 0, 10, 0, 12, 13, 0, 10, 0, 0, 13, 0,
+ 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 10, 0, 0, 18,
+ 14, 0, 11, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 7,
+ 8, 0, 0, 11, 0, 0, 0, 0, 0, 7, 0, 9, 15, 6,
+ 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 7, 0, 0, 0,
+ 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0,
+ 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 9, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0,
+ 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 5, 0, 0, 0, 0, 0, 16, 0, 0, 9, 0,
+ 0, 0, 13, 14, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 9,
};
static struct StaticNameTable wordlist[] =
{
- {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
- {"border", 9},
- {"",}, {"",}, {"",}, {"",},
- {"filter", 40},
- {"border-color", 14},
- {"position", 68},
- {"",},
- {"border-top", 24},
+ {"",}, {"",}, {"",}, {"",}, {"",},
+ {"speak", 109},
+ {"border", 10},
{"",}, {"",}, {"",},
- {"border-bottom-color", 11},
- {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"border-top", 27},
+ {"",},
+ {"border-color", 16},
{"",}, {"",}, {"",}, {"",}, {"",}, {"",},
- {"visibility", 75},
+ {"border-bottom-color", 12},
+ {"background", 1},
+ {"",}, {"",}, {"",},
+ {"page", 94},
+ {"pause", 98},
+ {"page-break-after", 95},
+ {"",}, {"",}, {"",}, {"",},
+ {"border-top-style", 29},
+ {"",}, {"",},
+ {"border-bottom-style", 13},
+ {"border-collapse", 15},
+ {"volume", 130},
+ {"page-break-before", 96},
+ {"",}, {"",}, {"",}, {"",},
+ {"border-style", 26},
+ {"top", 125},
+ {"",},
+ {"marks", 77},
+ {"stress", 114},
+ {"",},
+ {"border-bottom", 11},
+ {"",}, {"",},
+ {"border-left", 17},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"border-right-color", 22},
+ {"",}, {"",}, {"",},
+ {"background-repeat", 9},
{"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
- {"border-bottom-style", 12},
+ {"background-attachment", 2},
{"",},
- {"font-family", 43},
- {"",},
- {"top", 73},
- {"font", 42},
- {"",},
- {"border-left", 15},
- {"",}, {"",}, {"",}, {"",}, {"",},
- {"padding", 63},
- {"border-right-color", 20},
- {"",}, {"",}, {"",},
- {"border-style", 23},
- {"",},
- {"letter-spacing", 50},
- {"",},
- {"padding-top", 67},
- {"background-filter", 3},
- {"",},
- {"background-position", 5},
- {"",}, {"",}, {"",}, {"",}, {"",},
- {"float", 41},
- {"background-x-position", 6},
- {"opacity", 61},
- {"",}, {"",}, {"",}, {"",},
- {"border-left-color", 16},
- {"border-right-style", 21},
+ {"border-right-style", 23},
{"",}, {"",},
- {"background-image", 4},
- {"",}, {"",}, {"",},
- {"color", 35},
- {"background-y-position", 7},
- {"border-right", 19},
- {"",},
- {"left", 49},
- {"",}, {"",},
- {"font-variant", 46},
- {"",},
- {"border-bottom-width", 13},
- {"",},
- {"border-top-color", 25},
- {"background-repeat", 8},
- {"border-bottom", 10},
- {"font-size", 44},
- {"font-style", 45},
- {"border-top-style", 26},
- {"border-left-style", 17},
- {"",}, {"",}, {"",},
- {"cursor", 36},
- {"z-index", 79},
- {"overflow", 62},
- {"list-style-position", 54},
- {"clear", 29},
- {"text-indent", 71},
- {"",}, {"",},
- {"clip", 30},
- {"text-align", 69},
- {"",}, {"",}, {"",},
- {"vertical-align", 74},
- {"list-style", 52},
- {"",}, {"",}, {"",}, {"",}, {"",},
- {"list-style-image", 53},
- {"",}, {"",}, {"",}, {"",},
- {"font-weight", 47},
- {"",},
- {"border-right-width", 22},
- {"",}, {"",},
- {"margin", 56},
- {"padding-left", 65},
- {"",}, {"",}, {"",},
- {"background-color", 2},
- {"",}, {"",},
- {"direction", 38},
- {"margin-top", 60},
- {"background-attachment", 1},
- {"",}, {"",}, {"",},
- {"background", 0},
- {"line-height", 51},
- {"word-spacing", 78},
- {"",}, {"",},
- {"clip-right", 33},
- {"",},
- {"border-left-width", 18},
- {"clip-top", 34},
- {"",},
- {"width", 77},
- {"",},
- {"cursor-image", 37},
- {"",}, {"",},
- {"list-style-type", 55},
- {"",},
- {"border-width", 28},
- {"",}, {"",}, {"",},
- {"border-top-width", 27},
- {"display", 39},
- {"",}, {"",}, {"",}, {"",}, {"",},
- {"padding-right", 66},
- {"clip-left", 32},
- {"",},
- {"margin-left", 58},
- {"",}, {"",}, {"",}, {"",},
- {"height", 48},
- {"",}, {"",},
- {"padding-bottom", 64},
+ {"bottom", 32},
+ {"word-spacing", 134},
{"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
- {"",}, {"",}, {"",}, {"",}, {"",},
- {"text-transform", 72},
+ {"",}, {"",}, {"",}, {"",},
+ {"play-during", 103},
+ {"border-right", 21},
+ {"",}, {"",}, {"",},
+ {"quotes", 105},
+ {"",}, {"",}, {"",}, {"",},
+ {"text-shadow", 119},
{"",},
- {"clip-bottom", 31},
- {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
- {"text-decoration", 70},
+ {"overflow", 88},
+ {"",},
+ {"max-height", 78},
+ {"",},
+ {"speak-header", 110},
+ {"marker-offset", 76},
+ {"",}, {"",},
+ {"pause-after", 99},
+ {"border-left-color", 18},
+ {"",}, {"",}, {"",}, {"",},
+ {"orphans", 83},
+ {"",},
+ {"left", 64},
{"",}, {"",}, {"",}, {"",}, {"",}, {"",},
- {"margin-right", 59},
+ {"padding-top", 93},
+ {"border-left-style", 19},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"background-position", 6},
+ {"",}, {"",},
+ {"padding", 89},
+ {"",}, {"",}, {"",}, {"",},
+ {"pause-before", 100},
+ {"",},
+ {"text-transform", 124},
+ {"",}, {"",},
+ {"background-filter", 4},
+ {"",},
+ {"font-size", 57},
+ {"font-style", 60},
+ {"background-x-position", 7},
+ {"",}, {"",}, {"",},
+ {"color", 40},
+ {"empty-cells", 52},
+ {"opacity", 82},
+ {"",}, {"",},
+ {"margin-top", 75},
+ {"",}, {"",}, {"",}, {"",}, {"",},
+ {"border-top-color", 28},
+ {"text-shadow-color", 120},
+ {"text-shadow-radius", 123},
+ {"font", 55},
+ {"",},
+ {"background-color", 3},
+ {"",},
+ {"speak-numeral", 111},
+ {"",}, {"",}, {"",},
+ {"z-index", 135},
+ {"text-shadow-x", 121},
+ {"",},
+ {"text-align", 116},
+ {"",}, {"",}, {"",}, {"",}, {"",},
+ {"font-size-adjust", 58},
{"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
{"",},
- {"margin-bottom", 57},
- {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
- {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"caption-side", 33},
+ {"margin-bottom", 72},
+ {"",}, {"",},
+ {"margin-left", 73},
+ {"",},
+ {"outline-color", 85},
+ {"padding-bottom", 90},
+ {"",}, {"",},
+ {"padding-left", 91},
+ {"",},
+ {"size", 108},
+ {"",},
+ {"font-weight", 62},
+ {"outline", 84},
+ {"richness", 106},
+ {"clip", 35},
+ {"clear", 34},
+ {"",},
+ {"font-variant", 61},
+ {"",},
+ {"border-spacing", 25},
+ {"",}, {"",},
+ {"counter-increment", 42},
+ {"",}, {"",},
+ {"text-decoration", 117},
+ {"background-image", 5},
+ {"page-break-inside", 97},
+ {"",}, {"",},
+ {"float", 54},
+ {"widows", 132},
+ {"table-layout", 115},
+ {"counter-reset", 43},
+ {"elevation", 51},
+ {"right", 107},
+ {"cursor", 47},
+ {"",}, {"",}, {"",}, {"",}, {"",},
+ {"margin-right", 74},
+ {"",}, {"",}, {"",},
+ {"background-y-position", 8},
+ {"",},
+ {"cue", 44},
+ {"",}, {"",}, {"",}, {"",}, {"",},
+ {"border-bottom-width", 14},
+ {"",},
+ {"clip-bottom", 36},
+ {"",},
+ {"clip-top", 39},
+ {"",},
+ {"clip-right", 38},
+ {"speech-rate", 113},
{"",}, {"",}, {"",}, {"",},
- {"white-space", 76},
+ {"margin", 71},
+ {"",}, {"",}, {"",},
+ {"cue-before", 46},
+ {"",},
+ {"cursor-image", 48},
+ {"text-shadow-y", 122},
+ {"",},
+ {"list-style", 67},
+ {"",}, {"",},
+ {"outline-style", 86},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"border-top-width", 30},
+ {"",}, {"",}, {"",},
+ {"min-height", 80},
+ {"",}, {"",},
+ {"border-right-width", 24},
+ {"letter-spacing", 65},
+ {"",},
+ {"text-indent", 118},
+ {"",}, {"",}, {"",}, {"",}, {"",},
+ {"speak-punctuation", 112},
+ {"",}, {"",}, {"",}, {"",},
+ {"content", 41},
+ {"position", 104},
+ {"",}, {"",},
+ {"pitch-range", 102},
+ {"",}, {"",}, {"",}, {"",}, {"",},
+ {"display", 50},
+ {"",},
+ {"clip-left", 37},
+ {"list-style-type", 70},
+ {"filter", 53},
+ {"",}, {"",}, {"",}, {"",}, {"",},
+ {"voice-family", 129},
+ {"",}, {"",}, {"",}, {"",},
+ {"azimuth", 0},
+ {"",}, {"",}, {"",},
+ {"height", 63},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",},
+ {"border-left-width", 20},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"direction", 49},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"cue-after", 45},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"font-family", 56},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"list-style-position", 69},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",},
+ {"white-space", 131},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",},
+ {"padding-right", 92},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"pitch", 101},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"width", 133},
+ {"",}, {"",}, {"",}, {"",}, {"",},
+ {"list-style-image", 68},
+ {"",}, {"",},
+ {"max-width", 79},
+ {"",}, {"",}, {"",},
+ {"outline-width", 87},
+ {"vertical-align", 127},
+ {"",}, {"",},
+ {"border-width", 31},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"visibility", 128},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"line-height", 66},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",},
+ {"unicode-bidi", 126},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"font-stretch", 59},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"min-width", 81},
};
if (str != NULL) {
@@ -283,87 +431,140 @@ PRInt32 nsCSSProps::LookupName(const char* str)
}
const nsCSSProps::NameTableEntry nsCSSProps::kNameTable[] = {
- { "background", 0 },
- { "background-attachment", 1 },
- { "background-color", 2 },
- { "background-filter", 3 },
- { "background-image", 4 },
- { "background-position", 5 },
- { "background-x-position", 6 },
- { "background-y-position", 7 },
- { "background-repeat", 8 },
- { "border", 9 },
- { "border-bottom", 10 },
- { "border-bottom-color", 11 },
- { "border-bottom-style", 12 },
- { "border-bottom-width", 13 },
- { "border-color", 14 },
- { "border-left", 15 },
- { "border-left-color", 16 },
- { "border-left-style", 17 },
- { "border-left-width", 18 },
- { "border-right", 19 },
- { "border-right-color", 20 },
- { "border-right-style", 21 },
- { "border-right-width", 22 },
- { "border-style", 23 },
- { "border-top", 24 },
- { "border-top-color", 25 },
- { "border-top-style", 26 },
- { "border-top-width", 27 },
- { "border-width", 28 },
- { "clear", 29 },
- { "clip", 30 },
- { "clip-bottom", 31 },
- { "clip-left", 32 },
- { "clip-right", 33 },
- { "clip-top", 34 },
- { "color", 35 },
- { "cursor", 36 },
- { "cursor-image", 37 },
- { "direction", 38 },
- { "display", 39 },
- { "filter", 40 },
- { "float", 41 },
- { "font", 42 },
- { "font-family", 43 },
- { "font-size", 44 },
- { "font-style", 45 },
- { "font-variant", 46 },
- { "font-weight", 47 },
- { "height", 48 },
- { "left", 49 },
- { "letter-spacing", 50 },
- { "line-height", 51 },
- { "list-style", 52 },
- { "list-style-image", 53 },
- { "list-style-position", 54 },
- { "list-style-type", 55 },
- { "margin", 56 },
- { "margin-bottom", 57 },
- { "margin-left", 58 },
- { "margin-right", 59 },
- { "margin-top", 60 },
- { "opacity", 61 },
- { "overflow", 62 },
- { "padding", 63 },
- { "padding-bottom", 64 },
- { "padding-left", 65 },
- { "padding-right", 66 },
- { "padding-top", 67 },
- { "position", 68 },
- { "text-align", 69 },
- { "text-decoration", 70 },
- { "text-indent", 71 },
- { "text-transform", 72 },
- { "top", 73 },
- { "vertical-align", 74 },
- { "visibility", 75 },
- { "white-space", 76 },
- { "width", 77 },
- { "word-spacing", 78 },
- { "z-index", 79 },
+ { "azimuth", 0 },
+ { "background", 1 },
+ { "background-attachment", 2 },
+ { "background-color", 3 },
+ { "background-filter", 4 },
+ { "background-image", 5 },
+ { "background-position", 6 },
+ { "background-x-position", 7 },
+ { "background-y-position", 8 },
+ { "background-repeat", 9 },
+ { "border", 10 },
+ { "border-bottom", 11 },
+ { "border-bottom-color", 12 },
+ { "border-bottom-style", 13 },
+ { "border-bottom-width", 14 },
+ { "border-collapse", 15 },
+ { "border-color", 16 },
+ { "border-left", 17 },
+ { "border-left-color", 18 },
+ { "border-left-style", 19 },
+ { "border-left-width", 20 },
+ { "border-right", 21 },
+ { "border-right-color", 22 },
+ { "border-right-style", 23 },
+ { "border-right-width", 24 },
+ { "border-spacing", 25 },
+ { "border-style", 26 },
+ { "border-top", 27 },
+ { "border-top-color", 28 },
+ { "border-top-style", 29 },
+ { "border-top-width", 30 },
+ { "border-width", 31 },
+ { "bottom", 32 },
+ { "caption-side", 33 },
+ { "clear", 34 },
+ { "clip", 35 },
+ { "clip-bottom", 36 },
+ { "clip-left", 37 },
+ { "clip-right", 38 },
+ { "clip-top", 39 },
+ { "color", 40 },
+ { "content", 41 },
+ { "counter-increment", 42 },
+ { "counter-reset", 43 },
+ { "cue", 44 },
+ { "cue-after", 45 },
+ { "cue-before", 46 },
+ { "cursor", 47 },
+ { "cursor-image", 48 },
+ { "direction", 49 },
+ { "display", 50 },
+ { "elevation", 51 },
+ { "empty-cells", 52 },
+ { "filter", 53 },
+ { "float", 54 },
+ { "font", 55 },
+ { "font-family", 56 },
+ { "font-size", 57 },
+ { "font-size-adjust", 58 },
+ { "font-stretch", 59 },
+ { "font-style", 60 },
+ { "font-variant", 61 },
+ { "font-weight", 62 },
+ { "height", 63 },
+ { "left", 64 },
+ { "letter-spacing", 65 },
+ { "line-height", 66 },
+ { "list-style", 67 },
+ { "list-style-image", 68 },
+ { "list-style-position", 69 },
+ { "list-style-type", 70 },
+ { "margin", 71 },
+ { "margin-bottom", 72 },
+ { "margin-left", 73 },
+ { "margin-right", 74 },
+ { "margin-top", 75 },
+ { "marker-offset", 76 },
+ { "marks", 77 },
+ { "max-height", 78 },
+ { "max-width", 79 },
+ { "min-height", 80 },
+ { "min-width", 81 },
+ { "opacity", 82 },
+ { "orphans", 83 },
+ { "outline", 84 },
+ { "outline-color", 85 },
+ { "outline-style", 86 },
+ { "outline-width", 87 },
+ { "overflow", 88 },
+ { "padding", 89 },
+ { "padding-bottom", 90 },
+ { "padding-left", 91 },
+ { "padding-right", 92 },
+ { "padding-top", 93 },
+ { "page", 94 },
+ { "page-break-after", 95 },
+ { "page-break-before", 96 },
+ { "page-break-inside", 97 },
+ { "pause", 98 },
+ { "pause-after", 99 },
+ { "pause-before", 100 },
+ { "pitch", 101 },
+ { "pitch-range", 102 },
+ { "play-during", 103 },
+ { "position", 104 },
+ { "quotes", 105 },
+ { "richness", 106 },
+ { "right", 107 },
+ { "size", 108 },
+ { "speak", 109 },
+ { "speak-header", 110 },
+ { "speak-numeral", 111 },
+ { "speak-punctuation", 112 },
+ { "speech-rate", 113 },
+ { "stress", 114 },
+ { "table-layout", 115 },
+ { "text-align", 116 },
+ { "text-decoration", 117 },
+ { "text-indent", 118 },
+ { "text-shadow", 119 },
+ { "text-shadow-color", 120 },
+ { "text-shadow-x", 121 },
+ { "text-shadow-y", 122 },
+ { "text-shadow-radius", 123 },
+ { "text-transform", 124 },
+ { "top", 125 },
+ { "unicode-bidi", 126 },
+ { "vertical-align", 127 },
+ { "visibility", 128 },
+ { "voice-family", 129 },
+ { "volume", 130 },
+ { "white-space", 131 },
+ { "widows", 132 },
+ { "width", 133 },
+ { "word-spacing", 134 },
+ { "z-index", 135 },
};
-
-
-
diff --git a/mozilla/layout/html/style/src/nsICSSDeclaration.h b/mozilla/layout/html/style/src/nsICSSDeclaration.h
index 238ec267f5c..d7c01894d96 100644
--- a/mozilla/layout/html/style/src/nsICSSDeclaration.h
+++ b/mozilla/layout/html/style/src/nsICSSDeclaration.h
@@ -24,155 +24,13 @@
#include "stdio.h"
#include "nsString.h"
#include "nsCoord.h"
+#include "nsCSSValue.h"
-enum nsCSSUnit {
- eCSSUnit_Null = 0, // (n/a) null unit, value is not specified
- eCSSUnit_Auto = 1, // (n/a) value is algorithmic
- eCSSUnit_Inherit = 2, // (n/a) value is inherited
- eCSSUnit_None = 3, // (n/a) value is none
- eCSSUnit_Normal = 4, // (n/a) value is normal (algorithmic, different than auto)
- eCSSUnit_String = 10, // (nsString) a string value
- eCSSUnit_Integer = 50, // (int) simple value
- eCSSUnit_Enumerated = 51, // (int) value has enumerated meaning
- eCSSUnit_Color = 80, // (color) an RGBA value
- eCSSUnit_Percent = 90, // (float) 1.0 == 100%) value is percentage of something
- eCSSUnit_Number = 91, // (float) value is numeric (usually multiplier, different behavior that percent)
-
- // US English
- eCSSUnit_Inch = 100, // (float) Standard length
- eCSSUnit_Foot = 101, // (float) 12 inches
- eCSSUnit_Mile = 102, // (float) 5280 feet
-
- // Metric
- eCSSUnit_Millimeter = 207, // (float) 1/1000 meter
- eCSSUnit_Centimeter = 208, // (float) 1/100 meter
- eCSSUnit_Meter = 210, // (float) Standard length
- eCSSUnit_Kilometer = 213, // (float) 1000 meters
-
- // US Typographic
- eCSSUnit_Point = 300, // (float) 1/72 inch
- eCSSUnit_Pica = 301, // (float) 12 points == 1/6 inch
-
- // European Typographic
- eCSSUnit_Didot = 400, // (float) 15 didots == 16 points
- eCSSUnit_Cicero = 401, // (float) 12 didots
-
- // relative units
- // Font relative measure
- eCSSUnit_EM = 800, // (float) == current font size
- eCSSUnit_EN = 801, // (float) .5 em
- eCSSUnit_XHeight = 802, // (float) distance from top of lower case x to baseline
- eCSSUnit_CapHeight = 803, // (float) distance from top of uppercase case H to baseline
-
- // Screen relative measure
- eCSSUnit_Pixel = 900 // (float)
-};
-
struct nsCSSStruct {
virtual const nsID& GetID(void) = 0;
};
-class nsCSSValue {
-public:
- nsCSSValue(nsCSSUnit aUnit = eCSSUnit_Null); // for valueless units only (null, auto, inherit, none, normal)
- nsCSSValue(PRInt32 aValue, nsCSSUnit aUnit);
- nsCSSValue(float aValue, nsCSSUnit aUnit);
- nsCSSValue(const nsString& aValue);
- nsCSSValue(nscolor aValue);
- nsCSSValue(const nsCSSValue& aCopy);
- ~nsCSSValue(void);
-
- nsCSSValue& operator=(const nsCSSValue& aCopy);
- PRBool operator==(const nsCSSValue& aOther) const;
-
- nsCSSUnit GetUnit(void) const { return mUnit; };
- PRBool IsLengthUnit(void) const
- { return PRBool(eCSSUnit_Inch <= mUnit); }
- PRBool IsFixedLengthUnit(void) const
- { return PRBool((eCSSUnit_Inch <= mUnit) && (mUnit < eCSSUnit_EM)); }
- PRBool IsRelativeLengthUnit(void) const
- { return PRBool(eCSSUnit_EM <= mUnit); }
-
- PRInt32 GetIntValue(void) const;
- float GetPercentValue(void) const;
- float GetFloatValue(void) const;
- nsString& GetStringValue(nsString& aBuffer) const;
- nscolor GetColorValue(void) const;
- nscoord GetLengthTwips(void) const;
-
- void Reset(void); // sets to null
- void SetIntValue(PRInt32 aValue, nsCSSUnit aUnit);
- void SetPercentValue(float aValue);
- void SetFloatValue(float aValue, nsCSSUnit aUnit);
- void SetStringValue(const nsString& aValue);
- void SetColorValue(nscolor aValue);
- void SetAutoValue(void);
- void SetInheritValue(void);
- void SetNoneValue(void);
- void SetNormalValue(void);
-
- // debugging methods only
- void AppendToString(nsString& aBuffer, PRInt32 aPropID = -1) const;
- void ToString(nsString& aBuffer, PRInt32 aPropID = -1) const;
-
-protected:
- nsCSSUnit mUnit;
- union {
- PRInt32 mInt;
- float mFloat;
- nsString* mString;
- nscolor mColor;
- } mValue;
-};
-
-inline PRInt32 nsCSSValue::GetIntValue(void) const
-{
- NS_ASSERTION((mUnit == eCSSUnit_Integer) ||
- (mUnit == eCSSUnit_Enumerated), "not an int value");
- if ((mUnit == eCSSUnit_Integer) ||
- (mUnit == eCSSUnit_Enumerated)) {
- return mValue.mInt;
- }
- return 0;
-}
-
-inline float nsCSSValue::GetPercentValue(void) const
-{
- NS_ASSERTION((mUnit == eCSSUnit_Percent), "not a percent value");
- if ((mUnit == eCSSUnit_Percent)) {
- return mValue.mFloat;
- }
- return 0.0f;
-}
-
-inline float nsCSSValue::GetFloatValue(void) const
-{
- NS_ASSERTION((mUnit >= eCSSUnit_Number), "not a float value");
- if ((mUnit >= eCSSUnit_Number)) {
- return mValue.mFloat;
- }
- return 0.0f;
-}
-
-inline nsString& nsCSSValue::GetStringValue(nsString& aBuffer) const
-{
- NS_ASSERTION((mUnit == eCSSUnit_String), "not a string value");
- aBuffer.Truncate();
- if ((mUnit == eCSSUnit_String) && (nsnull != mValue.mString)) {
- aBuffer.Append(*(mValue.mString));
- }
- return aBuffer;
-}
-
-inline nscolor nsCSSValue::GetColorValue(void) const
-{
- NS_ASSERTION((mUnit == eCSSUnit_Color), "not a color value");
- if (mUnit == eCSSUnit_Color) {
- return mValue.mColor;
- }
- return NS_RGB(0,0,0);
-}
// SID for the nsCSSFont struct {f645dbf8-b48a-11d1-9ca5-0060088f9ff7}
#define NS_CSS_FONT_SID \
@@ -202,10 +60,33 @@ inline nscolor nsCSSValue::GetColorValue(void) const
#define NS_CSS_LIST_SID \
{0x603f8266, 0xb48b, 0x11d1, {0x9c, 0xa5, 0x00, 0x60, 0x08, 0x8f, 0x9f, 0xf7}}
+// SID for the nsCSSTable struct {16aa4b30-5a3b-11d2-803b-006008159b5a}
+#define NS_CSS_TABLE_SID \
+{0x16aa4b30, 0x5a3b, 0x11d2, {0x80, 0x3b, 0x00, 0x60, 0x08, 0x15, 0x9b, 0x5a}}
+
+// SID for the nsCSSBreaks struct {15124c20-5a3b-11d2-803b-006008159b5a}
+#define NS_CSS_BREAKS_SID \
+{0x15124c20, 0x5a3b, 0x11d2, {0x80, 0x3b, 0x00, 0x60, 0x08, 0x15, 0x9b, 0x5a}}
+
+// SID for the nsCSSPage struct {15dd8810-5a3b-11d2-803b-006008159b5a}
+#define NS_CSS_PAGE_SID \
+{0x15dd8810, 0x5a3b, 0x11d2, {0x80, 0x3b, 0x00, 0x60, 0x08, 0x15, 0x9b, 0x5a}}
+
+// SID for the nsCSSContent struct {1629ef70-5a3b-11d2-803b-006008159b5a}
+#define NS_CSS_CONTENT_SID \
+{0x1629ef70, 0x5a3b, 0x11d2, {0x80, 0x3b, 0x00, 0x60, 0x08, 0x15, 0x9b, 0x5a}}
+
+// SID for the nsCSSAural struct {166d2bb0-5a3b-11d2-803b-006008159b5a}
+#define NS_CSS_AURAL_SID \
+{0x166d2bb0, 0x5a3b, 0x11d2, {0x80, 0x3b, 0x00, 0x60, 0x08, 0x15, 0x9b, 0x5a}}
+
+
// IID for the nsICSSDeclaration interface {7b36b9ac-b48d-11d1-9ca5-0060088f9ff7}
#define NS_ICSS_DECLARATION_IID \
{0x7b36b9ac, 0xb48d, 0x11d1, {0x9c, 0xa5, 0x00, 0x60, 0x08, 0x8f, 0x9f, 0xf7}}
+
+
struct nsCSSFont : public nsCSSStruct {
const nsID& GetID(void);
void List(FILE* out = stdout, PRInt32 aIndent = 0) const;
@@ -215,6 +96,8 @@ struct nsCSSFont : public nsCSSStruct {
nsCSSValue mVariant;
nsCSSValue mWeight;
nsCSSValue mSize;
+ nsCSSValue mSizeAdjust; // NEW
+ nsCSSValue mStretch; // NEW
};
struct nsCSSColor : public nsCSSStruct {
@@ -234,7 +117,20 @@ struct nsCSSColor : public nsCSSStruct {
nsCSSValue mOpacity;
};
+struct nsCSSShadow {
+ nsCSSShadow(void);
+ ~nsCSSShadow(void);
+
+ nsCSSValue mColor;
+ nsCSSValue mXOffset;
+ nsCSSValue mYOffset;
+ nsCSSValue mRadius;
+ nsCSSShadow* mNext;
+};
+
struct nsCSSText : public nsCSSStruct {
+ nsCSSText(void);
+ ~nsCSSText(void);
const nsID& GetID(void);
void List(FILE* out = stdout, PRInt32 aIndent = 0) const;
@@ -245,6 +141,8 @@ struct nsCSSText : public nsCSSStruct {
nsCSSValue mTextTransform;
nsCSSValue mTextAlign;
nsCSSValue mTextIndent;
+ nsCSSShadow* mTextShadow; // NEW
+ nsCSSValue mUnicodeBidi; // NEW
nsCSSValue mLineHeight;
nsCSSValue mWhiteSpace;
};
@@ -283,20 +181,28 @@ struct nsCSSMargin : public nsCSSStruct {
nsCSSRect* mMargin;
nsCSSRect* mPadding;
- nsCSSRect* mBorder;
- nsCSSRect* mColor;
- nsCSSRect* mStyle;
+ nsCSSRect* mBorderWidth; // CHANGED
+ nsCSSRect* mBorderColor; // CHANGED
+ nsCSSRect* mBorderStyle; // CHANGED
+ nsCSSValue mOutlineWidth; // NEW
+ nsCSSValue mOutlineColor; // NEW
+ nsCSSValue mOutlineStyle; // NEW
};
struct nsCSSPosition : public nsCSSStruct {
+ nsCSSPosition(void);
+ ~nsCSSPosition(void);
const nsID& GetID(void);
void List(FILE* out = stdout, PRInt32 aIndent = 0) const;
nsCSSValue mPosition;
nsCSSValue mWidth;
+ nsCSSValue mMinWidth; // NEW
+ nsCSSValue mMaxWidth; // NEW
nsCSSValue mHeight;
- nsCSSValue mLeft;
- nsCSSValue mTop;
+ nsCSSValue mMinHeight; // NEW
+ nsCSSValue mMaxHeight; // NEW
+ nsCSSRect* mOffset; // NEW
nsCSSValue mZIndex;
};
@@ -309,6 +215,71 @@ struct nsCSSList : public nsCSSStruct {
nsCSSValue mPosition;
};
+struct nsCSSTable : public nsCSSStruct { // NEW
+ const nsID& GetID(void);
+ void List(FILE* out = stdout, PRInt32 aIndent = 0) const;
+
+ nsCSSValue mBorderCollapse;
+ nsCSSValue mBorderSpacing;
+ nsCSSValue mCaptionSide;
+ nsCSSValue mEmptyCells;
+ nsCSSValue mLayout;
+};
+
+struct nsCSSBreaks : public nsCSSStruct { // NEW
+ const nsID& GetID(void);
+ void List(FILE* out = stdout, PRInt32 aIndent = 0) const;
+
+ nsCSSValue mOrphans;
+ nsCSSValue mWidows;
+ nsCSSValue mPage;
+ nsCSSValue mPageBreakAfter;
+ nsCSSValue mPageBreakBefore;
+ nsCSSValue mPageBreakInside;
+};
+
+struct nsCSSPage : public nsCSSStruct { // NEW
+ const nsID& GetID(void);
+ void List(FILE* out = stdout, PRInt32 aIndent = 0) const;
+
+ nsCSSValue mMarks;
+ nsCSSValue mSize;
+};
+
+struct nsCSSContent : public nsCSSStruct { // NEW
+ const nsID& GetID(void);
+ void List(FILE* out = stdout, PRInt32 aIndent = 0) const;
+
+ nsCSSValue mContent;
+ nsCSSValue mCounterIncrement;
+ nsCSSValue mCounterReset;
+ nsCSSValue mMarkerOffset;
+ nsCSSValue mQuotes;
+};
+
+struct nsCSSAural : public nsCSSStruct { // NEW
+ const nsID& GetID(void);
+ void List(FILE* out = stdout, PRInt32 aIndent = 0) const;
+
+ nsCSSValue mAzimuth;
+ nsCSSValue mElevation;
+ nsCSSValue mCueAfter;
+ nsCSSValue mCueBefore;
+ nsCSSValue mPauseAfter;
+ nsCSSValue mPauseBefore;
+ nsCSSValue mPitch;
+ nsCSSValue mPitchRange;
+ nsCSSValue mPlayDuring;
+ nsCSSValue mRichness;
+ nsCSSValue mSpeak;
+ nsCSSValue mSpeakHeader;
+ nsCSSValue mSpeakNumeral;
+ nsCSSValue mSpeakPunctuation;
+ nsCSSValue mSpeechRate;
+ nsCSSValue mStress;
+ nsCSSValue mVoiceFamily;
+ nsCSSValue mVolume;
+};
class nsICSSDeclaration : public nsISupports {
public:
diff --git a/mozilla/layout/style/nsCSSProps.cpp b/mozilla/layout/style/nsCSSProps.cpp
index 509329f5634..260c61eab6d 100644
--- a/mozilla/layout/style/nsCSSProps.cpp
+++ b/mozilla/layout/style/nsCSSProps.cpp
@@ -6,13 +6,12 @@
#include "plstr.h"
#include "nsCSSProps.h"
-
-#define TOTAL_KEYWORDS 80
+#define TOTAL_KEYWORDS 136
#define MIN_WORD_LENGTH 3
#define MAX_WORD_LENGTH 21
-#define MIN_HASH_VALUE 6
-#define MAX_HASH_VALUE 261
-/* maximum key range = 256, duplicates = 0 */
+#define MIN_HASH_VALUE 5
+#define MAX_HASH_VALUE 659
+/* maximum key range = 655, duplicates = 0 */
struct StaticNameTable {
@@ -51,178 +50,327 @@ PRInt32 nsCSSProps::LookupName(const char* str)
{
static unsigned short asso_values[] =
{
- 262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
- 262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
- 262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
- 262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
- 262, 262, 262, 262, 262, 65, 262, 262, 262, 262,
- 262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
- 262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
- 262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
- 262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
- 262, 262, 262, 262, 262, 262, 262, 45, 0, 85,
- 100, 25, 5, 0, 80, 0, 262, 262, 25, 90,
- 0, 0, 5, 262, 0, 65, 40, 20, 0, 80,
- 10, 25, 5, 262, 262, 262, 262, 262,
+ 660, 660, 660, 660, 660, 660, 660, 660, 660, 660,
+ 660, 660, 660, 660, 660, 660, 660, 660, 660, 660,
+ 660, 660, 660, 660, 660, 660, 660, 660, 660, 660,
+ 660, 660, 660, 660, 660, 660, 660, 660, 660, 660,
+ 660, 660, 660, 660, 660, 95, 660, 660, 660, 660,
+ 660, 660, 660, 660, 660, 660, 660, 660, 660, 660,
+ 660, 660, 660, 660, 660, 660, 660, 660, 660, 660,
+ 660, 660, 660, 660, 660, 660, 660, 660, 660, 660,
+ 660, 660, 660, 660, 660, 660, 660, 660, 660, 660,
+ 660, 660, 660, 660, 660, 660, 660, 5, 0, 150,
+ 5, 15, 125, 15, 235, 190, 660, 0, 60, 35,
+ 110, 0, 0, 10, 0, 0, 40, 80, 0, 35,
+ 15, 110, 45, 660, 660, 660, 660, 660,
};
static unsigned char lengthtable[] =
{
- 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 6, 12, 8,
- 0, 10, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0,
- 0, 0, 19, 0, 11, 0, 3, 4, 0, 11, 0, 0, 0, 0,
- 0, 7, 18, 0, 0, 0, 12, 0, 14, 0, 11, 17, 0, 19,
- 0, 0, 0, 0, 0, 5, 21, 7, 0, 0, 0, 0, 17, 18,
- 0, 0, 16, 0, 0, 0, 5, 21, 12, 0, 4, 0, 0, 12,
- 0, 19, 0, 16, 17, 13, 9, 10, 16, 17, 0, 0, 0, 6,
- 7, 8, 19, 5, 11, 0, 0, 4, 10, 0, 0, 0, 14, 10,
- 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 11, 0, 18, 0,
- 0, 6, 12, 0, 0, 0, 16, 0, 0, 9, 10, 21, 0, 0,
- 0, 10, 11, 12, 0, 0, 10, 0, 17, 8, 0, 5, 0, 12,
- 0, 0, 15, 0, 12, 0, 0, 0, 16, 7, 0, 0, 0, 0,
- 0, 13, 9, 0, 11, 0, 0, 0, 0, 6, 0, 0, 14, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14,
- 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 15, 0, 0, 0,
- 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 11,
+ 0, 0, 0, 0, 0, 5, 6, 0, 0, 0, 10, 0, 12, 0,
+ 0, 0, 0, 0, 0, 19, 10, 0, 0, 0, 4, 5, 16, 0,
+ 0, 0, 0, 16, 0, 0, 19, 15, 6, 17, 0, 0, 0, 0,
+ 12, 3, 0, 5, 6, 0, 13, 0, 0, 11, 0, 0, 0, 0,
+ 0, 0, 18, 0, 0, 0, 17, 0, 0, 0, 0, 0, 0, 0,
+ 0, 21, 0, 18, 0, 0, 6, 12, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 11, 12, 0, 0, 0, 6, 0,
+ 0, 0, 0, 11, 0, 8, 0, 10, 0, 12, 13, 0, 0, 11,
+ 17, 0, 0, 0, 0, 7, 0, 4, 0, 0, 0, 0, 0, 0,
+ 11, 17, 0, 0, 0, 0, 0, 0, 19, 0, 0, 7, 0, 0,
+ 0, 0, 12, 0, 14, 0, 0, 17, 0, 9, 10, 21, 0, 0,
+ 0, 5, 11, 7, 0, 0, 10, 0, 0, 0, 0, 0, 16, 17,
+ 18, 4, 0, 16, 0, 13, 0, 0, 0, 7, 13, 0, 10, 0,
+ 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 12, 13, 0, 0, 11, 0, 13, 14, 0, 0, 12, 0, 4,
+ 0, 11, 7, 8, 4, 5, 0, 12, 0, 14, 0, 0, 17, 0,
+ 0, 15, 16, 17, 0, 0, 5, 6, 12, 13, 9, 5, 6, 0,
+ 0, 0, 0, 0, 12, 0, 0, 0, 21, 0, 3, 0, 0, 0,
+ 0, 0, 19, 0, 11, 0, 8, 0, 10, 11, 0, 0, 0, 0,
+ 6, 0, 0, 0, 10, 0, 12, 13, 0, 10, 0, 0, 13, 0,
+ 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 10, 0, 0, 18,
+ 14, 0, 11, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 7,
+ 8, 0, 0, 11, 0, 0, 0, 0, 0, 7, 0, 9, 15, 6,
+ 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 7, 0, 0, 0,
+ 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0,
+ 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 9, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0,
+ 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 5, 0, 0, 0, 0, 0, 16, 0, 0, 9, 0,
+ 0, 0, 13, 14, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 9,
};
static struct StaticNameTable wordlist[] =
{
- {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
- {"border", 9},
- {"",}, {"",}, {"",}, {"",},
- {"filter", 40},
- {"border-color", 14},
- {"position", 68},
- {"",},
- {"border-top", 24},
+ {"",}, {"",}, {"",}, {"",}, {"",},
+ {"speak", 109},
+ {"border", 10},
{"",}, {"",}, {"",},
- {"border-bottom-color", 11},
- {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"border-top", 27},
+ {"",},
+ {"border-color", 16},
{"",}, {"",}, {"",}, {"",}, {"",}, {"",},
- {"visibility", 75},
+ {"border-bottom-color", 12},
+ {"background", 1},
+ {"",}, {"",}, {"",},
+ {"page", 94},
+ {"pause", 98},
+ {"page-break-after", 95},
+ {"",}, {"",}, {"",}, {"",},
+ {"border-top-style", 29},
+ {"",}, {"",},
+ {"border-bottom-style", 13},
+ {"border-collapse", 15},
+ {"volume", 130},
+ {"page-break-before", 96},
+ {"",}, {"",}, {"",}, {"",},
+ {"border-style", 26},
+ {"top", 125},
+ {"",},
+ {"marks", 77},
+ {"stress", 114},
+ {"",},
+ {"border-bottom", 11},
+ {"",}, {"",},
+ {"border-left", 17},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"border-right-color", 22},
+ {"",}, {"",}, {"",},
+ {"background-repeat", 9},
{"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
- {"border-bottom-style", 12},
+ {"background-attachment", 2},
{"",},
- {"font-family", 43},
- {"",},
- {"top", 73},
- {"font", 42},
- {"",},
- {"border-left", 15},
- {"",}, {"",}, {"",}, {"",}, {"",},
- {"padding", 63},
- {"border-right-color", 20},
- {"",}, {"",}, {"",},
- {"border-style", 23},
- {"",},
- {"letter-spacing", 50},
- {"",},
- {"padding-top", 67},
- {"background-filter", 3},
- {"",},
- {"background-position", 5},
- {"",}, {"",}, {"",}, {"",}, {"",},
- {"float", 41},
- {"background-x-position", 6},
- {"opacity", 61},
- {"",}, {"",}, {"",}, {"",},
- {"border-left-color", 16},
- {"border-right-style", 21},
+ {"border-right-style", 23},
{"",}, {"",},
- {"background-image", 4},
- {"",}, {"",}, {"",},
- {"color", 35},
- {"background-y-position", 7},
- {"border-right", 19},
- {"",},
- {"left", 49},
- {"",}, {"",},
- {"font-variant", 46},
- {"",},
- {"border-bottom-width", 13},
- {"",},
- {"border-top-color", 25},
- {"background-repeat", 8},
- {"border-bottom", 10},
- {"font-size", 44},
- {"font-style", 45},
- {"border-top-style", 26},
- {"border-left-style", 17},
- {"",}, {"",}, {"",},
- {"cursor", 36},
- {"z-index", 79},
- {"overflow", 62},
- {"list-style-position", 54},
- {"clear", 29},
- {"text-indent", 71},
- {"",}, {"",},
- {"clip", 30},
- {"text-align", 69},
- {"",}, {"",}, {"",},
- {"vertical-align", 74},
- {"list-style", 52},
- {"",}, {"",}, {"",}, {"",}, {"",},
- {"list-style-image", 53},
- {"",}, {"",}, {"",}, {"",},
- {"font-weight", 47},
- {"",},
- {"border-right-width", 22},
- {"",}, {"",},
- {"margin", 56},
- {"padding-left", 65},
- {"",}, {"",}, {"",},
- {"background-color", 2},
- {"",}, {"",},
- {"direction", 38},
- {"margin-top", 60},
- {"background-attachment", 1},
- {"",}, {"",}, {"",},
- {"background", 0},
- {"line-height", 51},
- {"word-spacing", 78},
- {"",}, {"",},
- {"clip-right", 33},
- {"",},
- {"border-left-width", 18},
- {"clip-top", 34},
- {"",},
- {"width", 77},
- {"",},
- {"cursor-image", 37},
- {"",}, {"",},
- {"list-style-type", 55},
- {"",},
- {"border-width", 28},
- {"",}, {"",}, {"",},
- {"border-top-width", 27},
- {"display", 39},
- {"",}, {"",}, {"",}, {"",}, {"",},
- {"padding-right", 66},
- {"clip-left", 32},
- {"",},
- {"margin-left", 58},
- {"",}, {"",}, {"",}, {"",},
- {"height", 48},
- {"",}, {"",},
- {"padding-bottom", 64},
+ {"bottom", 32},
+ {"word-spacing", 134},
{"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
- {"",}, {"",}, {"",}, {"",}, {"",},
- {"text-transform", 72},
+ {"",}, {"",}, {"",}, {"",},
+ {"play-during", 103},
+ {"border-right", 21},
+ {"",}, {"",}, {"",},
+ {"quotes", 105},
+ {"",}, {"",}, {"",}, {"",},
+ {"text-shadow", 119},
{"",},
- {"clip-bottom", 31},
- {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
- {"text-decoration", 70},
+ {"overflow", 88},
+ {"",},
+ {"max-height", 78},
+ {"",},
+ {"speak-header", 110},
+ {"marker-offset", 76},
+ {"",}, {"",},
+ {"pause-after", 99},
+ {"border-left-color", 18},
+ {"",}, {"",}, {"",}, {"",},
+ {"orphans", 83},
+ {"",},
+ {"left", 64},
{"",}, {"",}, {"",}, {"",}, {"",}, {"",},
- {"margin-right", 59},
+ {"padding-top", 93},
+ {"border-left-style", 19},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"background-position", 6},
+ {"",}, {"",},
+ {"padding", 89},
+ {"",}, {"",}, {"",}, {"",},
+ {"pause-before", 100},
+ {"",},
+ {"text-transform", 124},
+ {"",}, {"",},
+ {"background-filter", 4},
+ {"",},
+ {"font-size", 57},
+ {"font-style", 60},
+ {"background-x-position", 7},
+ {"",}, {"",}, {"",},
+ {"color", 40},
+ {"empty-cells", 52},
+ {"opacity", 82},
+ {"",}, {"",},
+ {"margin-top", 75},
+ {"",}, {"",}, {"",}, {"",}, {"",},
+ {"border-top-color", 28},
+ {"text-shadow-color", 120},
+ {"text-shadow-radius", 123},
+ {"font", 55},
+ {"",},
+ {"background-color", 3},
+ {"",},
+ {"speak-numeral", 111},
+ {"",}, {"",}, {"",},
+ {"z-index", 135},
+ {"text-shadow-x", 121},
+ {"",},
+ {"text-align", 116},
+ {"",}, {"",}, {"",}, {"",}, {"",},
+ {"font-size-adjust", 58},
{"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
{"",},
- {"margin-bottom", 57},
- {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
- {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"caption-side", 33},
+ {"margin-bottom", 72},
+ {"",}, {"",},
+ {"margin-left", 73},
+ {"",},
+ {"outline-color", 85},
+ {"padding-bottom", 90},
+ {"",}, {"",},
+ {"padding-left", 91},
+ {"",},
+ {"size", 108},
+ {"",},
+ {"font-weight", 62},
+ {"outline", 84},
+ {"richness", 106},
+ {"clip", 35},
+ {"clear", 34},
+ {"",},
+ {"font-variant", 61},
+ {"",},
+ {"border-spacing", 25},
+ {"",}, {"",},
+ {"counter-increment", 42},
+ {"",}, {"",},
+ {"text-decoration", 117},
+ {"background-image", 5},
+ {"page-break-inside", 97},
+ {"",}, {"",},
+ {"float", 54},
+ {"widows", 132},
+ {"table-layout", 115},
+ {"counter-reset", 43},
+ {"elevation", 51},
+ {"right", 107},
+ {"cursor", 47},
+ {"",}, {"",}, {"",}, {"",}, {"",},
+ {"margin-right", 74},
+ {"",}, {"",}, {"",},
+ {"background-y-position", 8},
+ {"",},
+ {"cue", 44},
+ {"",}, {"",}, {"",}, {"",}, {"",},
+ {"border-bottom-width", 14},
+ {"",},
+ {"clip-bottom", 36},
+ {"",},
+ {"clip-top", 39},
+ {"",},
+ {"clip-right", 38},
+ {"speech-rate", 113},
{"",}, {"",}, {"",}, {"",},
- {"white-space", 76},
+ {"margin", 71},
+ {"",}, {"",}, {"",},
+ {"cue-before", 46},
+ {"",},
+ {"cursor-image", 48},
+ {"text-shadow-y", 122},
+ {"",},
+ {"list-style", 67},
+ {"",}, {"",},
+ {"outline-style", 86},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"border-top-width", 30},
+ {"",}, {"",}, {"",},
+ {"min-height", 80},
+ {"",}, {"",},
+ {"border-right-width", 24},
+ {"letter-spacing", 65},
+ {"",},
+ {"text-indent", 118},
+ {"",}, {"",}, {"",}, {"",}, {"",},
+ {"speak-punctuation", 112},
+ {"",}, {"",}, {"",}, {"",},
+ {"content", 41},
+ {"position", 104},
+ {"",}, {"",},
+ {"pitch-range", 102},
+ {"",}, {"",}, {"",}, {"",}, {"",},
+ {"display", 50},
+ {"",},
+ {"clip-left", 37},
+ {"list-style-type", 70},
+ {"filter", 53},
+ {"",}, {"",}, {"",}, {"",}, {"",},
+ {"voice-family", 129},
+ {"",}, {"",}, {"",}, {"",},
+ {"azimuth", 0},
+ {"",}, {"",}, {"",},
+ {"height", 63},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",},
+ {"border-left-width", 20},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"direction", 49},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"cue-after", 45},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"font-family", 56},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"list-style-position", 69},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",},
+ {"white-space", 131},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",},
+ {"padding-right", 92},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"pitch", 101},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"width", 133},
+ {"",}, {"",}, {"",}, {"",}, {"",},
+ {"list-style-image", 68},
+ {"",}, {"",},
+ {"max-width", 79},
+ {"",}, {"",}, {"",},
+ {"outline-width", 87},
+ {"vertical-align", 127},
+ {"",}, {"",},
+ {"border-width", 31},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"visibility", 128},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"line-height", 66},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",},
+ {"unicode-bidi", 126},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"font-stretch", 59},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
+ {"min-width", 81},
};
if (str != NULL) {
@@ -283,87 +431,140 @@ PRInt32 nsCSSProps::LookupName(const char* str)
}
const nsCSSProps::NameTableEntry nsCSSProps::kNameTable[] = {
- { "background", 0 },
- { "background-attachment", 1 },
- { "background-color", 2 },
- { "background-filter", 3 },
- { "background-image", 4 },
- { "background-position", 5 },
- { "background-x-position", 6 },
- { "background-y-position", 7 },
- { "background-repeat", 8 },
- { "border", 9 },
- { "border-bottom", 10 },
- { "border-bottom-color", 11 },
- { "border-bottom-style", 12 },
- { "border-bottom-width", 13 },
- { "border-color", 14 },
- { "border-left", 15 },
- { "border-left-color", 16 },
- { "border-left-style", 17 },
- { "border-left-width", 18 },
- { "border-right", 19 },
- { "border-right-color", 20 },
- { "border-right-style", 21 },
- { "border-right-width", 22 },
- { "border-style", 23 },
- { "border-top", 24 },
- { "border-top-color", 25 },
- { "border-top-style", 26 },
- { "border-top-width", 27 },
- { "border-width", 28 },
- { "clear", 29 },
- { "clip", 30 },
- { "clip-bottom", 31 },
- { "clip-left", 32 },
- { "clip-right", 33 },
- { "clip-top", 34 },
- { "color", 35 },
- { "cursor", 36 },
- { "cursor-image", 37 },
- { "direction", 38 },
- { "display", 39 },
- { "filter", 40 },
- { "float", 41 },
- { "font", 42 },
- { "font-family", 43 },
- { "font-size", 44 },
- { "font-style", 45 },
- { "font-variant", 46 },
- { "font-weight", 47 },
- { "height", 48 },
- { "left", 49 },
- { "letter-spacing", 50 },
- { "line-height", 51 },
- { "list-style", 52 },
- { "list-style-image", 53 },
- { "list-style-position", 54 },
- { "list-style-type", 55 },
- { "margin", 56 },
- { "margin-bottom", 57 },
- { "margin-left", 58 },
- { "margin-right", 59 },
- { "margin-top", 60 },
- { "opacity", 61 },
- { "overflow", 62 },
- { "padding", 63 },
- { "padding-bottom", 64 },
- { "padding-left", 65 },
- { "padding-right", 66 },
- { "padding-top", 67 },
- { "position", 68 },
- { "text-align", 69 },
- { "text-decoration", 70 },
- { "text-indent", 71 },
- { "text-transform", 72 },
- { "top", 73 },
- { "vertical-align", 74 },
- { "visibility", 75 },
- { "white-space", 76 },
- { "width", 77 },
- { "word-spacing", 78 },
- { "z-index", 79 },
+ { "azimuth", 0 },
+ { "background", 1 },
+ { "background-attachment", 2 },
+ { "background-color", 3 },
+ { "background-filter", 4 },
+ { "background-image", 5 },
+ { "background-position", 6 },
+ { "background-x-position", 7 },
+ { "background-y-position", 8 },
+ { "background-repeat", 9 },
+ { "border", 10 },
+ { "border-bottom", 11 },
+ { "border-bottom-color", 12 },
+ { "border-bottom-style", 13 },
+ { "border-bottom-width", 14 },
+ { "border-collapse", 15 },
+ { "border-color", 16 },
+ { "border-left", 17 },
+ { "border-left-color", 18 },
+ { "border-left-style", 19 },
+ { "border-left-width", 20 },
+ { "border-right", 21 },
+ { "border-right-color", 22 },
+ { "border-right-style", 23 },
+ { "border-right-width", 24 },
+ { "border-spacing", 25 },
+ { "border-style", 26 },
+ { "border-top", 27 },
+ { "border-top-color", 28 },
+ { "border-top-style", 29 },
+ { "border-top-width", 30 },
+ { "border-width", 31 },
+ { "bottom", 32 },
+ { "caption-side", 33 },
+ { "clear", 34 },
+ { "clip", 35 },
+ { "clip-bottom", 36 },
+ { "clip-left", 37 },
+ { "clip-right", 38 },
+ { "clip-top", 39 },
+ { "color", 40 },
+ { "content", 41 },
+ { "counter-increment", 42 },
+ { "counter-reset", 43 },
+ { "cue", 44 },
+ { "cue-after", 45 },
+ { "cue-before", 46 },
+ { "cursor", 47 },
+ { "cursor-image", 48 },
+ { "direction", 49 },
+ { "display", 50 },
+ { "elevation", 51 },
+ { "empty-cells", 52 },
+ { "filter", 53 },
+ { "float", 54 },
+ { "font", 55 },
+ { "font-family", 56 },
+ { "font-size", 57 },
+ { "font-size-adjust", 58 },
+ { "font-stretch", 59 },
+ { "font-style", 60 },
+ { "font-variant", 61 },
+ { "font-weight", 62 },
+ { "height", 63 },
+ { "left", 64 },
+ { "letter-spacing", 65 },
+ { "line-height", 66 },
+ { "list-style", 67 },
+ { "list-style-image", 68 },
+ { "list-style-position", 69 },
+ { "list-style-type", 70 },
+ { "margin", 71 },
+ { "margin-bottom", 72 },
+ { "margin-left", 73 },
+ { "margin-right", 74 },
+ { "margin-top", 75 },
+ { "marker-offset", 76 },
+ { "marks", 77 },
+ { "max-height", 78 },
+ { "max-width", 79 },
+ { "min-height", 80 },
+ { "min-width", 81 },
+ { "opacity", 82 },
+ { "orphans", 83 },
+ { "outline", 84 },
+ { "outline-color", 85 },
+ { "outline-style", 86 },
+ { "outline-width", 87 },
+ { "overflow", 88 },
+ { "padding", 89 },
+ { "padding-bottom", 90 },
+ { "padding-left", 91 },
+ { "padding-right", 92 },
+ { "padding-top", 93 },
+ { "page", 94 },
+ { "page-break-after", 95 },
+ { "page-break-before", 96 },
+ { "page-break-inside", 97 },
+ { "pause", 98 },
+ { "pause-after", 99 },
+ { "pause-before", 100 },
+ { "pitch", 101 },
+ { "pitch-range", 102 },
+ { "play-during", 103 },
+ { "position", 104 },
+ { "quotes", 105 },
+ { "richness", 106 },
+ { "right", 107 },
+ { "size", 108 },
+ { "speak", 109 },
+ { "speak-header", 110 },
+ { "speak-numeral", 111 },
+ { "speak-punctuation", 112 },
+ { "speech-rate", 113 },
+ { "stress", 114 },
+ { "table-layout", 115 },
+ { "text-align", 116 },
+ { "text-decoration", 117 },
+ { "text-indent", 118 },
+ { "text-shadow", 119 },
+ { "text-shadow-color", 120 },
+ { "text-shadow-x", 121 },
+ { "text-shadow-y", 122 },
+ { "text-shadow-radius", 123 },
+ { "text-transform", 124 },
+ { "top", 125 },
+ { "unicode-bidi", 126 },
+ { "vertical-align", 127 },
+ { "visibility", 128 },
+ { "voice-family", 129 },
+ { "volume", 130 },
+ { "white-space", 131 },
+ { "widows", 132 },
+ { "width", 133 },
+ { "word-spacing", 134 },
+ { "z-index", 135 },
};
-
-
-
diff --git a/mozilla/layout/tools/CSSProps.txt b/mozilla/layout/tools/CSSProps.txt
index a15822976c2..1664407d4d0 100644
--- a/mozilla/layout/tools/CSSProps.txt
+++ b/mozilla/layout/tools/CSSProps.txt
@@ -1,3 +1,4 @@
+azimuth
background
background-attachment
background-color
@@ -12,6 +13,7 @@ border-bottom
border-bottom-color
border-bottom-style
border-bottom-width
+border-collapse
border-color
border-left
border-left-color
@@ -21,12 +23,15 @@ border-right
border-right-color
border-right-style
border-right-width
+border-spacing
border-style
border-top
border-top-color
border-top-style
border-top-width
border-width
+bottom
+caption-side
clear
clip
clip-bottom
@@ -34,15 +39,25 @@ clip-left
clip-right
clip-top
color
+content
+counter-increment
+counter-reset
+cue
+cue-after
+cue-before
cursor
cursor-image
direction
display
+elevation
+empty-cells
filter
float
font
font-family
font-size
+font-size-adjust
+font-stretch
font-style
font-variant
font-weight
@@ -59,22 +74,63 @@ margin-bottom
margin-left
margin-right
margin-top
+marker-offset
+marks
+max-height
+max-width
+min-height
+min-width
opacity
+orphans
+outline
+outline-color
+outline-style
+outline-width
overflow
padding
padding-bottom
padding-left
padding-right
padding-top
+page
+page-break-after
+page-break-before
+page-break-inside
+pause
+pause-after
+pause-before
+pitch
+pitch-range
+play-during
position
+quotes
+richness
+right
+size
+speak
+speak-header
+speak-numeral
+speak-punctuation
+speech-rate
+stress
+table-layout
text-align
text-decoration
text-indent
+text-shadow
+text-shadow-color
+text-shadow-radius
+text-shadow-x
+text-shadow-y
text-transform
top
+unicode-bidi
vertical-align
visibility
+voice-family
+volume
white-space
+widows
width
word-spacing
z-index