Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

added CSS2 property handling

Browse Source
This commit is contained in:
peterl%netscape.com 1998-10-26 23:22:40 +00:00
parent 1b135ae3ec
commit 9e59e54ad2
16 changed files with 7736 additions and 4643 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

813
content/html/style/src/nsCSSDeclaration.cpp
View File

File diff suppressed because it is too large Load Diff

2340
content/html/style/src/nsCSSParser.cpp
View File

File diff suppressed because it is too large Load Diff

310
content/html/style/src/nsCSSScanner.cpp
View File

@ -118,7 +118,7 @@ void nsCSSScanner::Close()
}
// Returns -1 on error or eof
PRInt32 nsCSSScanner::Read(PRInt32* aErrorCode)
PRInt32 nsCSSScanner::Read(PRInt32& aErrorCode)
{
PRInt32 rv;
if (0 < mPushbackCount) {
@ -129,8 +129,8 @@ PRInt32 nsCSSScanner::Read(PRInt32* aErrorCode)
}
if (mOffset == mCount) {
mOffset = 0;
*aErrorCode = mInput->Read(mBuffer, 0, BUFFER_SIZE, &mCount);
if (NS_FAILED(*aErrorCode)) {
aErrorCode = mInput->Read(mBuffer, 0, BUFFER_SIZE, &mCount);
if (NS_FAILED(aErrorCode)) {
mCount = 0;
return -1;
}
@ -142,13 +142,14 @@ PRInt32 nsCSSScanner::Read(PRInt32* aErrorCode)
return rv;
}
PRInt32 nsCSSScanner::Peek(PRInt32* aErrorCode)
PRInt32 nsCSSScanner::Peek(PRInt32& aErrorCode)
{
if (0 == mPushbackCount) {
mPushback[0] = Read(aErrorCode);
if (mPushback[0] < 0) {
PRInt32 ch = Read(aErrorCode);
if (ch < 0) {
return -1;
}
mPushback[0] = PRUnichar(ch);
mPushbackCount++;
}
//printf("Peek => %x\n", mLookAhead);
@ -179,7 +180,7 @@ void nsCSSScanner::Pushback(PRUnichar aChar)
mPushback[mPushbackCount++] = aChar;
}
PRBool nsCSSScanner::LookAhead(PRInt32* aErrorCode, PRUnichar aChar)
PRBool nsCSSScanner::LookAhead(PRInt32& aErrorCode, PRUnichar aChar)
{
PRInt32 ch = Read(aErrorCode);
if (ch < 0) {
@ -192,7 +193,7 @@ PRBool nsCSSScanner::LookAhead(PRInt32* aErrorCode, PRUnichar aChar)
return PR_FALSE;
}
PRBool nsCSSScanner::EatWhiteSpace(PRInt32* aErrorCode)
PRBool nsCSSScanner::EatWhiteSpace(PRInt32& aErrorCode)
{
PRBool eaten = PR_FALSE;
for (;;) {
@ -210,7 +211,7 @@ PRBool nsCSSScanner::EatWhiteSpace(PRInt32* aErrorCode)
return eaten;
}
PRBool nsCSSScanner::EatNewline(PRInt32* aErrorCode)
PRBool nsCSSScanner::EatNewline(PRInt32& aErrorCode)
{
PRInt32 ch = Read(aErrorCode);
if (ch < 0) {
@ -231,7 +232,7 @@ PRBool nsCSSScanner::EatNewline(PRInt32* aErrorCode)
return eaten;
}
PRBool nsCSSScanner::Next(PRInt32* aErrorCode, nsCSSToken* aToken)
PRBool nsCSSScanner::Next(PRInt32& aErrorCode, nsCSSToken& aToken)
{
PRInt32 ch = Read(aErrorCode);
if (ch < 0) {
@ -259,7 +260,8 @@ PRBool nsCSSScanner::Next(PRInt32* aErrorCode, nsCSSToken* aToken)
if ((ch == '.') || (ch == '+') || (ch == '-')) {
PRInt32 nextChar = Peek(aErrorCode);
if ((nextChar >= 0) && (nextChar <= 255)) {
if ((lexTable[nextChar] & IS_DIGIT) != 0) {
if (((lexTable[nextChar] & IS_DIGIT) != 0) ||
(('.' == nextChar) && ('.' != ch))) {
return ParseNumber(aErrorCode, ch, aToken);
}
}
@ -280,9 +282,9 @@ PRBool nsCSSScanner::Next(PRInt32* aErrorCode, nsCSSToken* aToken)
// WS
if ((lexTable[ch] & IS_WHITESPACE) != 0) {
aToken->mType = eCSSToken_WhiteSpace;
aToken->mIdent.SetLength(0);
aToken->mIdent.Append(PRUnichar(ch));
aToken.mType = eCSSToken_WhiteSpace;
aToken.mIdent.SetLength(0);
aToken.mIdent.Append(PRUnichar(ch));
(void) EatWhiteSpace(aErrorCode);
return PR_TRUE;
}
@ -290,15 +292,15 @@ PRBool nsCSSScanner::Next(PRInt32* aErrorCode, nsCSSToken* aToken)
PRInt32 nextChar = Peek(aErrorCode);
if (nextChar == '/') {
(void) Read(aErrorCode);
aToken->mIdent.SetLength(0);
aToken->mIdent.Append(PRUnichar(ch));
aToken->mIdent.Append(PRUnichar(ch));
aToken.mIdent.SetLength(0);
aToken.mIdent.Append(PRUnichar(ch));
aToken.mIdent.Append(PRUnichar(ch));
return ParseEOLComment(aErrorCode, aToken);
} else if (nextChar == '*') {
(void) Read(aErrorCode);
aToken->mIdent.SetLength(0);
aToken->mIdent.Append(PRUnichar(ch));
aToken->mIdent.Append(PRUnichar(nextChar));
aToken.mIdent.SetLength(0);
aToken.mIdent.Append(PRUnichar(ch));
aToken.mIdent.Append(PRUnichar(nextChar));
return ParseCComment(aErrorCode, aToken);
}
}
@ -306,14 +308,14 @@ PRBool nsCSSScanner::Next(PRInt32* aErrorCode, nsCSSToken* aToken)
PRInt32 nextChar = Peek(aErrorCode);
if (nextChar == '!') {
(void) Read(aErrorCode);
aToken->mType = eCSSToken_WhiteSpace;
aToken->mIdent.SetLength(0);
aToken->mIdent.Append(PRUnichar(ch));
aToken->mIdent.Append(PRUnichar(nextChar));
aToken.mType = eCSSToken_WhiteSpace;
aToken.mIdent.SetLength(0);
aToken.mIdent.Append(PRUnichar(ch));
aToken.mIdent.Append(PRUnichar(nextChar));
nextChar = Peek(aErrorCode);
while ((0 < nextChar) && (nextChar == '-')) {
Read(aErrorCode);
aToken->mIdent.Append(PRUnichar(nextChar));
aToken.mIdent.Append(PRUnichar(nextChar));
nextChar = Peek(aErrorCode);
}
return PR_TRUE;
@ -337,15 +339,15 @@ PRBool nsCSSScanner::Next(PRInt32* aErrorCode, nsCSSToken* aToken)
}
if (nextChar == '>') { // HTML end
(void) Read(aErrorCode);
aToken->mType = eCSSToken_WhiteSpace;
aToken->mIdent.SetLength(0);
aToken.mType = eCSSToken_WhiteSpace;
aToken.mIdent.SetLength(0);
while (0 < dashCount--) {
aToken->mIdent.Append('-');
aToken.mIdent.Append('-');
}
if (white) {
aToken->mIdent.Append(' ');
aToken.mIdent.Append(' ');
}
aToken->mIdent.Append('>');
aToken.mIdent.Append('>');
return PR_TRUE;
}
else { // wasn't an end comment, push it all back
@ -359,12 +361,111 @@ PRBool nsCSSScanner::Next(PRInt32* aErrorCode, nsCSSToken* aToken)
}
}
}
aToken->mType = eCSSToken_Symbol;
aToken->mSymbol = ch;
aToken.mType = eCSSToken_Symbol;
aToken.mSymbol = ch;
return PR_TRUE;
}
PRInt32 nsCSSScanner::ParseEscape(PRInt32* aErrorCode)
PRBool nsCSSScanner::NextURL(PRInt32& aErrorCode, nsCSSToken& aToken)
{
PRInt32 ch = Read(aErrorCode);
if (ch < 0) {
return PR_FALSE;
}
if (ch < 256) {
PRUint8* lexTable = gLexTable;
// STRING
if ((ch == '"') || (ch == '\'')) {
return ParseString(aErrorCode, ch, aToken);
}
// WS
if ((lexTable[ch] & IS_WHITESPACE) != 0) {
aToken.mType = eCSSToken_WhiteSpace;
aToken.mIdent.SetLength(0);
aToken.mIdent.Append(PRUnichar(ch));
(void) EatWhiteSpace(aErrorCode);
return PR_TRUE;
}
if (ch == '/') {
PRInt32 nextChar = Peek(aErrorCode);
if (nextChar == '/') {
(void) Read(aErrorCode);
aToken.mIdent.SetLength(0);
aToken.mIdent.Append(PRUnichar(ch));
aToken.mIdent.Append(PRUnichar(ch));
return ParseEOLComment(aErrorCode, aToken);
} else if (nextChar == '*') {
(void) Read(aErrorCode);
aToken.mIdent.SetLength(0);
aToken.mIdent.Append(PRUnichar(ch));
aToken.mIdent.Append(PRUnichar(nextChar));
return ParseCComment(aErrorCode, aToken);
}
}
// Process a url lexical token. A CSS1 url token can contain
// characters beyond identifier characters (e.g. '/', ':', etc.)
// Because of this the normal rules for tokenizing the input don't
// apply very well. To simplify the parser and relax some of the
// requirements on the scanner we parse url's here. If we find a
// malformed URL then we emit a token of type "InvalidURL" so that
// the CSS1 parser can ignore the invalid input. We attempt to eat
// the right amount of input data when an invalid URL is presented.
aToken.mType = eCSSToken_InvalidURL;
nsString& ident = aToken.mIdent;
ident.SetLength(0);
if (ch == ')') {
Unread();
// empty url spec: this is invalid
} else {
// start of a non-quoted url
Unread();
PRBool ok = PR_TRUE;
for (;;) {
ch = Read(aErrorCode);
if (ch < 0) break;
if (ch == CSS_ESCAPE) {
ch = ParseEscape(aErrorCode);
ident.Append(PRUnichar(ch));
} else if ((ch == '"') || (ch == '\'') || (ch == '(')) {
// This is an invalid URL spec
ok = PR_FALSE;
} else if ((256 >= ch) && ((gLexTable[ch] & IS_WHITESPACE) != 0)) {
// Whitespace is allowed at the end of the URL
(void) EatWhiteSpace(aErrorCode);
if (LookAhead(aErrorCode, ')')) {
// done!
break;
}
// Whitespace is followed by something other than a
// ")". This is an invalid url spec.
ok = PR_FALSE;
} else if (ch == ')') {
Unread();
// All done
break;
} else {
// A regular url character.
ident.Append(PRUnichar(ch));
}
}
// If the result of the above scanning is ok then change the token
// type to a useful one.
if (ok) {
aToken.mType = eCSSToken_URL;
}
}
}
return PR_TRUE;
}
PRInt32 nsCSSScanner::ParseEscape(PRInt32& aErrorCode)
{
PRUint8* lexTable = gLexTable;
PRInt32 ch = Peek(aErrorCode);
@ -410,7 +511,7 @@ PRInt32 nsCSSScanner::ParseEscape(PRInt32* aErrorCode)
* until the first non-identifier character is seen. The termination
* character is unread for the future re-reading.
*/
PRBool nsCSSScanner::GatherIdent(PRInt32* aErrorCode, PRInt32 aChar,
PRBool nsCSSScanner::GatherIdent(PRInt32& aErrorCode, PRInt32 aChar,
nsString& aIdent)
{
if (aChar == CSS_ESCAPE) {
@ -432,111 +533,48 @@ PRBool nsCSSScanner::GatherIdent(PRInt32* aErrorCode, PRInt32 aChar,
return PR_TRUE;
}
PRBool nsCSSScanner::ParseID(PRInt32* aErrorCode,
PRBool nsCSSScanner::ParseID(PRInt32& aErrorCode,
PRInt32 aChar,
nsCSSToken* aToken)
nsCSSToken& aToken)
{
aToken->mIdent.SetLength(0);
aToken->mType = eCSSToken_ID;
return GatherIdent(aErrorCode, aChar, aToken->mIdent);
aToken.mIdent.SetLength(0);
aToken.mType = eCSSToken_ID;
return GatherIdent(aErrorCode, aChar, aToken.mIdent);
}
PRBool nsCSSScanner::ParseIdent(PRInt32* aErrorCode,
PRBool nsCSSScanner::ParseIdent(PRInt32& aErrorCode,
PRInt32 aChar,
nsCSSToken* aToken)
nsCSSToken& aToken)
{
nsString& ident = aToken->mIdent;
nsString& ident = aToken.mIdent;
ident.SetLength(0);
ident.Append(PRUnichar(aChar));
if (!GatherIdent(aErrorCode, aChar, ident)) {
return PR_FALSE;
}
// Process a url lexical token. A CSS1 url token can contain
// characters beyond identifier characters (e.g. '/', ':', etc.)
// Because of this the normal rules for tokenizing the input don't
// apply very well. To simplify the parser and relax some of the
// requirements on the scanner we parse url's here. If we find a
// malformed URL then we emit a token of type "InvalidURL" so that
// the CSS1 parser can ignore the invalid input. We attempt to eat
// the right amount of input data when an invalid URL is presented.
nsCSSTokenType tokenType = eCSSToken_Ident;
if (ident.EqualsIgnoreCase("url")) {
tokenType = eCSSToken_InvalidURL;
if (LookAhead(aErrorCode, '(')) {
// Skip leading whitespace
(void) EatWhiteSpace(aErrorCode);
ident.SetLength(0);
PRInt32 c = Read(aErrorCode);
if (c == ')') {
// empty url spec: this is invalid
} else if ((c == '"') || (c == '\'')) {
// start of a quoted url
if (!GatherString(aErrorCode, c, ident)) {
return PR_FALSE;
}
// Whitespace is allowed at the end of the URL before the right paren
(void) EatWhiteSpace(aErrorCode);
if (LookAhead(aErrorCode, ')')) {
tokenType = eCSSToken_URL;
}
} else {
// start of a non-quoted url
Unread();
PRBool ok = PR_TRUE;
for (;;) {
c = Read(aErrorCode);
if (c < 0) break;
if (c == CSS_ESCAPE) {
c = ParseEscape(aErrorCode);
ident.Append(PRUnichar(c));
} else if ((c == '"') || (c == '\'') || (c == '(')) {
// This is an invalid URL spec
ok = PR_FALSE;
} else if ((256 >= c) && ((gLexTable[c] & IS_WHITESPACE) != 0)) {
// Whitespace is allowed at the end of the URL
(void) EatWhiteSpace(aErrorCode);
if (LookAhead(aErrorCode, ')')) {
// done!
break;
}
// Whitespace is followed by something other than a
// ")". This is an invalid url spec.
ok = PR_FALSE;
} else if (c == ')') {
// All done
break;
} else {
// A regular url character.
ident.Append(PRUnichar(c));
}
}
// If the result of the above scanning is ok then change the token
// type to a useful one.
if (ok) {
tokenType = eCSSToken_URL;
}
}
}
// look for functions (ie: "ident(")
if (PRUnichar('(') == PRUnichar(Peek(aErrorCode))) { // this is a function definition
tokenType = eCSSToken_Function;
}
aToken->mType = tokenType;
aToken.mType = tokenType;
return PR_TRUE;
}
PRBool nsCSSScanner::ParseAtKeyword(PRInt32* aErrorCode, PRInt32 aChar,
nsCSSToken* aToken)
PRBool nsCSSScanner::ParseAtKeyword(PRInt32& aErrorCode, PRInt32 aChar,
nsCSSToken& aToken)
{
aToken->mIdent.SetLength(0);
aToken->mType = eCSSToken_AtKeyword;
return GatherIdent(aErrorCode, aChar, aToken->mIdent);
aToken.mIdent.SetLength(0);
aToken.mType = eCSSToken_AtKeyword;
return GatherIdent(aErrorCode, aChar, aToken.mIdent);
}
PRBool nsCSSScanner::ParseNumber(PRInt32* aErrorCode, PRInt32 c,
nsCSSToken* aToken)
PRBool nsCSSScanner::ParseNumber(PRInt32& aErrorCode, PRInt32 c,
nsCSSToken& aToken)
{
nsString& ident = aToken->mIdent;
nsString& ident = aToken.mIdent;
ident.SetLength(0);
PRBool gotDot = (c == '.') ? PR_TRUE : PR_FALSE;
if (c != '+') {
@ -562,7 +600,7 @@ PRBool nsCSSScanner::ParseNumber(PRInt32* aErrorCode, PRInt32 c,
float value = ident.ToFloat(&ec);
// Look at character that terminated the number
aToken->mIntegerValid = PR_FALSE;
aToken.mIntegerValid = PR_FALSE;
if (c >= 0) {
if ((c <= 255) && ((lexTable[c] & START_IDENT) != 0)) {
ident.SetLength(0);
@ -578,20 +616,20 @@ PRBool nsCSSScanner::ParseNumber(PRInt32* aErrorCode, PRInt32 c,
// Put back character that stopped numeric scan
Unread();
if (!gotDot) {
aToken->mInteger = ident.ToInteger(&ec);
aToken->mIntegerValid = PR_TRUE;
aToken.mInteger = ident.ToInteger(&ec);
aToken.mIntegerValid = PR_TRUE;
}
ident.SetLength(0);
}
}
aToken->mNumber = value;
aToken->mType = type;
aToken.mNumber = value;
aToken.mType = type;
return PR_TRUE;
}
PRBool nsCSSScanner::ParseCComment(PRInt32* aErrorCode, nsCSSToken* aToken)
PRBool nsCSSScanner::ParseCComment(PRInt32& aErrorCode, nsCSSToken& aToken)
{
nsString& ident = aToken->mIdent;
nsString& ident = aToken.mIdent;
for (;;) {
PRInt32 ch = Read(aErrorCode);
if (ch < 0) break;
@ -606,13 +644,13 @@ PRBool nsCSSScanner::ParseCComment(PRInt32* aErrorCode, nsCSSToken* aToken)
ident.Append(PRUnichar(ch));
#endif
}
aToken->mType = eCSSToken_WhiteSpace;
aToken.mType = eCSSToken_WhiteSpace;
return PR_TRUE;
}
PRBool nsCSSScanner::ParseEOLComment(PRInt32* aErrorCode, nsCSSToken* aToken)
PRBool nsCSSScanner::ParseEOLComment(PRInt32& aErrorCode, nsCSSToken& aToken)
{
nsString& ident = aToken->mIdent;
nsString& ident = aToken.mIdent;
ident.SetLength(0);
for (;;) {
if (EatNewline(aErrorCode)) {
@ -626,11 +664,11 @@ PRBool nsCSSScanner::ParseEOLComment(PRInt32* aErrorCode, nsCSSToken* aToken)
ident.Append(PRUnichar(ch));
#endif
}
aToken->mType = eCSSToken_WhiteSpace;
aToken.mType = eCSSToken_WhiteSpace;
return PR_TRUE;
}
PRBool nsCSSScanner::GatherString(PRInt32* aErrorCode, PRInt32 aStop,
PRBool nsCSSScanner::GatherString(PRInt32& aErrorCode, PRInt32 aStop,
nsString& aBuffer)
{
for (;;) {
@ -652,11 +690,11 @@ PRBool nsCSSScanner::GatherString(PRInt32* aErrorCode, PRInt32 aStop,
return PR_TRUE;
}
PRBool nsCSSScanner::ParseString(PRInt32* aErrorCode, PRInt32 aStop,
nsCSSToken* aToken)
PRBool nsCSSScanner::ParseString(PRInt32& aErrorCode, PRInt32 aStop,
nsCSSToken& aToken)
{
aToken->mIdent.SetLength(0);
aToken->mType = eCSSToken_String;
aToken->mSymbol = PRUnichar(aStop); // remember how it's quoted
return GatherString(aErrorCode, aStop, aToken->mIdent);
aToken.mIdent.SetLength(0);
aToken.mType = eCSSToken_String;
aToken.mSymbol = PRUnichar(aStop); // remember how it's quoted
return GatherString(aErrorCode, aStop, aToken.mIdent);
}

76
content/html/style/src/nsCSSScanner.h
View File

@ -24,40 +24,43 @@ class nsIUnicharInputStream;
// Token types
enum nsCSSTokenType {
// A css identifier (e.g. foo)
eCSSToken_Ident = 0,
eCSSToken_Ident = 0, // mIdent
// A css at keyword (e.g. @foo)
eCSSToken_AtKeyword = 1,
eCSSToken_AtKeyword = 1, // mIdent
// A css number without a percentage or dimension; with percentage;
// without percentage but with a dimension
eCSSToken_Number = 2,
eCSSToken_Percentage = 3,
eCSSToken_Dimension = 4,
eCSSToken_Number = 2, // mNumber
eCSSToken_Percentage = 3, // mNumber
eCSSToken_Dimension = 4, // mNumber + mIdent
// A css string (e.g. "foo" or 'foo')
eCSSToken_String = 5,
eCSSToken_String = 5, // mSymbol + mIdent + mSymbol
// Whitespace (e.g. " " or "/* abc */" or "// foo <eol>")
eCSSToken_WhiteSpace = 6,
eCSSToken_WhiteSpace = 6, // mIdent
// A css symbol (e.g. ':', ';', '+', etc.)
eCSSToken_Symbol = 7,
eCSSToken_URL = 8, // use getString
eCSSToken_InvalidURL = 9, // doesn't matter
eCSSToken_Symbol = 7, // mSymbol
// A css1 id (e.g. #foo3)
eCSSToken_ID = 10, // use getString()
eCSSToken_ID = 8, // mIdent
eCSSToken_Function = 9, // mIdent
eCSSToken_URL = 10, // mIdent
eCSSToken_InvalidURL = 11, // doesn't matter
};
struct nsCSSToken {
nsCSSTokenType mType;
nsAutoString mIdent;
float mNumber;
PRInt32 mInteger;
PRUnichar mSymbol;
PRBool mIntegerValid;
nsCSSTokenType mType;
nsAutoString mIdent;
float mNumber;
PRInt32 mInteger;
PRBool mIntegerValid;
PRUnichar mSymbol;
nsCSSToken();
@ -82,31 +85,34 @@ class nsCSSScanner {
// Get the next token. Return nsfalse on EOF or ERROR. aTokenResult
// is filled in with the data for the token.
PRBool Next(PRInt32* aErrorCode, nsCSSToken* aTokenResult);
PRBool Next(PRInt32& aErrorCode, nsCSSToken& aTokenResult);
// Get the next token that may be a string or unquoted URL or whitespace
PRBool NextURL(PRInt32& aErrorCode, nsCSSToken& aTokenResult);
protected:
void Close();
PRInt32 Read(PRInt32* aErrorCode);
PRInt32 Peek(PRInt32* aErrorCode);
PRInt32 Read(PRInt32& aErrorCode);
PRInt32 Peek(PRInt32& aErrorCode);
void Unread();
void Pushback(PRUnichar aChar);
PRBool LookAhead(PRInt32* aErrorCode, PRUnichar aChar);
PRBool EatWhiteSpace(PRInt32* aErrorCode);
PRBool EatNewline(PRInt32* aErrorCode);
PRBool LookAhead(PRInt32& aErrorCode, PRUnichar aChar);
PRBool EatWhiteSpace(PRInt32& aErrorCode);
PRBool EatNewline(PRInt32& aErrorCode);
PRInt32 ParseEscape(PRInt32* aErrorCode);
PRBool ParseIdent(PRInt32* aErrorCode, PRInt32 aChar, nsCSSToken* aResult);
PRBool ParseAtKeyword(PRInt32* aErrorCode, PRInt32 aChar,
nsCSSToken* aResult);
PRBool ParseNumber(PRInt32* aErrorCode, PRInt32 aChar, nsCSSToken* aResult);
PRBool ParseID(PRInt32* aErrorCode, PRInt32 aChar, nsCSSToken* aResult);
PRBool ParseString(PRInt32* aErrorCode, PRInt32 aChar, nsCSSToken* aResult);
PRBool ParseEOLComment(PRInt32* aErrorCode, nsCSSToken* aResult);
PRBool ParseCComment(PRInt32* aErrorCode, nsCSSToken* aResult);
PRInt32 ParseEscape(PRInt32& aErrorCode);
PRBool ParseIdent(PRInt32& aErrorCode, PRInt32 aChar, nsCSSToken& aResult);
PRBool ParseAtKeyword(PRInt32& aErrorCode, PRInt32 aChar,
nsCSSToken& aResult);
PRBool ParseNumber(PRInt32& aErrorCode, PRInt32 aChar, nsCSSToken& aResult);
PRBool ParseID(PRInt32& aErrorCode, PRInt32 aChar, nsCSSToken& aResult);
PRBool ParseString(PRInt32& aErrorCode, PRInt32 aChar, nsCSSToken& aResult);
PRBool ParseEOLComment(PRInt32& aErrorCode, nsCSSToken& aResult);
PRBool ParseCComment(PRInt32& aErrorCode, nsCSSToken& aResult);
PRBool GatherString(PRInt32* aErrorCode, PRInt32 aStop,
PRBool GatherString(PRInt32& aErrorCode, PRInt32 aStop,
nsString& aString);
PRBool GatherIdent(PRInt32* aErrorCode, PRInt32 aChar, nsString& aIdent);
PRBool GatherIdent(PRInt32& aErrorCode, PRInt32 aChar, nsString& aIdent);
nsIUnicharInputStream* mInput;
PRUnichar* mBuffer;

813
content/html/style/src/nsCSSStruct.cpp
View File

File diff suppressed because it is too large Load Diff

68
content/html/style/src/nsICSSDeclaration.h
View File

@ -100,21 +100,30 @@ struct nsCSSFont : public nsCSSStruct {
nsCSSValue mStretch; // NEW
};
struct nsCSSValueList {
nsCSSValueList(void);
~nsCSSValueList(void);
nsCSSValue mValue;
nsCSSValueList* mNext;
};
struct nsCSSColor : public nsCSSStruct {
nsCSSColor(void);
~nsCSSColor(void);
const nsID& GetID(void);
void List(FILE* out = stdout, PRInt32 aIndent = 0) const;
nsCSSValue mColor;
nsCSSValue mBackColor;
nsCSSValue mBackImage;
nsCSSValue mBackRepeat;
nsCSSValue mBackAttachment;
nsCSSValue mBackPositionX;
nsCSSValue mBackPositionY;
nsCSSValue mBackFilter;
nsCSSValue mCursor;
nsCSSValue mCursorImage;
nsCSSValue mOpacity;
nsCSSValue mColor;
nsCSSValue mBackColor;
nsCSSValue mBackImage;
nsCSSValue mBackRepeat;
nsCSSValue mBackAttachment;
nsCSSValue mBackPositionX;
nsCSSValue mBackPositionY;
nsCSSValue mBackFilter;
nsCSSValueList* mCursor;
nsCSSValue mOpacity;
};
struct nsCSSShadow {
@ -220,7 +229,8 @@ struct nsCSSTable : public nsCSSStruct { // NEW
void List(FILE* out = stdout, PRInt32 aIndent = 0) const;
nsCSSValue mBorderCollapse;
nsCSSValue mBorderSpacing;
nsCSSValue mBorderSpacingX;
nsCSSValue mBorderSpacingY;
nsCSSValue mCaptionSide;
nsCSSValue mEmptyCells;
nsCSSValue mLayout;
@ -243,18 +253,39 @@ struct nsCSSPage : public nsCSSStruct { // NEW
void List(FILE* out = stdout, PRInt32 aIndent = 0) const;
nsCSSValue mMarks;
nsCSSValue mSize;
nsCSSValue mSizeWidth;
nsCSSValue mSizeHeight;
};
struct nsCSSCounterData {
nsCSSCounterData(void);
~nsCSSCounterData(void);
nsCSSValue mCounter;
nsCSSValue mValue;
nsCSSCounterData* mNext;
};
struct nsCSSQuotes {
nsCSSQuotes(void);
~nsCSSQuotes(void);
nsCSSValue mOpen;
nsCSSValue mClose;
nsCSSQuotes* mNext;
};
struct nsCSSContent : public nsCSSStruct { // NEW
nsCSSContent(void);
~nsCSSContent(void);
const nsID& GetID(void);
void List(FILE* out = stdout, PRInt32 aIndent = 0) const;
nsCSSValue mContent;
nsCSSValue mCounterIncrement;
nsCSSValue mCounterReset;
nsCSSValue mMarkerOffset;
nsCSSValue mQuotes;
nsCSSValueList* mContent;
nsCSSCounterData* mCounterIncrement;
nsCSSCounterData* mCounterReset;
nsCSSValue mMarkerOffset;
nsCSSQuotes* mQuotes;
};
struct nsCSSAural : public nsCSSStruct { // NEW
@ -270,6 +301,7 @@ struct nsCSSAural : public nsCSSStruct { // NEW
nsCSSValue mPitch;
nsCSSValue mPitchRange;
nsCSSValue mPlayDuring;
nsCSSValue mPlayDuringFlags;
nsCSSValue mRichness;
nsCSSValue mSpeak;
nsCSSValue mSpeakHeader;

813
layout/html/style/src/nsCSSDeclaration.cpp
View File

File diff suppressed because it is too large Load Diff

2340
layout/html/style/src/nsCSSParser.cpp
View File

File diff suppressed because it is too large Load Diff

310
layout/html/style/src/nsCSSScanner.cpp
View File

@ -118,7 +118,7 @@ void nsCSSScanner::Close()
}
// Returns -1 on error or eof
PRInt32 nsCSSScanner::Read(PRInt32* aErrorCode)
PRInt32 nsCSSScanner::Read(PRInt32& aErrorCode)
{
PRInt32 rv;
if (0 < mPushbackCount) {
@ -129,8 +129,8 @@ PRInt32 nsCSSScanner::Read(PRInt32* aErrorCode)
}
if (mOffset == mCount) {
mOffset = 0;
*aErrorCode = mInput->Read(mBuffer, 0, BUFFER_SIZE, &mCount);
if (NS_FAILED(*aErrorCode)) {
aErrorCode = mInput->Read(mBuffer, 0, BUFFER_SIZE, &mCount);
if (NS_FAILED(aErrorCode)) {
mCount = 0;
return -1;
}
@ -142,13 +142,14 @@ PRInt32 nsCSSScanner::Read(PRInt32* aErrorCode)
return rv;
}
PRInt32 nsCSSScanner::Peek(PRInt32* aErrorCode)
PRInt32 nsCSSScanner::Peek(PRInt32& aErrorCode)
{
if (0 == mPushbackCount) {
mPushback[0] = Read(aErrorCode);
if (mPushback[0] < 0) {
PRInt32 ch = Read(aErrorCode);
if (ch < 0) {
return -1;
}
mPushback[0] = PRUnichar(ch);
mPushbackCount++;
}
//printf("Peek => %x\n", mLookAhead);
@ -179,7 +180,7 @@ void nsCSSScanner::Pushback(PRUnichar aChar)
mPushback[mPushbackCount++] = aChar;
}
PRBool nsCSSScanner::LookAhead(PRInt32* aErrorCode, PRUnichar aChar)
PRBool nsCSSScanner::LookAhead(PRInt32& aErrorCode, PRUnichar aChar)
{
PRInt32 ch = Read(aErrorCode);
if (ch < 0) {
@ -192,7 +193,7 @@ PRBool nsCSSScanner::LookAhead(PRInt32* aErrorCode, PRUnichar aChar)
return PR_FALSE;
}
PRBool nsCSSScanner::EatWhiteSpace(PRInt32* aErrorCode)
PRBool nsCSSScanner::EatWhiteSpace(PRInt32& aErrorCode)
{
PRBool eaten = PR_FALSE;
for (;;) {
@ -210,7 +211,7 @@ PRBool nsCSSScanner::EatWhiteSpace(PRInt32* aErrorCode)
return eaten;
}
PRBool nsCSSScanner::EatNewline(PRInt32* aErrorCode)
PRBool nsCSSScanner::EatNewline(PRInt32& aErrorCode)
{
PRInt32 ch = Read(aErrorCode);
if (ch < 0) {
@ -231,7 +232,7 @@ PRBool nsCSSScanner::EatNewline(PRInt32* aErrorCode)
return eaten;
}
PRBool nsCSSScanner::Next(PRInt32* aErrorCode, nsCSSToken* aToken)
PRBool nsCSSScanner::Next(PRInt32& aErrorCode, nsCSSToken& aToken)
{
PRInt32 ch = Read(aErrorCode);
if (ch < 0) {
@ -259,7 +260,8 @@ PRBool nsCSSScanner::Next(PRInt32* aErrorCode, nsCSSToken* aToken)
if ((ch == '.') || (ch == '+') || (ch == '-')) {
PRInt32 nextChar = Peek(aErrorCode);
if ((nextChar >= 0) && (nextChar <= 255)) {
if ((lexTable[nextChar] & IS_DIGIT) != 0) {
if (((lexTable[nextChar] & IS_DIGIT) != 0) ||
(('.' == nextChar) && ('.' != ch))) {
return ParseNumber(aErrorCode, ch, aToken);
}
}
@ -280,9 +282,9 @@ PRBool nsCSSScanner::Next(PRInt32* aErrorCode, nsCSSToken* aToken)
// WS
if ((lexTable[ch] & IS_WHITESPACE) != 0) {
aToken->mType = eCSSToken_WhiteSpace;
aToken->mIdent.SetLength(0);
aToken->mIdent.Append(PRUnichar(ch));
aToken.mType = eCSSToken_WhiteSpace;
aToken.mIdent.SetLength(0);
aToken.mIdent.Append(PRUnichar(ch));
(void) EatWhiteSpace(aErrorCode);
return PR_TRUE;
}
@ -290,15 +292,15 @@ PRBool nsCSSScanner::Next(PRInt32* aErrorCode, nsCSSToken* aToken)
PRInt32 nextChar = Peek(aErrorCode);
if (nextChar == '/') {
(void) Read(aErrorCode);
aToken->mIdent.SetLength(0);
aToken->mIdent.Append(PRUnichar(ch));
aToken->mIdent.Append(PRUnichar(ch));
aToken.mIdent.SetLength(0);
aToken.mIdent.Append(PRUnichar(ch));
aToken.mIdent.Append(PRUnichar(ch));
return ParseEOLComment(aErrorCode, aToken);
} else if (nextChar == '*') {
(void) Read(aErrorCode);
aToken->mIdent.SetLength(0);
aToken->mIdent.Append(PRUnichar(ch));
aToken->mIdent.Append(PRUnichar(nextChar));
aToken.mIdent.SetLength(0);
aToken.mIdent.Append(PRUnichar(ch));
aToken.mIdent.Append(PRUnichar(nextChar));
return ParseCComment(aErrorCode, aToken);
}
}
@ -306,14 +308,14 @@ PRBool nsCSSScanner::Next(PRInt32* aErrorCode, nsCSSToken* aToken)
PRInt32 nextChar = Peek(aErrorCode);
if (nextChar == '!') {
(void) Read(aErrorCode);
aToken->mType = eCSSToken_WhiteSpace;
aToken->mIdent.SetLength(0);
aToken->mIdent.Append(PRUnichar(ch));
aToken->mIdent.Append(PRUnichar(nextChar));
aToken.mType = eCSSToken_WhiteSpace;
aToken.mIdent.SetLength(0);
aToken.mIdent.Append(PRUnichar(ch));
aToken.mIdent.Append(PRUnichar(nextChar));
nextChar = Peek(aErrorCode);
while ((0 < nextChar) && (nextChar == '-')) {
Read(aErrorCode);
aToken->mIdent.Append(PRUnichar(nextChar));
aToken.mIdent.Append(PRUnichar(nextChar));
nextChar = Peek(aErrorCode);
}
return PR_TRUE;
@ -337,15 +339,15 @@ PRBool nsCSSScanner::Next(PRInt32* aErrorCode, nsCSSToken* aToken)
}
if (nextChar == '>') { // HTML end
(void) Read(aErrorCode);
aToken->mType = eCSSToken_WhiteSpace;
aToken->mIdent.SetLength(0);
aToken.mType = eCSSToken_WhiteSpace;
aToken.mIdent.SetLength(0);
while (0 < dashCount--) {
aToken->mIdent.Append('-');
aToken.mIdent.Append('-');
}
if (white) {
aToken->mIdent.Append(' ');
aToken.mIdent.Append(' ');
}
aToken->mIdent.Append('>');
aToken.mIdent.Append('>');
return PR_TRUE;
}
else { // wasn't an end comment, push it all back
@ -359,12 +361,111 @@ PRBool nsCSSScanner::Next(PRInt32* aErrorCode, nsCSSToken* aToken)
}
}
}
aToken->mType = eCSSToken_Symbol;
aToken->mSymbol = ch;
aToken.mType = eCSSToken_Symbol;
aToken.mSymbol = ch;
return PR_TRUE;
}
PRInt32 nsCSSScanner::ParseEscape(PRInt32* aErrorCode)
PRBool nsCSSScanner::NextURL(PRInt32& aErrorCode, nsCSSToken& aToken)
{
PRInt32 ch = Read(aErrorCode);
if (ch < 0) {
return PR_FALSE;
}
if (ch < 256) {
PRUint8* lexTable = gLexTable;
// STRING
if ((ch == '"') || (ch == '\'')) {
return ParseString(aErrorCode, ch, aToken);
}
// WS
if ((lexTable[ch] & IS_WHITESPACE) != 0) {
aToken.mType = eCSSToken_WhiteSpace;
aToken.mIdent.SetLength(0);
aToken.mIdent.Append(PRUnichar(ch));
(void) EatWhiteSpace(aErrorCode);
return PR_TRUE;
}
if (ch == '/') {
PRInt32 nextChar = Peek(aErrorCode);
if (nextChar == '/') {
(void) Read(aErrorCode);
aToken.mIdent.SetLength(0);
aToken.mIdent.Append(PRUnichar(ch));
aToken.mIdent.Append(PRUnichar(ch));
return ParseEOLComment(aErrorCode, aToken);
} else if (nextChar == '*') {
(void) Read(aErrorCode);
aToken.mIdent.SetLength(0);
aToken.mIdent.Append(PRUnichar(ch));
aToken.mIdent.Append(PRUnichar(nextChar));
return ParseCComment(aErrorCode, aToken);
}
}
// Process a url lexical token. A CSS1 url token can contain
// characters beyond identifier characters (e.g. '/', ':', etc.)
// Because of this the normal rules for tokenizing the input don't
// apply very well. To simplify the parser and relax some of the
// requirements on the scanner we parse url's here. If we find a
// malformed URL then we emit a token of type "InvalidURL" so that
// the CSS1 parser can ignore the invalid input. We attempt to eat
// the right amount of input data when an invalid URL is presented.
aToken.mType = eCSSToken_InvalidURL;
nsString& ident = aToken.mIdent;
ident.SetLength(0);
if (ch == ')') {
Unread();
// empty url spec: this is invalid
} else {
// start of a non-quoted url
Unread();
PRBool ok = PR_TRUE;
for (;;) {
ch = Read(aErrorCode);
if (ch < 0) break;
if (ch == CSS_ESCAPE) {
ch = ParseEscape(aErrorCode);
ident.Append(PRUnichar(ch));
} else if ((ch == '"') || (ch == '\'') || (ch == '(')) {
// This is an invalid URL spec
ok = PR_FALSE;
} else if ((256 >= ch) && ((gLexTable[ch] & IS_WHITESPACE) != 0)) {
// Whitespace is allowed at the end of the URL
(void) EatWhiteSpace(aErrorCode);
if (LookAhead(aErrorCode, ')')) {
// done!
break;
}
// Whitespace is followed by something other than a
// ")". This is an invalid url spec.
ok = PR_FALSE;
} else if (ch == ')') {
Unread();
// All done
break;
} else {
// A regular url character.
ident.Append(PRUnichar(ch));
}
}
// If the result of the above scanning is ok then change the token
// type to a useful one.
if (ok) {
aToken.mType = eCSSToken_URL;
}
}
}
return PR_TRUE;
}
PRInt32 nsCSSScanner::ParseEscape(PRInt32& aErrorCode)
{
PRUint8* lexTable = gLexTable;
PRInt32 ch = Peek(aErrorCode);
@ -410,7 +511,7 @@ PRInt32 nsCSSScanner::ParseEscape(PRInt32* aErrorCode)
* until the first non-identifier character is seen. The termination
* character is unread for the future re-reading.
*/
PRBool nsCSSScanner::GatherIdent(PRInt32* aErrorCode, PRInt32 aChar,
PRBool nsCSSScanner::GatherIdent(PRInt32& aErrorCode, PRInt32 aChar,
nsString& aIdent)
{
if (aChar == CSS_ESCAPE) {
@ -432,111 +533,48 @@ PRBool nsCSSScanner::GatherIdent(PRInt32* aErrorCode, PRInt32 aChar,
return PR_TRUE;
}
PRBool nsCSSScanner::ParseID(PRInt32* aErrorCode,
PRBool nsCSSScanner::ParseID(PRInt32& aErrorCode,
PRInt32 aChar,
nsCSSToken* aToken)
nsCSSToken& aToken)
{
aToken->mIdent.SetLength(0);
aToken->mType = eCSSToken_ID;
return GatherIdent(aErrorCode, aChar, aToken->mIdent);
aToken.mIdent.SetLength(0);
aToken.mType = eCSSToken_ID;
return GatherIdent(aErrorCode, aChar, aToken.mIdent);
}
PRBool nsCSSScanner::ParseIdent(PRInt32* aErrorCode,
PRBool nsCSSScanner::ParseIdent(PRInt32& aErrorCode,
PRInt32 aChar,
nsCSSToken* aToken)
nsCSSToken& aToken)
{
nsString& ident = aToken->mIdent;
nsString& ident = aToken.mIdent;
ident.SetLength(0);
ident.Append(PRUnichar(aChar));
if (!GatherIdent(aErrorCode, aChar, ident)) {
return PR_FALSE;
}
// Process a url lexical token. A CSS1 url token can contain
// characters beyond identifier characters (e.g. '/', ':', etc.)
// Because of this the normal rules for tokenizing the input don't
// apply very well. To simplify the parser and relax some of the
// requirements on the scanner we parse url's here. If we find a
// malformed URL then we emit a token of type "InvalidURL" so that
// the CSS1 parser can ignore the invalid input. We attempt to eat
// the right amount of input data when an invalid URL is presented.
nsCSSTokenType tokenType = eCSSToken_Ident;
if (ident.EqualsIgnoreCase("url")) {
tokenType = eCSSToken_InvalidURL;
if (LookAhead(aErrorCode, '(')) {
// Skip leading whitespace
(void) EatWhiteSpace(aErrorCode);
ident.SetLength(0);
PRInt32 c = Read(aErrorCode);
if (c == ')') {
// empty url spec: this is invalid
} else if ((c == '"') || (c == '\'')) {
// start of a quoted url
if (!GatherString(aErrorCode, c, ident)) {
return PR_FALSE;
}
// Whitespace is allowed at the end of the URL before the right paren
(void) EatWhiteSpace(aErrorCode);
if (LookAhead(aErrorCode, ')')) {
tokenType = eCSSToken_URL;
}
} else {
// start of a non-quoted url
Unread();
PRBool ok = PR_TRUE;
for (;;) {
c = Read(aErrorCode);
if (c < 0) break;
if (c == CSS_ESCAPE) {
c = ParseEscape(aErrorCode);
ident.Append(PRUnichar(c));
} else if ((c == '"') || (c == '\'') || (c == '(')) {
// This is an invalid URL spec
ok = PR_FALSE;
} else if ((256 >= c) && ((gLexTable[c] & IS_WHITESPACE) != 0)) {
// Whitespace is allowed at the end of the URL
(void) EatWhiteSpace(aErrorCode);
if (LookAhead(aErrorCode, ')')) {
// done!
break;
}
// Whitespace is followed by something other than a
// ")". This is an invalid url spec.
ok = PR_FALSE;
} else if (c == ')') {
// All done
break;
} else {
// A regular url character.
ident.Append(PRUnichar(c));
}
}
// If the result of the above scanning is ok then change the token
// type to a useful one.
if (ok) {
tokenType = eCSSToken_URL;
}
}
}
// look for functions (ie: "ident(")
if (PRUnichar('(') == PRUnichar(Peek(aErrorCode))) { // this is a function definition
tokenType = eCSSToken_Function;
}
aToken->mType = tokenType;
aToken.mType = tokenType;
return PR_TRUE;
}
PRBool nsCSSScanner::ParseAtKeyword(PRInt32* aErrorCode, PRInt32 aChar,
nsCSSToken* aToken)
PRBool nsCSSScanner::ParseAtKeyword(PRInt32& aErrorCode, PRInt32 aChar,
nsCSSToken& aToken)
{
aToken->mIdent.SetLength(0);
aToken->mType = eCSSToken_AtKeyword;
return GatherIdent(aErrorCode, aChar, aToken->mIdent);
aToken.mIdent.SetLength(0);
aToken.mType = eCSSToken_AtKeyword;
return GatherIdent(aErrorCode, aChar, aToken.mIdent);
}
PRBool nsCSSScanner::ParseNumber(PRInt32* aErrorCode, PRInt32 c,
nsCSSToken* aToken)
PRBool nsCSSScanner::ParseNumber(PRInt32& aErrorCode, PRInt32 c,
nsCSSToken& aToken)
{
nsString& ident = aToken->mIdent;
nsString& ident = aToken.mIdent;
ident.SetLength(0);
PRBool gotDot = (c == '.') ? PR_TRUE : PR_FALSE;
if (c != '+') {
@ -562,7 +600,7 @@ PRBool nsCSSScanner::ParseNumber(PRInt32* aErrorCode, PRInt32 c,
float value = ident.ToFloat(&ec);
// Look at character that terminated the number
aToken->mIntegerValid = PR_FALSE;
aToken.mIntegerValid = PR_FALSE;
if (c >= 0) {
if ((c <= 255) && ((lexTable[c] & START_IDENT) != 0)) {
ident.SetLength(0);
@ -578,20 +616,20 @@ PRBool nsCSSScanner::ParseNumber(PRInt32* aErrorCode, PRInt32 c,
// Put back character that stopped numeric scan
Unread();
if (!gotDot) {
aToken->mInteger = ident.ToInteger(&ec);
aToken->mIntegerValid = PR_TRUE;
aToken.mInteger = ident.ToInteger(&ec);
aToken.mIntegerValid = PR_TRUE;
}
ident.SetLength(0);
}
}
aToken->mNumber = value;
aToken->mType = type;
aToken.mNumber = value;
aToken.mType = type;
return PR_TRUE;
}
PRBool nsCSSScanner::ParseCComment(PRInt32* aErrorCode, nsCSSToken* aToken)
PRBool nsCSSScanner::ParseCComment(PRInt32& aErrorCode, nsCSSToken& aToken)
{
nsString& ident = aToken->mIdent;
nsString& ident = aToken.mIdent;
for (;;) {
PRInt32 ch = Read(aErrorCode);
if (ch < 0) break;
@ -606,13 +644,13 @@ PRBool nsCSSScanner::ParseCComment(PRInt32* aErrorCode, nsCSSToken* aToken)
ident.Append(PRUnichar(ch));
#endif
}
aToken->mType = eCSSToken_WhiteSpace;
aToken.mType = eCSSToken_WhiteSpace;
return PR_TRUE;
}
PRBool nsCSSScanner::ParseEOLComment(PRInt32* aErrorCode, nsCSSToken* aToken)
PRBool nsCSSScanner::ParseEOLComment(PRInt32& aErrorCode, nsCSSToken& aToken)
{
nsString& ident = aToken->mIdent;
nsString& ident = aToken.mIdent;
ident.SetLength(0);
for (;;) {
if (EatNewline(aErrorCode)) {
@ -626,11 +664,11 @@ PRBool nsCSSScanner::ParseEOLComment(PRInt32* aErrorCode, nsCSSToken* aToken)
ident.Append(PRUnichar(ch));
#endif
}
aToken->mType = eCSSToken_WhiteSpace;
aToken.mType = eCSSToken_WhiteSpace;
return PR_TRUE;
}
PRBool nsCSSScanner::GatherString(PRInt32* aErrorCode, PRInt32 aStop,
PRBool nsCSSScanner::GatherString(PRInt32& aErrorCode, PRInt32 aStop,
nsString& aBuffer)
{
for (;;) {
@ -652,11 +690,11 @@ PRBool nsCSSScanner::GatherString(PRInt32* aErrorCode, PRInt32 aStop,
return PR_TRUE;
}
PRBool nsCSSScanner::ParseString(PRInt32* aErrorCode, PRInt32 aStop,
nsCSSToken* aToken)
PRBool nsCSSScanner::ParseString(PRInt32& aErrorCode, PRInt32 aStop,
nsCSSToken& aToken)
{
aToken->mIdent.SetLength(0);
aToken->mType = eCSSToken_String;
aToken->mSymbol = PRUnichar(aStop); // remember how it's quoted
return GatherString(aErrorCode, aStop, aToken->mIdent);
aToken.mIdent.SetLength(0);
aToken.mType = eCSSToken_String;
aToken.mSymbol = PRUnichar(aStop); // remember how it's quoted
return GatherString(aErrorCode, aStop, aToken.mIdent);
}

76
layout/html/style/src/nsCSSScanner.h
View File

@ -24,40 +24,43 @@ class nsIUnicharInputStream;
// Token types
enum nsCSSTokenType {
// A css identifier (e.g. foo)
eCSSToken_Ident = 0,
eCSSToken_Ident = 0, // mIdent
// A css at keyword (e.g. @foo)
eCSSToken_AtKeyword = 1,
eCSSToken_AtKeyword = 1, // mIdent
// A css number without a percentage or dimension; with percentage;
// without percentage but with a dimension
eCSSToken_Number = 2,
eCSSToken_Percentage = 3,
eCSSToken_Dimension = 4,
eCSSToken_Number = 2, // mNumber
eCSSToken_Percentage = 3, // mNumber
eCSSToken_Dimension = 4, // mNumber + mIdent
// A css string (e.g. "foo" or 'foo')
eCSSToken_String = 5,
eCSSToken_String = 5, // mSymbol + mIdent + mSymbol
// Whitespace (e.g. " " or "/* abc */" or "// foo <eol>")
eCSSToken_WhiteSpace = 6,
eCSSToken_WhiteSpace = 6, // mIdent
// A css symbol (e.g. ':', ';', '+', etc.)
eCSSToken_Symbol = 7,
eCSSToken_URL = 8, // use getString
eCSSToken_InvalidURL = 9, // doesn't matter
eCSSToken_Symbol = 7, // mSymbol
// A css1 id (e.g. #foo3)
eCSSToken_ID = 10, // use getString()
eCSSToken_ID = 8, // mIdent
eCSSToken_Function = 9, // mIdent
eCSSToken_URL = 10, // mIdent
eCSSToken_InvalidURL = 11, // doesn't matter
};
struct nsCSSToken {
nsCSSTokenType mType;
nsAutoString mIdent;
float mNumber;
PRInt32 mInteger;
PRUnichar mSymbol;
PRBool mIntegerValid;
nsCSSTokenType mType;
nsAutoString mIdent;
float mNumber;
PRInt32 mInteger;
PRBool mIntegerValid;
PRUnichar mSymbol;
nsCSSToken();
@ -82,31 +85,34 @@ class nsCSSScanner {
// Get the next token. Return nsfalse on EOF or ERROR. aTokenResult
// is filled in with the data for the token.
PRBool Next(PRInt32* aErrorCode, nsCSSToken* aTokenResult);
PRBool Next(PRInt32& aErrorCode, nsCSSToken& aTokenResult);
// Get the next token that may be a string or unquoted URL or whitespace
PRBool NextURL(PRInt32& aErrorCode, nsCSSToken& aTokenResult);
protected:
void Close();
PRInt32 Read(PRInt32* aErrorCode);
PRInt32 Peek(PRInt32* aErrorCode);
PRInt32 Read(PRInt32& aErrorCode);
PRInt32 Peek(PRInt32& aErrorCode);
void Unread();
void Pushback(PRUnichar aChar);
PRBool LookAhead(PRInt32* aErrorCode, PRUnichar aChar);
PRBool EatWhiteSpace(PRInt32* aErrorCode);
PRBool EatNewline(PRInt32* aErrorCode);
PRBool LookAhead(PRInt32& aErrorCode, PRUnichar aChar);
PRBool EatWhiteSpace(PRInt32& aErrorCode);
PRBool EatNewline(PRInt32& aErrorCode);
PRInt32 ParseEscape(PRInt32* aErrorCode);
PRBool ParseIdent(PRInt32* aErrorCode, PRInt32 aChar, nsCSSToken* aResult);
PRBool ParseAtKeyword(PRInt32* aErrorCode, PRInt32 aChar,
nsCSSToken* aResult);
PRBool ParseNumber(PRInt32* aErrorCode, PRInt32 aChar, nsCSSToken* aResult);
PRBool ParseID(PRInt32* aErrorCode, PRInt32 aChar, nsCSSToken* aResult);
PRBool ParseString(PRInt32* aErrorCode, PRInt32 aChar, nsCSSToken* aResult);
PRBool ParseEOLComment(PRInt32* aErrorCode, nsCSSToken* aResult);
PRBool ParseCComment(PRInt32* aErrorCode, nsCSSToken* aResult);
PRInt32 ParseEscape(PRInt32& aErrorCode);
PRBool ParseIdent(PRInt32& aErrorCode, PRInt32 aChar, nsCSSToken& aResult);
PRBool ParseAtKeyword(PRInt32& aErrorCode, PRInt32 aChar,
nsCSSToken& aResult);
PRBool ParseNumber(PRInt32& aErrorCode, PRInt32 aChar, nsCSSToken& aResult);
PRBool ParseID(PRInt32& aErrorCode, PRInt32 aChar, nsCSSToken& aResult);
PRBool ParseString(PRInt32& aErrorCode, PRInt32 aChar, nsCSSToken& aResult);
PRBool ParseEOLComment(PRInt32& aErrorCode, nsCSSToken& aResult);
PRBool ParseCComment(PRInt32& aErrorCode, nsCSSToken& aResult);
PRBool GatherString(PRInt32* aErrorCode, PRInt32 aStop,
PRBool GatherString(PRInt32& aErrorCode, PRInt32 aStop,
nsString& aString);
PRBool GatherIdent(PRInt32* aErrorCode, PRInt32 aChar, nsString& aIdent);
PRBool GatherIdent(PRInt32& aErrorCode, PRInt32 aChar, nsString& aIdent);
nsIUnicharInputStream* mInput;
PRUnichar* mBuffer;

68
layout/html/style/src/nsICSSDeclaration.h
View File

@ -100,21 +100,30 @@ struct nsCSSFont : public nsCSSStruct {
nsCSSValue mStretch; // NEW
};
struct nsCSSValueList {
nsCSSValueList(void);
~nsCSSValueList(void);
nsCSSValue mValue;
nsCSSValueList* mNext;
};
struct nsCSSColor : public nsCSSStruct {
nsCSSColor(void);
~nsCSSColor(void);
const nsID& GetID(void);
void List(FILE* out = stdout, PRInt32 aIndent = 0) const;
nsCSSValue mColor;
nsCSSValue mBackColor;
nsCSSValue mBackImage;
nsCSSValue mBackRepeat;
nsCSSValue mBackAttachment;
nsCSSValue mBackPositionX;
nsCSSValue mBackPositionY;
nsCSSValue mBackFilter;
nsCSSValue mCursor;
nsCSSValue mCursorImage;
nsCSSValue mOpacity;
nsCSSValue mColor;
nsCSSValue mBackColor;
nsCSSValue mBackImage;
nsCSSValue mBackRepeat;
nsCSSValue mBackAttachment;
nsCSSValue mBackPositionX;
nsCSSValue mBackPositionY;
nsCSSValue mBackFilter;
nsCSSValueList* mCursor;
nsCSSValue mOpacity;
};
struct nsCSSShadow {
@ -220,7 +229,8 @@ struct nsCSSTable : public nsCSSStruct { // NEW
void List(FILE* out = stdout, PRInt32 aIndent = 0) const;
nsCSSValue mBorderCollapse;
nsCSSValue mBorderSpacing;
nsCSSValue mBorderSpacingX;
nsCSSValue mBorderSpacingY;
nsCSSValue mCaptionSide;
nsCSSValue mEmptyCells;
nsCSSValue mLayout;
@ -243,18 +253,39 @@ struct nsCSSPage : public nsCSSStruct { // NEW
void List(FILE* out = stdout, PRInt32 aIndent = 0) const;
nsCSSValue mMarks;
nsCSSValue mSize;
nsCSSValue mSizeWidth;
nsCSSValue mSizeHeight;
};
struct nsCSSCounterData {
nsCSSCounterData(void);
~nsCSSCounterData(void);
nsCSSValue mCounter;
nsCSSValue mValue;
nsCSSCounterData* mNext;
};
struct nsCSSQuotes {
nsCSSQuotes(void);
~nsCSSQuotes(void);
nsCSSValue mOpen;
nsCSSValue mClose;
nsCSSQuotes* mNext;
};
struct nsCSSContent : public nsCSSStruct { // NEW
nsCSSContent(void);
~nsCSSContent(void);
const nsID& GetID(void);
void List(FILE* out = stdout, PRInt32 aIndent = 0) const;
nsCSSValue mContent;
nsCSSValue mCounterIncrement;
nsCSSValue mCounterReset;
nsCSSValue mMarkerOffset;
nsCSSValue mQuotes;
nsCSSValueList* mContent;
nsCSSCounterData* mCounterIncrement;
nsCSSCounterData* mCounterReset;
nsCSSValue mMarkerOffset;
nsCSSQuotes* mQuotes;
};
struct nsCSSAural : public nsCSSStruct { // NEW
@ -270,6 +301,7 @@ struct nsCSSAural : public nsCSSStruct { // NEW
nsCSSValue mPitch;
nsCSSValue mPitchRange;
nsCSSValue mPlayDuring;
nsCSSValue mPlayDuringFlags;
nsCSSValue mRichness;
nsCSSValue mSpeak;
nsCSSValue mSpeakHeader;

813
layout/style/nsCSSDeclaration.cpp
View File

File diff suppressed because it is too large Load Diff

2340
layout/style/nsCSSParser.cpp
View File

File diff suppressed because it is too large Load Diff

310
layout/style/nsCSSScanner.cpp
View File

@ -118,7 +118,7 @@ void nsCSSScanner::Close()
}
// Returns -1 on error or eof
PRInt32 nsCSSScanner::Read(PRInt32* aErrorCode)
PRInt32 nsCSSScanner::Read(PRInt32& aErrorCode)
{
PRInt32 rv;
if (0 < mPushbackCount) {
@ -129,8 +129,8 @@ PRInt32 nsCSSScanner::Read(PRInt32* aErrorCode)
}
if (mOffset == mCount) {
mOffset = 0;
*aErrorCode = mInput->Read(mBuffer, 0, BUFFER_SIZE, &mCount);
if (NS_FAILED(*aErrorCode)) {
aErrorCode = mInput->Read(mBuffer, 0, BUFFER_SIZE, &mCount);
if (NS_FAILED(aErrorCode)) {
mCount = 0;
return -1;
}
@ -142,13 +142,14 @@ PRInt32 nsCSSScanner::Read(PRInt32* aErrorCode)
return rv;
}
PRInt32 nsCSSScanner::Peek(PRInt32* aErrorCode)
PRInt32 nsCSSScanner::Peek(PRInt32& aErrorCode)
{
if (0 == mPushbackCount) {
mPushback[0] = Read(aErrorCode);
if (mPushback[0] < 0) {
PRInt32 ch = Read(aErrorCode);
if (ch < 0) {
return -1;
}
mPushback[0] = PRUnichar(ch);
mPushbackCount++;
}
//printf("Peek => %x\n", mLookAhead);
@ -179,7 +180,7 @@ void nsCSSScanner::Pushback(PRUnichar aChar)
mPushback[mPushbackCount++] = aChar;
}
PRBool nsCSSScanner::LookAhead(PRInt32* aErrorCode, PRUnichar aChar)
PRBool nsCSSScanner::LookAhead(PRInt32& aErrorCode, PRUnichar aChar)
{
PRInt32 ch = Read(aErrorCode);
if (ch < 0) {
@ -192,7 +193,7 @@ PRBool nsCSSScanner::LookAhead(PRInt32* aErrorCode, PRUnichar aChar)
return PR_FALSE;
}
PRBool nsCSSScanner::EatWhiteSpace(PRInt32* aErrorCode)
PRBool nsCSSScanner::EatWhiteSpace(PRInt32& aErrorCode)
{
PRBool eaten = PR_FALSE;
for (;;) {
@ -210,7 +211,7 @@ PRBool nsCSSScanner::EatWhiteSpace(PRInt32* aErrorCode)
return eaten;
}
PRBool nsCSSScanner::EatNewline(PRInt32* aErrorCode)
PRBool nsCSSScanner::EatNewline(PRInt32& aErrorCode)
{
PRInt32 ch = Read(aErrorCode);
if (ch < 0) {
@ -231,7 +232,7 @@ PRBool nsCSSScanner::EatNewline(PRInt32* aErrorCode)
return eaten;
}
PRBool nsCSSScanner::Next(PRInt32* aErrorCode, nsCSSToken* aToken)
PRBool nsCSSScanner::Next(PRInt32& aErrorCode, nsCSSToken& aToken)
{
PRInt32 ch = Read(aErrorCode);
if (ch < 0) {
@ -259,7 +260,8 @@ PRBool nsCSSScanner::Next(PRInt32* aErrorCode, nsCSSToken* aToken)
if ((ch == '.') || (ch == '+') || (ch == '-')) {
PRInt32 nextChar = Peek(aErrorCode);
if ((nextChar >= 0) && (nextChar <= 255)) {
if ((lexTable[nextChar] & IS_DIGIT) != 0) {
if (((lexTable[nextChar] & IS_DIGIT) != 0) ||
(('.' == nextChar) && ('.' != ch))) {
return ParseNumber(aErrorCode, ch, aToken);
}
}
@ -280,9 +282,9 @@ PRBool nsCSSScanner::Next(PRInt32* aErrorCode, nsCSSToken* aToken)
// WS
if ((lexTable[ch] & IS_WHITESPACE) != 0) {
aToken->mType = eCSSToken_WhiteSpace;
aToken->mIdent.SetLength(0);
aToken->mIdent.Append(PRUnichar(ch));
aToken.mType = eCSSToken_WhiteSpace;
aToken.mIdent.SetLength(0);
aToken.mIdent.Append(PRUnichar(ch));
(void) EatWhiteSpace(aErrorCode);
return PR_TRUE;
}
@ -290,15 +292,15 @@ PRBool nsCSSScanner::Next(PRInt32* aErrorCode, nsCSSToken* aToken)
PRInt32 nextChar = Peek(aErrorCode);
if (nextChar == '/') {
(void) Read(aErrorCode);
aToken->mIdent.SetLength(0);
aToken->mIdent.Append(PRUnichar(ch));
aToken->mIdent.Append(PRUnichar(ch));
aToken.mIdent.SetLength(0);
aToken.mIdent.Append(PRUnichar(ch));
aToken.mIdent.Append(PRUnichar(ch));
return ParseEOLComment(aErrorCode, aToken);
} else if (nextChar == '*') {
(void) Read(aErrorCode);
aToken->mIdent.SetLength(0);
aToken->mIdent.Append(PRUnichar(ch));
aToken->mIdent.Append(PRUnichar(nextChar));
aToken.mIdent.SetLength(0);
aToken.mIdent.Append(PRUnichar(ch));
aToken.mIdent.Append(PRUnichar(nextChar));
return ParseCComment(aErrorCode, aToken);
}
}
@ -306,14 +308,14 @@ PRBool nsCSSScanner::Next(PRInt32* aErrorCode, nsCSSToken* aToken)
PRInt32 nextChar = Peek(aErrorCode);
if (nextChar == '!') {
(void) Read(aErrorCode);
aToken->mType = eCSSToken_WhiteSpace;
aToken->mIdent.SetLength(0);
aToken->mIdent.Append(PRUnichar(ch));
aToken->mIdent.Append(PRUnichar(nextChar));
aToken.mType = eCSSToken_WhiteSpace;
aToken.mIdent.SetLength(0);
aToken.mIdent.Append(PRUnichar(ch));
aToken.mIdent.Append(PRUnichar(nextChar));
nextChar = Peek(aErrorCode);
while ((0 < nextChar) && (nextChar == '-')) {
Read(aErrorCode);
aToken->mIdent.Append(PRUnichar(nextChar));
aToken.mIdent.Append(PRUnichar(nextChar));
nextChar = Peek(aErrorCode);
}
return PR_TRUE;
@ -337,15 +339,15 @@ PRBool nsCSSScanner::Next(PRInt32* aErrorCode, nsCSSToken* aToken)
}
if (nextChar == '>') { // HTML end
(void) Read(aErrorCode);
aToken->mType = eCSSToken_WhiteSpace;
aToken->mIdent.SetLength(0);
aToken.mType = eCSSToken_WhiteSpace;
aToken.mIdent.SetLength(0);
while (0 < dashCount--) {
aToken->mIdent.Append('-');
aToken.mIdent.Append('-');
}
if (white) {
aToken->mIdent.Append(' ');
aToken.mIdent.Append(' ');
}
aToken->mIdent.Append('>');
aToken.mIdent.Append('>');
return PR_TRUE;
}
else { // wasn't an end comment, push it all back
@ -359,12 +361,111 @@ PRBool nsCSSScanner::Next(PRInt32* aErrorCode, nsCSSToken* aToken)
}
}
}
aToken->mType = eCSSToken_Symbol;
aToken->mSymbol = ch;
aToken.mType = eCSSToken_Symbol;
aToken.mSymbol = ch;
return PR_TRUE;
}
PRInt32 nsCSSScanner::ParseEscape(PRInt32* aErrorCode)
PRBool nsCSSScanner::NextURL(PRInt32& aErrorCode, nsCSSToken& aToken)
{
PRInt32 ch = Read(aErrorCode);
if (ch < 0) {
return PR_FALSE;
}
if (ch < 256) {
PRUint8* lexTable = gLexTable;
// STRING
if ((ch == '"') || (ch == '\'')) {
return ParseString(aErrorCode, ch, aToken);
}
// WS
if ((lexTable[ch] & IS_WHITESPACE) != 0) {
aToken.mType = eCSSToken_WhiteSpace;
aToken.mIdent.SetLength(0);
aToken.mIdent.Append(PRUnichar(ch));
(void) EatWhiteSpace(aErrorCode);
return PR_TRUE;
}
if (ch == '/') {
PRInt32 nextChar = Peek(aErrorCode);
if (nextChar == '/') {
(void) Read(aErrorCode);
aToken.mIdent.SetLength(0);
aToken.mIdent.Append(PRUnichar(ch));
aToken.mIdent.Append(PRUnichar(ch));
return ParseEOLComment(aErrorCode, aToken);
} else if (nextChar == '*') {
(void) Read(aErrorCode);
aToken.mIdent.SetLength(0);
aToken.mIdent.Append(PRUnichar(ch));
aToken.mIdent.Append(PRUnichar(nextChar));
return ParseCComment(aErrorCode, aToken);
}
}
// Process a url lexical token. A CSS1 url token can contain
// characters beyond identifier characters (e.g. '/', ':', etc.)
// Because of this the normal rules for tokenizing the input don't
// apply very well. To simplify the parser and relax some of the
// requirements on the scanner we parse url's here. If we find a
// malformed URL then we emit a token of type "InvalidURL" so that
// the CSS1 parser can ignore the invalid input. We attempt to eat
// the right amount of input data when an invalid URL is presented.
aToken.mType = eCSSToken_InvalidURL;
nsString& ident = aToken.mIdent;
ident.SetLength(0);
if (ch == ')') {
Unread();
// empty url spec: this is invalid
} else {
// start of a non-quoted url
Unread();
PRBool ok = PR_TRUE;
for (;;) {
ch = Read(aErrorCode);
if (ch < 0) break;
if (ch == CSS_ESCAPE) {
ch = ParseEscape(aErrorCode);
ident.Append(PRUnichar(ch));
} else if ((ch == '"') || (ch == '\'') || (ch == '(')) {
// This is an invalid URL spec
ok = PR_FALSE;
} else if ((256 >= ch) && ((gLexTable[ch] & IS_WHITESPACE) != 0)) {
// Whitespace is allowed at the end of the URL
(void) EatWhiteSpace(aErrorCode);
if (LookAhead(aErrorCode, ')')) {
// done!
break;
}
// Whitespace is followed by something other than a
// ")". This is an invalid url spec.
ok = PR_FALSE;
} else if (ch == ')') {
Unread();
// All done
break;
} else {
// A regular url character.
ident.Append(PRUnichar(ch));
}
}
// If the result of the above scanning is ok then change the token
// type to a useful one.
if (ok) {
aToken.mType = eCSSToken_URL;
}
}
}
return PR_TRUE;
}
PRInt32 nsCSSScanner::ParseEscape(PRInt32& aErrorCode)
{
PRUint8* lexTable = gLexTable;
PRInt32 ch = Peek(aErrorCode);
@ -410,7 +511,7 @@ PRInt32 nsCSSScanner::ParseEscape(PRInt32* aErrorCode)
* until the first non-identifier character is seen. The termination
* character is unread for the future re-reading.
*/
PRBool nsCSSScanner::GatherIdent(PRInt32* aErrorCode, PRInt32 aChar,
PRBool nsCSSScanner::GatherIdent(PRInt32& aErrorCode, PRInt32 aChar,
nsString& aIdent)
{
if (aChar == CSS_ESCAPE) {
@ -432,111 +533,48 @@ PRBool nsCSSScanner::GatherIdent(PRInt32* aErrorCode, PRInt32 aChar,
return PR_TRUE;
}
PRBool nsCSSScanner::ParseID(PRInt32* aErrorCode,
PRBool nsCSSScanner::ParseID(PRInt32& aErrorCode,
PRInt32 aChar,
nsCSSToken* aToken)
nsCSSToken& aToken)
{
aToken->mIdent.SetLength(0);
aToken->mType = eCSSToken_ID;
return GatherIdent(aErrorCode, aChar, aToken->mIdent);
aToken.mIdent.SetLength(0);
aToken.mType = eCSSToken_ID;
return GatherIdent(aErrorCode, aChar, aToken.mIdent);
}
PRBool nsCSSScanner::ParseIdent(PRInt32* aErrorCode,
PRBool nsCSSScanner::ParseIdent(PRInt32& aErrorCode,
PRInt32 aChar,
nsCSSToken* aToken)
nsCSSToken& aToken)
{
nsString& ident = aToken->mIdent;
nsString& ident = aToken.mIdent;
ident.SetLength(0);
ident.Append(PRUnichar(aChar));
if (!GatherIdent(aErrorCode, aChar, ident)) {
return PR_FALSE;
}
// Process a url lexical token. A CSS1 url token can contain
// characters beyond identifier characters (e.g. '/', ':', etc.)
// Because of this the normal rules for tokenizing the input don't
// apply very well. To simplify the parser and relax some of the
// requirements on the scanner we parse url's here. If we find a
// malformed URL then we emit a token of type "InvalidURL" so that
// the CSS1 parser can ignore the invalid input. We attempt to eat
// the right amount of input data when an invalid URL is presented.
nsCSSTokenType tokenType = eCSSToken_Ident;
if (ident.EqualsIgnoreCase("url")) {
tokenType = eCSSToken_InvalidURL;
if (LookAhead(aErrorCode, '(')) {
// Skip leading whitespace
(void) EatWhiteSpace(aErrorCode);
ident.SetLength(0);
PRInt32 c = Read(aErrorCode);
if (c == ')') {
// empty url spec: this is invalid
} else if ((c == '"') || (c == '\'')) {
// start of a quoted url
if (!GatherString(aErrorCode, c, ident)) {
return PR_FALSE;
}
// Whitespace is allowed at the end of the URL before the right paren
(void) EatWhiteSpace(aErrorCode);
if (LookAhead(aErrorCode, ')')) {
tokenType = eCSSToken_URL;
}
} else {
// start of a non-quoted url
Unread();
PRBool ok = PR_TRUE;
for (;;) {
c = Read(aErrorCode);
if (c < 0) break;
if (c == CSS_ESCAPE) {
c = ParseEscape(aErrorCode);
ident.Append(PRUnichar(c));
} else if ((c == '"') || (c == '\'') || (c == '(')) {
// This is an invalid URL spec
ok = PR_FALSE;
} else if ((256 >= c) && ((gLexTable[c] & IS_WHITESPACE) != 0)) {
// Whitespace is allowed at the end of the URL
(void) EatWhiteSpace(aErrorCode);
if (LookAhead(aErrorCode, ')')) {
// done!
break;
}
// Whitespace is followed by something other than a
// ")". This is an invalid url spec.
ok = PR_FALSE;
} else if (c == ')') {
// All done
break;
} else {
// A regular url character.
ident.Append(PRUnichar(c));
}
}
// If the result of the above scanning is ok then change the token
// type to a useful one.
if (ok) {
tokenType = eCSSToken_URL;
}
}
}
// look for functions (ie: "ident(")
if (PRUnichar('(') == PRUnichar(Peek(aErrorCode))) { // this is a function definition
tokenType = eCSSToken_Function;
}
aToken->mType = tokenType;
aToken.mType = tokenType;
return PR_TRUE;
}
PRBool nsCSSScanner::ParseAtKeyword(PRInt32* aErrorCode, PRInt32 aChar,
nsCSSToken* aToken)
PRBool nsCSSScanner::ParseAtKeyword(PRInt32& aErrorCode, PRInt32 aChar,
nsCSSToken& aToken)
{
aToken->mIdent.SetLength(0);
aToken->mType = eCSSToken_AtKeyword;
return GatherIdent(aErrorCode, aChar, aToken->mIdent);
aToken.mIdent.SetLength(0);
aToken.mType = eCSSToken_AtKeyword;
return GatherIdent(aErrorCode, aChar, aToken.mIdent);
}
PRBool nsCSSScanner::ParseNumber(PRInt32* aErrorCode, PRInt32 c,
nsCSSToken* aToken)
PRBool nsCSSScanner::ParseNumber(PRInt32& aErrorCode, PRInt32 c,
nsCSSToken& aToken)
{
nsString& ident = aToken->mIdent;
nsString& ident = aToken.mIdent;
ident.SetLength(0);
PRBool gotDot = (c == '.') ? PR_TRUE : PR_FALSE;
if (c != '+') {
@ -562,7 +600,7 @@ PRBool nsCSSScanner::ParseNumber(PRInt32* aErrorCode, PRInt32 c,
float value = ident.ToFloat(&ec);
// Look at character that terminated the number
aToken->mIntegerValid = PR_FALSE;
aToken.mIntegerValid = PR_FALSE;
if (c >= 0) {
if ((c <= 255) && ((lexTable[c] & START_IDENT) != 0)) {
ident.SetLength(0);
@ -578,20 +616,20 @@ PRBool nsCSSScanner::ParseNumber(PRInt32* aErrorCode, PRInt32 c,
// Put back character that stopped numeric scan
Unread();
if (!gotDot) {
aToken->mInteger = ident.ToInteger(&ec);
aToken->mIntegerValid = PR_TRUE;
aToken.mInteger = ident.ToInteger(&ec);
aToken.mIntegerValid = PR_TRUE;
}
ident.SetLength(0);
}
}
aToken->mNumber = value;
aToken->mType = type;
aToken.mNumber = value;
aToken.mType = type;
return PR_TRUE;
}
PRBool nsCSSScanner::ParseCComment(PRInt32* aErrorCode, nsCSSToken* aToken)
PRBool nsCSSScanner::ParseCComment(PRInt32& aErrorCode, nsCSSToken& aToken)
{
nsString& ident = aToken->mIdent;
nsString& ident = aToken.mIdent;
for (;;) {
PRInt32 ch = Read(aErrorCode);
if (ch < 0) break;
@ -606,13 +644,13 @@ PRBool nsCSSScanner::ParseCComment(PRInt32* aErrorCode, nsCSSToken* aToken)
ident.Append(PRUnichar(ch));
#endif
}
aToken->mType = eCSSToken_WhiteSpace;
aToken.mType = eCSSToken_WhiteSpace;
return PR_TRUE;
}
PRBool nsCSSScanner::ParseEOLComment(PRInt32* aErrorCode, nsCSSToken* aToken)
PRBool nsCSSScanner::ParseEOLComment(PRInt32& aErrorCode, nsCSSToken& aToken)
{
nsString& ident = aToken->mIdent;
nsString& ident = aToken.mIdent;
ident.SetLength(0);
for (;;) {
if (EatNewline(aErrorCode)) {
@ -626,11 +664,11 @@ PRBool nsCSSScanner::ParseEOLComment(PRInt32* aErrorCode, nsCSSToken* aToken)
ident.Append(PRUnichar(ch));
#endif
}
aToken->mType = eCSSToken_WhiteSpace;
aToken.mType = eCSSToken_WhiteSpace;
return PR_TRUE;
}
PRBool nsCSSScanner::GatherString(PRInt32* aErrorCode, PRInt32 aStop,
PRBool nsCSSScanner::GatherString(PRInt32& aErrorCode, PRInt32 aStop,
nsString& aBuffer)
{
for (;;) {
@ -652,11 +690,11 @@ PRBool nsCSSScanner::GatherString(PRInt32* aErrorCode, PRInt32 aStop,
return PR_TRUE;
}
PRBool nsCSSScanner::ParseString(PRInt32* aErrorCode, PRInt32 aStop,
nsCSSToken* aToken)
PRBool nsCSSScanner::ParseString(PRInt32& aErrorCode, PRInt32 aStop,
nsCSSToken& aToken)
{
aToken->mIdent.SetLength(0);
aToken->mType = eCSSToken_String;
aToken->mSymbol = PRUnichar(aStop); // remember how it's quoted
return GatherString(aErrorCode, aStop, aToken->mIdent);
aToken.mIdent.SetLength(0);
aToken.mType = eCSSToken_String;
aToken.mSymbol = PRUnichar(aStop); // remember how it's quoted
return GatherString(aErrorCode, aStop, aToken.mIdent);
}

76
layout/style/nsCSSScanner.h
View File

@ -24,40 +24,43 @@ class nsIUnicharInputStream;
// Token types
enum nsCSSTokenType {
// A css identifier (e.g. foo)
eCSSToken_Ident = 0,
eCSSToken_Ident = 0, // mIdent
// A css at keyword (e.g. @foo)
eCSSToken_AtKeyword = 1,
eCSSToken_AtKeyword = 1, // mIdent
// A css number without a percentage or dimension; with percentage;
// without percentage but with a dimension
eCSSToken_Number = 2,
eCSSToken_Percentage = 3,
eCSSToken_Dimension = 4,
eCSSToken_Number = 2, // mNumber
eCSSToken_Percentage = 3, // mNumber
eCSSToken_Dimension = 4, // mNumber + mIdent
// A css string (e.g. "foo" or 'foo')
eCSSToken_String = 5,
eCSSToken_String = 5, // mSymbol + mIdent + mSymbol
// Whitespace (e.g. " " or "/* abc */" or "// foo <eol>")
eCSSToken_WhiteSpace = 6,
eCSSToken_WhiteSpace = 6, // mIdent
// A css symbol (e.g. ':', ';', '+', etc.)
eCSSToken_Symbol = 7,
eCSSToken_URL = 8, // use getString
eCSSToken_InvalidURL = 9, // doesn't matter
eCSSToken_Symbol = 7, // mSymbol
// A css1 id (e.g. #foo3)
eCSSToken_ID = 10, // use getString()
eCSSToken_ID = 8, // mIdent
eCSSToken_Function = 9, // mIdent
eCSSToken_URL = 10, // mIdent
eCSSToken_InvalidURL = 11, // doesn't matter
};
struct nsCSSToken {
nsCSSTokenType mType;
nsAutoString mIdent;
float mNumber;
PRInt32 mInteger;
PRUnichar mSymbol;
PRBool mIntegerValid;
nsCSSTokenType mType;
nsAutoString mIdent;
float mNumber;
PRInt32 mInteger;
PRBool mIntegerValid;
PRUnichar mSymbol;
nsCSSToken();
@ -82,31 +85,34 @@ class nsCSSScanner {
// Get the next token. Return nsfalse on EOF or ERROR. aTokenResult
// is filled in with the data for the token.
PRBool Next(PRInt32* aErrorCode, nsCSSToken* aTokenResult);
PRBool Next(PRInt32& aErrorCode, nsCSSToken& aTokenResult);
// Get the next token that may be a string or unquoted URL or whitespace
PRBool NextURL(PRInt32& aErrorCode, nsCSSToken& aTokenResult);
protected:
void Close();
PRInt32 Read(PRInt32* aErrorCode);
PRInt32 Peek(PRInt32* aErrorCode);
PRInt32 Read(PRInt32& aErrorCode);
PRInt32 Peek(PRInt32& aErrorCode);
void Unread();
void Pushback(PRUnichar aChar);
PRBool LookAhead(PRInt32* aErrorCode, PRUnichar aChar);
PRBool EatWhiteSpace(PRInt32* aErrorCode);
PRBool EatNewline(PRInt32* aErrorCode);
PRBool LookAhead(PRInt32& aErrorCode, PRUnichar aChar);
PRBool EatWhiteSpace(PRInt32& aErrorCode);
PRBool EatNewline(PRInt32& aErrorCode);
PRInt32 ParseEscape(PRInt32* aErrorCode);
PRBool ParseIdent(PRInt32* aErrorCode, PRInt32 aChar, nsCSSToken* aResult);
PRBool ParseAtKeyword(PRInt32* aErrorCode, PRInt32 aChar,
nsCSSToken* aResult);
PRBool ParseNumber(PRInt32* aErrorCode, PRInt32 aChar, nsCSSToken* aResult);
PRBool ParseID(PRInt32* aErrorCode, PRInt32 aChar, nsCSSToken* aResult);
PRBool ParseString(PRInt32* aErrorCode, PRInt32 aChar, nsCSSToken* aResult);
PRBool ParseEOLComment(PRInt32* aErrorCode, nsCSSToken* aResult);
PRBool ParseCComment(PRInt32* aErrorCode, nsCSSToken* aResult);
PRInt32 ParseEscape(PRInt32& aErrorCode);
PRBool ParseIdent(PRInt32& aErrorCode, PRInt32 aChar, nsCSSToken& aResult);
PRBool ParseAtKeyword(PRInt32& aErrorCode, PRInt32 aChar,
nsCSSToken& aResult);
PRBool ParseNumber(PRInt32& aErrorCode, PRInt32 aChar, nsCSSToken& aResult);
PRBool ParseID(PRInt32& aErrorCode, PRInt32 aChar, nsCSSToken& aResult);
PRBool ParseString(PRInt32& aErrorCode, PRInt32 aChar, nsCSSToken& aResult);
PRBool ParseEOLComment(PRInt32& aErrorCode, nsCSSToken& aResult);
PRBool ParseCComment(PRInt32& aErrorCode, nsCSSToken& aResult);
PRBool GatherString(PRInt32* aErrorCode, PRInt32 aStop,
PRBool GatherString(PRInt32& aErrorCode, PRInt32 aStop,
nsString& aString);
PRBool GatherIdent(PRInt32* aErrorCode, PRInt32 aChar, nsString& aIdent);
PRBool GatherIdent(PRInt32& aErrorCode, PRInt32 aChar, nsString& aIdent);
nsIUnicharInputStream* mInput;
PRUnichar* mBuffer;

813
layout/style/nsCSSStruct.cpp
View File

File diff suppressed because it is too large Load Diff