[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
hyatt
hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:17:36 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit b162ced6d5cd800d4f62349447579697c4dd36fc
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 10 21:14:01 2003 +0000
Rename -apple-aqua to auto for outline styles.
Reviewed by darin
* khtml/css/cssparser.cpp:
(CSSParser::parseValue):
* khtml/css/cssstyleselector.cpp:
(khtml::CSSStyleSelector::applyRule):
* khtml/css/cssvalues.c:
(hash_val):
(findValue):
* khtml/css/cssvalues.h:
* khtml/css/cssvalues.in:
* khtml/css/html4.css:
* khtml/rendering/render_inline.cpp:
(RenderInline::paintObject):
* khtml/rendering/render_object.cpp:
(RenderObject::drawBorder):
(RenderObject::paintOutline):
* khtml/rendering/render_style.h:
(khtml::):
(khtml::OutlineValue::OutlineValue):
(khtml::RenderStyle::outlineStyleIsAuto):
(khtml::RenderStyle::outlineOffset):
(khtml::RenderStyle::setOutlineStyle):
(khtml::RenderStyle::setOutlineOffset):
* kwq/KWQRenderTreeDebug.cpp:
(printBorderStyle):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5742 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 65199f4..58cf534 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,34 @@
+2003-12-09 David Hyatt <hyatt at apple.com>
+
+ Rename -apple-aqua to auto for outline styles.
+
+ Reviewed by darin
+
+ * khtml/css/cssparser.cpp:
+ (CSSParser::parseValue):
+ * khtml/css/cssstyleselector.cpp:
+ (khtml::CSSStyleSelector::applyRule):
+ * khtml/css/cssvalues.c:
+ (hash_val):
+ (findValue):
+ * khtml/css/cssvalues.h:
+ * khtml/css/cssvalues.in:
+ * khtml/css/html4.css:
+ * khtml/rendering/render_inline.cpp:
+ (RenderInline::paintObject):
+ * khtml/rendering/render_object.cpp:
+ (RenderObject::drawBorder):
+ (RenderObject::paintOutline):
+ * khtml/rendering/render_style.h:
+ (khtml::):
+ (khtml::OutlineValue::OutlineValue):
+ (khtml::RenderStyle::outlineStyleIsAuto):
+ (khtml::RenderStyle::outlineOffset):
+ (khtml::RenderStyle::setOutlineStyle):
+ (khtml::RenderStyle::setOutlineOffset):
+ * kwq/KWQRenderTreeDebug.cpp:
+ (printBorderStyle):
+
2003-12-09 Maciej Stachowiak <mjs at apple.com>
Reviewed by John.
diff --git a/WebCore/khtml/css/cssparser.cpp b/WebCore/khtml/css/cssparser.cpp
index fd1d13b..4a06beb 100644
--- a/WebCore/khtml/css/cssparser.cpp
+++ b/WebCore/khtml/css/cssparser.cpp
@@ -567,12 +567,16 @@ bool CSSParser::parseValue( int propId, bool important )
valid_primitive = true;
break;
- case CSS_PROP_OUTLINE_STYLE: // <border-style> | inherit
+ case CSS_PROP_OUTLINE_STYLE: // <border-style> | auto | inherit
+ if (id == CSS_VAL_AUTO) {
+ valid_primitive = true;
+ break;
+ } // Fall through!
case CSS_PROP_BORDER_TOP_STYLE: //// <border-style> | inherit
case CSS_PROP_BORDER_RIGHT_STYLE: // Defined as: none | hidden | dotted | dashed |
case CSS_PROP_BORDER_BOTTOM_STYLE: // solid | double | groove | ridge | inset | outset
case CSS_PROP_BORDER_LEFT_STYLE: ////
- if (id >= CSS_VAL_NONE && id <= CSS_VAL__APPLE_AQUA)
+ if (id >= CSS_VAL_NONE && id <= CSS_VAL_DOUBLE)
valid_primitive = true;
break;
diff --git a/WebCore/khtml/css/cssstyleselector.cpp b/WebCore/khtml/css/cssstyleselector.cpp
index 2b8b569..02a199e 100644
--- a/WebCore/khtml/css/cssstyleselector.cpp
+++ b/WebCore/khtml/css/cssstyleselector.cpp
@@ -1701,7 +1701,10 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
case CSS_PROP_OUTLINE_STYLE:
HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(outlineStyle, OutlineStyle, BorderStyle)
if (!primitiveValue) return;
- style->setOutlineStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL_NONE));
+ if (primitiveValue->getIdent() == CSS_VAL_AUTO)
+ style->setOutlineStyle(DOTTED, true);
+ else
+ style->setOutlineStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL_NONE));
break;
case CSS_PROP_CAPTION_SIDE:
{
diff --git a/WebCore/khtml/css/cssvalues.c b/WebCore/khtml/css/cssvalues.c
index 1b07bc5..eb0464d 100644
--- a/WebCore/khtml/css/cssvalues.c
+++ b/WebCore/khtml/css/cssvalues.c
@@ -7,7 +7,7 @@ struct css_value {
const char *name;
int id;
};
-/* maximum key range = 1698, duplicates = 2 */
+/* maximum key range = 1641, duplicates = 1 */
#ifdef __GNUC__
__inline
@@ -21,32 +21,32 @@ hash_val (register const char *str, register unsigned int len)
{
static const unsigned short asso_values[] =
{
- 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698,
- 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698,
- 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698,
- 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698,
- 1698, 1698, 1698, 1698, 1698, 30, 1698, 1698, 0, 5,
- 10, 15, 20, 25, 30, 35, 40, 0, 1698, 1698,
- 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698,
- 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698,
- 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698,
- 1698, 1698, 1698, 1698, 1698, 1698, 1698, 0, 14, 30,
- 15, 195, 219, 247, 85, 65, 0, 194, 0, 117,
- 25, 120, 150, 50, 4, 5, 0, 249, 73, 194,
- 200, 5, 100, 1698, 1698, 1698, 1698, 1698, 1698, 1698,
- 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698,
- 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698,
- 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698,
- 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698,
- 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698,
- 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698,
- 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698,
- 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698,
- 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698,
- 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698,
- 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698,
- 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698,
- 1698, 1698, 1698, 1698, 1698, 1698
+ 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641,
+ 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641,
+ 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641,
+ 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641,
+ 1641, 1641, 1641, 1641, 1641, 30, 1641, 1641, 0, 10,
+ 15, 20, 25, 30, 35, 40, 5, 0, 1641, 1641,
+ 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641,
+ 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641,
+ 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641,
+ 1641, 1641, 1641, 1641, 1641, 1641, 1641, 0, 87, 30,
+ 196, 195, 102, 9, 85, 65, 10, 203, 0, 19,
+ 25, 180, 104, 5, 4, 5, 0, 185, 184, 85,
+ 35, 5, 120, 1641, 1641, 1641, 1641, 1641, 1641, 1641,
+ 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641,
+ 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641,
+ 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641,
+ 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641,
+ 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641,
+ 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641,
+ 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641,
+ 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641,
+ 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641,
+ 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641,
+ 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641,
+ 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641,
+ 1641, 1641, 1641, 1641, 1641, 1641
};
register int hval = 0;
@@ -110,11 +110,11 @@ findValue (register const char *str, register unsigned int len)
{
enum
{
- TOTAL_KEYWORDS = 253,
+ TOTAL_KEYWORDS = 252,
MIN_WORD_LENGTH = 2,
MAX_WORD_LENGTH = 22,
MIN_HASH_VALUE = 0,
- MAX_HASH_VALUE = 1697
+ MAX_HASH_VALUE = 1640
};
static const struct css_value wordlist_value[] =
@@ -122,444 +122,433 @@ findValue (register const char *str, register unsigned int len)
{"900", CSS_VAL_900},
{"ltr", CSS_VAL_LTR},
{"rtl", CSS_VAL_RTL},
- {"100", CSS_VAL_100},
+ {"800", CSS_VAL_800},
{"start", CSS_VAL_START},
+ {"100", CSS_VAL_100},
{"200", CSS_VAL_200},
+ {"gray", CSS_VAL_GRAY},
{"300", CSS_VAL_300},
+ {"small", CSS_VAL_SMALL},
{"400", CSS_VAL_400},
{"500", CSS_VAL_500},
{"600", CSS_VAL_600},
{"700", CSS_VAL_700},
- {"800", CSS_VAL_800},
+ {"x-small", CSS_VAL_X_SMALL},
+ {"always", CSS_VAL_ALWAYS},
{"static", CSS_VAL_STATIC},
- {"navy", CSS_VAL_NAVY},
- {"disc", CSS_VAL_DISC},
- {"small", CSS_VAL_SMALL},
- {"hand", CSS_VAL_HAND},
- {"bold", CSS_VAL_BOLD},
- {"scroll", CSS_VAL_SCROLL},
+ {"fast", CSS_VAL_FAST},
+ {"mix", CSS_VAL_MIX},
+ {"xx-small", CSS_VAL_XX_SMALL},
+ {"fantasy", CSS_VAL_FANTASY},
+ {"wait", CSS_VAL_WAIT},
{"italic", CSS_VAL_ITALIC},
- {"cross", CSS_VAL_CROSS},
+ {"right", CSS_VAL_RIGHT},
{"thin", CSS_VAL_THIN},
- {"scrollbar", CSS_VAL_SCROLLBAR},
+ {"hiragana", CSS_VAL_HIRAGANA},
+ {"aqua", CSS_VAL_AQUA},
+ {"small-caps", CSS_VAL_SMALL_CAPS},
{"teal", CSS_VAL_TEAL},
- {"always", CSS_VAL_ALWAYS},
- {"solid", CSS_VAL_SOLID},
- {"table", CSS_VAL_TABLE},
- {"red", CSS_VAL_RED},
- {"both", CSS_VAL_BOTH},
+ {"large", CSS_VAL_LARGE},
+ {"larger", CSS_VAL_LARGER},
+ {"grey", CSS_VAL_GREY},
+ {"navy", CSS_VAL_NAVY},
+ {"scroll", CSS_VAL_SCROLL},
{"initial", CSS_VAL_INITIAL},
- {"fast", CSS_VAL_FAST},
- {"end", CSS_VAL_END},
- {"black", CSS_VAL_BLACK},
- {"icon", CSS_VAL_ICON},
- {"fantasy", CSS_VAL_FANTASY},
- {"gray", CSS_VAL_GRAY},
- {"wait", CSS_VAL_WAIT},
+ {"smaller", CSS_VAL_SMALLER},
+ {"cross", CSS_VAL_CROSS},
{"normal", CSS_VAL_NORMAL},
+ {"text", CSS_VAL_TEXT},
+ {"graytext", CSS_VAL_GRAYTEXT},
+ {"slow", CSS_VAL_SLOW},
+ {"x-large", CSS_VAL_X_LARGE},
{"sub", CSS_VAL_SUB},
+ {"lime", CSS_VAL_LIME},
+ {"table", CSS_VAL_TABLE},
{"top", CSS_VAL_TOP},
- {"avoid", CSS_VAL_AVOID},
- {"slide", CSS_VAL_SLIDE},
+ {"up", CSS_VAL_UP},
{"inset", CSS_VAL_INSET},
- {"ahead", CSS_VAL_AHEAD},
- {"blink", CSS_VAL_BLINK},
- {"aqua", CSS_VAL_AQUA},
- {"crop", CSS_VAL_CROP},
+ {"disc", CSS_VAL_DISC},
+ {"left", CSS_VAL_LEFT},
+ {"single", CSS_VAL_SINGLE},
+ {"icon", CSS_VAL_ICON},
+ {"pre", CSS_VAL_PRE},
+ {"hand", CSS_VAL_HAND},
+ {"xx-large", CSS_VAL_XX_LARGE},
+ {"scrollbar", CSS_VAL_SCROLLBAR},
{"status-bar", CSS_VAL_STATUS_BAR},
- {"dashed", CSS_VAL_DASHED},
- {"crosshair", CSS_VAL_CROSSHAIR},
+ {"crop", CSS_VAL_CROP},
{"stretch", CSS_VAL_STRETCH},
- {"slow", CSS_VAL_SLOW},
- {"smaller", CSS_VAL_SMALLER},
+ {"black", CSS_VAL_BLACK},
{"circle", CSS_VAL_CIRCLE},
- {"small-caps", CSS_VAL_SMALL_CAPS},
- {"silver", CSS_VAL_SILVER},
+ {"armenian", CSS_VAL_ARMENIAN},
+ {"run-in", CSS_VAL_RUN_IN},
+ {"both", CSS_VAL_BOTH},
+ {"show", CSS_VAL_SHOW},
{"portrait", CSS_VAL_PORTRAIT},
- {"dotted", CSS_VAL_DOTTED},
- {"bolder", CSS_VAL_BOLDER},
- {"pre", CSS_VAL_PRE},
- {"x-small", CSS_VAL_X_SMALL},
- {"down", CSS_VAL_DOWN},
- {"block", CSS_VAL_BLOCK},
- {"hide", CSS_VAL_HIDE},
- {"invert", CSS_VAL_INVERT},
- {"none", CSS_VAL_NONE},
- {"vertical", CSS_VAL_VERTICAL},
+ {"lighter", CSS_VAL_LIGHTER},
+ {"transparent", CSS_VAL_TRANSPARENT},
+ {"compact", CSS_VAL_COMPACT},
{"auto", CSS_VAL_AUTO},
- {"inside", CSS_VAL_INSIDE},
- {"bottom", CSS_VAL_BOTTOM},
- {"thick", CSS_VAL_THICK},
+ {"serif", CSS_VAL_SERIF},
+ {"justify", CSS_VAL_JUSTIFY},
{"inline", CSS_VAL_INLINE},
- {"lime", CSS_VAL_LIME},
- {"mix", CSS_VAL_MIX},
- {"loud", CSS_VAL_LOUD},
- {"maroon", CSS_VAL_MAROON},
+ {"crosshair", CSS_VAL_CROSSHAIR},
+ {"list-item", CSS_VAL_LIST_ITEM},
+ {"blink", CSS_VAL_BLINK},
+ {"thick", CSS_VAL_THICK},
+ {"help", CSS_VAL_HELP},
+ {"square", CSS_VAL_SQUARE},
+ {"red", CSS_VAL_RED},
+ {"nowrap", CSS_VAL_NOWRAP},
+ {"highlight", CSS_VAL_HIGHLIGHT},
{"caption", CSS_VAL_CAPTION},
- {"text", CSS_VAL_TEXT},
- {"run-in", CSS_VAL_RUN_IN},
- {"up", CSS_VAL_UP},
- {"hidden", CSS_VAL_HIDDEN},
- {"right", CSS_VAL_RIGHT},
- {"above", CSS_VAL_ABOVE},
- {"show", CSS_VAL_SHOW},
- {"middle", CSS_VAL_MIDDLE},
- {"transparent", CSS_VAL_TRANSPARENT},
- {"katakana", CSS_VAL_KATAKANA},
- {"left", CSS_VAL_LEFT},
- {"visible", CSS_VAL_VISIBLE},
+ {"maroon", CSS_VAL_MAROON},
+ {"orange", CSS_VAL_ORANGE},
+ {"end", CSS_VAL_END},
{"alternate", CSS_VAL_ALTERNATE},
- {"landscape", CSS_VAL_LANDSCAPE},
- {"decimal", CSS_VAL_DECIMAL},
- {"hiragana", CSS_VAL_HIRAGANA},
- {"help", CSS_VAL_HELP},
- {"armenian", CSS_VAL_ARMENIAN},
+ {"menu", CSS_VAL_MENU},
+ {"none", CSS_VAL_NONE},
+ {"green", CSS_VAL_GREEN},
+ {"white", CSS_VAL_WHITE},
+ {"katakana", CSS_VAL_KATAKANA},
+ {"sans-serif", CSS_VAL_SANS_SERIF},
{"inherit", CSS_VAL_INHERIT},
- {"large", CSS_VAL_LARGE},
- {"compact", CSS_VAL_COMPACT},
+ {"higher", CSS_VAL_HIGHER},
+ {"solid", CSS_VAL_SOLID},
{"center", CSS_VAL_CENTER},
- {"larger", CSS_VAL_LARGER},
- {"grey", CSS_VAL_GREY},
- {"olive", CSS_VAL_OLIVE},
- {"backwards", CSS_VAL_BACKWARDS},
- {"blue", CSS_VAL_BLUE},
- {"level", CSS_VAL_LEVEL},
- {"table-cell", CSS_VAL_TABLE_CELL},
- {"wider", CSS_VAL_WIDER},
- {"list-item", CSS_VAL_LIST_ITEM},
- {"serif", CSS_VAL_SERIF},
- {"nowrap", CSS_VAL_NOWRAP},
- {"baseline", CSS_VAL_BASELINE},
- {"collapse", CSS_VAL_COLLAPSE},
- {"square", CSS_VAL_SQUARE},
- {"move", CSS_VAL_MOVE},
+ {"silver", CSS_VAL_SILVER},
+ {"small-caption", CSS_VAL_SMALL_CAPTION},
+ {"slide", CSS_VAL_SLIDE},
+ {"bold", CSS_VAL_BOLD},
{"lower", CSS_VAL_LOWER},
{"yellow", CSS_VAL_YELLOW},
- {"horizontal", CSS_VAL_HORIZONTAL},
- {"below", CSS_VAL_BELOW},
+ {"bottom", CSS_VAL_BOTTOM},
+ {"blue", CSS_VAL_BLUE},
{"ridge", CSS_VAL_RIDGE},
- {"relative", CSS_VAL_RELATIVE},
- {"embed", CSS_VAL_EMBED},
- {"single", CSS_VAL_SINGLE},
- {"white", CSS_VAL_WHITE},
- {"small-caption", CSS_VAL_SMALL_CAPTION},
- {"justify", CSS_VAL_JUSTIFY},
- {"repeat", CSS_VAL_REPEAT},
+ {"fuchsia", CSS_VAL_FUCHSIA},
+ {"invert", CSS_VAL_INVERT},
+ {"ahead", CSS_VAL_AHEAD},
+ {"vertical", CSS_VAL_VERTICAL},
+ {"down", CSS_VAL_DOWN},
+ {"georgian", CSS_VAL_GEORGIAN},
+ {"super", CSS_VAL_SUPER},
{"narrower", CSS_VAL_NARROWER},
+ {"repeat", CSS_VAL_REPEAT},
+ {"block", CSS_VAL_BLOCK},
+ {"unfurl", CSS_VAL_UNFURL},
{"separate", CSS_VAL_SEPARATE},
- {"xx-small", CSS_VAL_XX_SMALL},
- {"sans-serif", CSS_VAL_SANS_SERIF},
- {"table-row", CSS_VAL_TABLE_ROW},
+ {"decimal", CSS_VAL_DECIMAL},
+ {"inline-axis", CSS_VAL_INLINE_AXIS},
+ {"collapse", CSS_VAL_COLLAPSE},
+ {"-khtml-right", CSS_VAL__KHTML_RIGHT},
+ {"repeat-y", CSS_VAL_REPEAT_Y},
+ {"table-cell", CSS_VAL_TABLE_CELL},
+ {"hide", CSS_VAL_HIDE},
+ {"infinite", CSS_VAL_INFINITE},
+ {"text-top", CSS_VAL_TEXT_TOP},
+ {"wider", CSS_VAL_WIDER},
+ {"below", CSS_VAL_BELOW},
+ {"inside", CSS_VAL_INSIDE},
+ {"hiragana-iroha", CSS_VAL_HIRAGANA_IROHA},
+ {"landscape", CSS_VAL_LANDSCAPE},
+ {"loud", CSS_VAL_LOUD},
+ {"repeat-x", CSS_VAL_REPEAT_X},
+ {"outset", CSS_VAL_OUTSET},
+ {"multiple", CSS_VAL_MULTIPLE},
+ {"baseline", CSS_VAL_BASELINE},
{"pointer", CSS_VAL_POINTER},
+ {"level", CSS_VAL_LEVEL},
{"forwards", CSS_VAL_FORWARDS},
- {"outset", CSS_VAL_OUTSET},
- {"repeat-y", CSS_VAL_REPEAT_Y},
- {"absolute", CSS_VAL_ABSOLUTE},
- {"menu", CSS_VAL_MENU},
- {"orange", CSS_VAL_ORANGE},
- {"double", CSS_VAL_DOUBLE},
- {"lighter", CSS_VAL_LIGHTER},
- {"s-resize", CSS_VAL_S_RESIZE},
- {"super", CSS_VAL_SUPER},
+ {"move", CSS_VAL_MOVE},
{"capitalize", CSS_VAL_CAPITALIZE},
- {"-khtml-body", CSS_VAL__KHTML_BODY},
+ {"table-row", CSS_VAL_TABLE_ROW},
+ {"lower-latin", CSS_VAL_LOWER_LATIN},
+ {"purple", CSS_VAL_PURPLE},
+ {"fixed", CSS_VAL_FIXED},
+ {"-khtml-text", CSS_VAL__KHTML_TEXT},
+ {"visible", CSS_VAL_VISIBLE},
+ {"infotext", CSS_VAL_INFOTEXT},
+ {"marquee", CSS_VAL_MARQUEE},
+ {"backwards", CSS_VAL_BACKWARDS},
+ {"s-resize", CSS_VAL_S_RESIZE},
+ {"olive", CSS_VAL_OLIVE},
+ {"avoid", CSS_VAL_AVOID},
+ {"highlighttext", CSS_VAL_HIGHLIGHTTEXT},
+ {"captiontext", CSS_VAL_CAPTIONTEXT},
+ {"block-axis", CSS_VAL_BLOCK_AXIS},
{"window", CSS_VAL_WINDOW},
- {"inline-table", CSS_VAL_INLINE_TABLE},
{"n-resize", CSS_VAL_N_RESIZE},
+ {"relative", CSS_VAL_RELATIVE},
+ {"above", CSS_VAL_ABOVE},
+ {"hebrew", CSS_VAL_HEBREW},
+ {"absolute", CSS_VAL_ABSOLUTE},
+ {"menutext", CSS_VAL_MENUTEXT},
+ {"horizontal", CSS_VAL_HORIZONTAL},
+ {"bolder", CSS_VAL_BOLDER},
+ {"-khtml-left", CSS_VAL__KHTML_LEFT},
{"cursive", CSS_VAL_CURSIVE},
- {"condensed", CSS_VAL_CONDENSED},
- {"table-caption", CSS_VAL_TABLE_CAPTION},
- {"lower-latin", CSS_VAL_LOWER_LATIN},
- {"outside", CSS_VAL_OUTSIDE},
- {"graytext", CSS_VAL_GRAYTEXT},
- {"fuchsia", CSS_VAL_FUCHSIA},
- {"block-axis", CSS_VAL_BLOCK_AXIS},
- {"infinite", CSS_VAL_INFINITE},
- {"green", CSS_VAL_GREEN},
- {"reverse", CSS_VAL_REVERSE},
- {"inline-axis", CSS_VAL_INLINE_AXIS},
- {"x-large", CSS_VAL_X_LARGE},
- {"overline", CSS_VAL_OVERLINE},
+ {"-khtml-box", CSS_VAL__KHTML_BOX},
+ {"middle", CSS_VAL_MIDDLE},
+ {"dashed", CSS_VAL_DASHED},
{"default", CSS_VAL_DEFAULT},
- {"higher", CSS_VAL_HIGHER},
- {"hebrew", CSS_VAL_HEBREW},
- {"oblique", CSS_VAL_OBLIQUE},
- {"fixed", CSS_VAL_FIXED},
- {"text-top", CSS_VAL_TEXT_TOP},
- {"activeborder", CSS_VAL_ACTIVEBORDER},
- {"katakana-iroha", CSS_VAL_KATAKANA_IROHA},
- {"no-repeat", CSS_VAL_NO_REPEAT},
- {"hiragana-iroha", CSS_VAL_HIRAGANA_IROHA},
- {"lowercase", CSS_VAL_LOWERCASE},
- {"unfurl", CSS_VAL_UNFURL},
- {"purple", CSS_VAL_PURPLE},
- {"activecaption", CSS_VAL_ACTIVECAPTION},
{"medium", CSS_VAL_MEDIUM},
- {"groove", CSS_VAL_GROOVE},
- {"monospace", CSS_VAL_MONOSPACE},
- {"inline-block", CSS_VAL_INLINE_BLOCK},
- {"underline", CSS_VAL_UNDERLINE},
- {"repeat-x", CSS_VAL_REPEAT_X},
- {"multiple", CSS_VAL_MULTIPLE},
{"lower-alpha", CSS_VAL_LOWER_ALPHA},
- {"table-column", CSS_VAL_TABLE_COLUMN},
- {"captiontext", CSS_VAL_CAPTIONTEXT},
+ {"inline-table", CSS_VAL_INLINE_TABLE},
+ {"embed", CSS_VAL_EMBED},
+ {"lowercase", CSS_VAL_LOWERCASE},
{"w-resize", CSS_VAL_W_RESIZE},
- {"e-resize", CSS_VAL_E_RESIZE},
- {"-khtml-box", CSS_VAL__KHTML_BOX},
{"sw-resize", CSS_VAL_SW_RESIZE},
- {"se-resize", CSS_VAL_SE_RESIZE},
- {"expanded", CSS_VAL_EXPANDED},
- {"text-bottom", CSS_VAL_TEXT_BOTTOM},
{"buttontext", CSS_VAL_BUTTONTEXT},
- {"inactiveborder", CSS_VAL_INACTIVEBORDER},
+ {"-khtml-xxx-large", CSS_VAL__KHTML_XXX_LARGE},
+ {"upper-latin", CSS_VAL_UPPER_LATIN},
+ {"table-caption", CSS_VAL_TABLE_CAPTION},
+ {"oblique", CSS_VAL_OBLIQUE},
{"lower-roman", CSS_VAL_LOWER_ROMAN},
- {"marquee", CSS_VAL_MARQUEE},
{"nw-resize", CSS_VAL_NW_RESIZE},
- {"ne-resize", CSS_VAL_NE_RESIZE},
- {"infotext", CSS_VAL_INFOTEXT},
+ {"text-bottom", CSS_VAL_TEXT_BOTTOM},
{"-khtml-auto", CSS_VAL__KHTML_AUTO},
- {"buttonshadow", CSS_VAL_BUTTONSHADOW},
- {"inactivecaption", CSS_VAL_INACTIVECAPTION},
- {"-khtml-text", CSS_VAL__KHTML_TEXT},
+ {"no-repeat", CSS_VAL_NO_REPEAT},
+ {"monospace", CSS_VAL_MONOSPACE},
+ {"table-column", CSS_VAL_TABLE_COLUMN},
+ {"groove", CSS_VAL_GROOVE},
+ {"message-box", CSS_VAL_MESSAGE_BOX},
+ {"hidden", CSS_VAL_HIDDEN},
+ {"-khtml-nowrap", CSS_VAL__KHTML_NOWRAP},
+ {"dotted", CSS_VAL_DOTTED},
+ {"reverse", CSS_VAL_REVERSE},
+ {"katakana-iroha", CSS_VAL_KATAKANA_IROHA},
{"buttonface", CSS_VAL_BUTTONFACE},
- {"-apple-aqua", CSS_VAL__APPLE_AQUA},
- {"-khtml-right", CSS_VAL__KHTML_RIGHT},
- {"bidi-override", CSS_VAL_BIDI_OVERRIDE},
- {"upper-latin", CSS_VAL_UPPER_LATIN},
- {"-khtml-left", CSS_VAL__KHTML_LEFT},
- {"xx-large", CSS_VAL_XX_LARGE},
- {"highlight", CSS_VAL_HIGHLIGHT},
- {"background", CSS_VAL_BACKGROUND},
- {"georgian", CSS_VAL_GEORGIAN},
+ {"e-resize", CSS_VAL_E_RESIZE},
+ {"upper-alpha", CSS_VAL_UPPER_ALPHA},
+ {"se-resize", CSS_VAL_SE_RESIZE},
{"-khtml-center", CSS_VAL__KHTML_CENTER},
- {"ultra-condensed", CSS_VAL_ULTRA_CONDENSED},
- {"threedshadow", CSS_VAL_THREEDSHADOW},
- {"threedface", CSS_VAL_THREEDFACE},
- {"-khtml-nowrap", CSS_VAL__KHTML_NOWRAP},
{"uppercase", CSS_VAL_UPPERCASE},
- {"menutext", CSS_VAL_MENUTEXT},
- {"close-quote", CSS_VAL_CLOSE_QUOTE},
- {"windowtext", CSS_VAL_WINDOWTEXT},
- {"upper-alpha", CSS_VAL_UPPER_ALPHA},
- {"semi-condensed", CSS_VAL_SEMI_CONDENSED},
+ {"outside", CSS_VAL_OUTSIDE},
+ {"ne-resize", CSS_VAL_NE_RESIZE},
+ {"-khtml-body", CSS_VAL__KHTML_BODY},
+ {"double", CSS_VAL_DOUBLE},
+ {"overline", CSS_VAL_OVERLINE},
{"upper-roman", CSS_VAL_UPPER_ROMAN},
- {"extra-condensed", CSS_VAL_EXTRA_CONDENSED},
- {"ultra-expanded", CSS_VAL_ULTRA_EXPANDED},
{"line-through", CSS_VAL_LINE_THROUGH},
- {"threeddarkshadow", CSS_VAL_THREEDDARKSHADOW},
- {"message-box", CSS_VAL_MESSAGE_BOX},
- {"open-quote", CSS_VAL_OPEN_QUOTE},
+ {"windowtext", CSS_VAL_WINDOWTEXT},
+ {"activecaption", CSS_VAL_ACTIVECAPTION},
+ {"buttonhighlight", CSS_VAL_BUTTONHIGHLIGHT},
+ {"underline", CSS_VAL_UNDERLINE},
+ {"inline-block", CSS_VAL_INLINE_BLOCK},
+ {"background", CSS_VAL_BACKGROUND},
+ {"expanded", CSS_VAL_EXPANDED},
{"windowframe", CSS_VAL_WINDOWFRAME},
- {"no-close-quote", CSS_VAL_NO_CLOSE_QUOTE},
+ {"inactivecaption", CSS_VAL_INACTIVECAPTION},
+ {"threedface", CSS_VAL_THREEDFACE},
+ {"close-quote", CSS_VAL_CLOSE_QUOTE},
{"appworkspace", CSS_VAL_APPWORKSPACE},
+ {"buttonshadow", CSS_VAL_BUTTONSHADOW},
+ {"condensed", CSS_VAL_CONDENSED},
{"-khtml-inline-box", CSS_VAL__KHTML_INLINE_BOX},
- {"semi-expanded", CSS_VAL_SEMI_EXPANDED},
- {"extra-expanded", CSS_VAL_EXTRA_EXPANDED},
- {"cjk-ideographic", CSS_VAL_CJK_IDEOGRAPHIC},
+ {"threedhighlight", CSS_VAL_THREEDHIGHLIGHT},
+ {"table-row-group", CSS_VAL_TABLE_ROW_GROUP},
+ {"open-quote", CSS_VAL_OPEN_QUOTE},
+ {"lower-greek", CSS_VAL_LOWER_GREEK},
+ {"activeborder", CSS_VAL_ACTIVEBORDER},
+ {"ultra-expanded", CSS_VAL_ULTRA_EXPANDED},
{"inactivecaptiontext", CSS_VAL_INACTIVECAPTIONTEXT},
- {"highlighttext", CSS_VAL_HIGHLIGHTTEXT},
- {"buttonhighlight", CSS_VAL_BUTTONHIGHLIGHT},
+ {"cjk-ideographic", CSS_VAL_CJK_IDEOGRAPHIC},
+ {"extra-expanded", CSS_VAL_EXTRA_EXPANDED},
+ {"threedshadow", CSS_VAL_THREEDSHADOW},
+ {"inactiveborder", CSS_VAL_INACTIVEBORDER},
+ {"no-close-quote", CSS_VAL_NO_CLOSE_QUOTE},
+ {"semi-expanded", CSS_VAL_SEMI_EXPANDED},
+ {"table-column-group", CSS_VAL_TABLE_COLUMN_GROUP},
+ {"ultra-condensed", CSS_VAL_ULTRA_CONDENSED},
+ {"infobackground", CSS_VAL_INFOBACKGROUND},
+ {"extra-condensed", CSS_VAL_EXTRA_CONDENSED},
{"no-open-quote", CSS_VAL_NO_OPEN_QUOTE},
+ {"semi-condensed", CSS_VAL_SEMI_CONDENSED},
{"threedlightshadow", CSS_VAL_THREEDLIGHTSHADOW},
- {"infobackground", CSS_VAL_INFOBACKGROUND},
- {"table-row-group", CSS_VAL_TABLE_ROW_GROUP},
- {"threedhighlight", CSS_VAL_THREEDHIGHLIGHT},
- {"lower-greek", CSS_VAL_LOWER_GREEK},
- {"-khtml-baseline-middle", CSS_VAL__KHTML_BASELINE_MIDDLE},
- {"decimal-leading-zero", CSS_VAL_DECIMAL_LEADING_ZERO},
- {"-khtml-xxx-large", CSS_VAL__KHTML_XXX_LARGE},
+ {"bidi-override", CSS_VAL_BIDI_OVERRIDE},
+ {"table-footer-group", CSS_VAL_TABLE_FOOTER_GROUP},
{"table-header-group", CSS_VAL_TABLE_HEADER_GROUP},
- {"table-column-group", CSS_VAL_TABLE_COLUMN_GROUP},
- {"table-footer-group", CSS_VAL_TABLE_FOOTER_GROUP}
+ {"decimal-leading-zero", CSS_VAL_DECIMAL_LEADING_ZERO},
+ {"threeddarkshadow", CSS_VAL_THREEDDARKSHADOW},
+ {"-khtml-baseline-middle", CSS_VAL__KHTML_BASELINE_MIDDLE}
};
static const short lookup[] =
{
- 0, -1, -1, -1, -260, 3, -252, -2,
+ 0, -1, -1, -1, -259, 3, -251, -2,
-1, 4, 5, -1, -1, -1, -1, 6,
- -1, -1, -1, -1, 7, -1, -1, -1,
- -1, 8, -1, -1, -1, -1, 9, -1,
- -1, -1, -1, 10, -1, -1, -1, -1,
- 11, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 7, -1, 8, -1, -1, -1,
+ 9, 10, -1, -1, -1, -1, 11, -1,
+ -1, -1, -1, 12, -1, -1, -1, -1,
+ 13, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 12, -1, -1, 13,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 14, -1, -1, -1, -1,
- -1, -1, 15, -1, -1, 16, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 17, -1, -1,
+ -1, 14, -1, -1, -1, -1, -1, 15,
+ -1, -1, -1, -1, 16, -1, -1, -1,
+ -1, -1, -1, 17, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, 18,
- 19, -1, -1, -1, 20, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 21,
- -1, 22, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 23, -1, -1, -1, -1,
- -1, -1, -1, -1, 24, 25, -1, -1,
- -1, 26, -1, -1, -1, -1, 27, -1,
- -1, -1, -1, 28, 29, -1, -1, -1,
- 30, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 31, -1, -1, 32, -1,
- 33, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 34, -1,
- 35, -1, -1, 36, -1, -1, -1, -1,
- -1, -1, 37, -1, 38, -1, 39, -1,
- -1, 40, -1, -1, -1, -1, -1, -1,
- 41, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 42, -1, -1, -1, -1, 43,
- -1, -1, 44, 45, -1, -1, -1, -1,
- 46, -1, -1, 47, -1, -1, -1, -1,
- -1, -1, -1, 48, -1, -1, 49, -576,
- -1, 52, -203, -2, 53, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 54, -1, -1, -1, -1, 55, 56,
- -1, 57, -1, -1, 58, 59, -1, -1,
- 60, -1, 61, -1, -1, -1, 62, -1,
- 63, -1, 64, -1, -1, 65, -1, 66,
- -1, 67, 68, 69, -1, -1, 70, 71,
- -1, 72, -1, -1, -1, -1, 73, -1,
- 74, -1, 75, -1, -1, -1, 76, -1,
- -1, -1, -1, 77, -1, -1, 78, 79,
- 80, 81, 82, -1, 83, -1, -1, 84,
- 85, -1, -1, -1, -1, 86, 87, -1,
- -1, 88, -1, 89, 90, -1, 91, -1,
- -1, -1, 92, -1, -1, -1, 93, 94,
- -1, -1, -1, -1, -1, -1, -1, 95,
- -1, -1, -1, -1, -1, -1, 96, 97,
- -1, 98, 99, 100, -1, 101, -1, -1,
- 102, -1, 103, -1, -1, -1, -1, 104,
- 105, -1, -1, -1, -1, -1, -1, -1,
- -1, 106, -1, -1, -1, 107, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- 108, -1, -1, -1, -1, 109, -1, -1,
- -1, -1, -1, 110, 111, -1, -1, 112,
- -1, 113, -1, -1, -1, -1, -1, -1,
- -1, 114, 115, -1, -1, -1, -1, 116,
- -1, -1, -1, 117, -1, -1, 118, -1,
- -1, -1, -1, -1, 119, -1, -1, -1,
- 120, 121, -1, 122, -1, -1, 123, 124,
- 125, -1, 126, -1, -1, 127, -1, -1,
- 128, 129, -1, -1, -1, 130, -1, 131,
- -1, 132, -1, -1, -1, -1, -1, -1,
- -1, 133, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 134, -1, -1, -1, 135,
- -1, -1, 136, -1, -1, -1, -1, 137,
- -1, 138, -1, -1, 139, -1, -1, 140,
- -1, -1, -1, 141, -1, 142, -1, -1,
- -1, -1, 143, -1, -1, 144, 145, -1,
- -1, -1, -1, 146, -1, 147, -1, -1,
- -1, 148, -1, -1, -1, 149, -1, -1,
- -1, 150, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 151, -1, 152, -1, 153, -1, -1,
- -1, -1, 154, 155, -1, -1, -1, -1,
- -1, -1, 156, -1, -1, -1, -1, 157,
- -1, -1, -1, 158, 159, 160, 161, -1,
- -1, 162, -1, -1, -1, -1, -1, 163,
- -1, -1, -1, -1, -1, 164, 165, 166,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 167, -1, 168, -1, 169,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 170, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 171,
- -1, -1, 172, -1, 173, -1, -1, -1,
- -1, 174, -1, -1, -1, -1, 175, 176,
- -1, -1, 177, 178, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 179, 180, -1,
- 181, -1, 182, -1, 183, -1, -1, -1,
- -1, 184, -1, -1, 185, 186, 187, -1,
- -1, 188, 189, 190, 191, -1, -1, -1,
- -1, -1, -1, 192, -1, 193, -1, -1,
- -1, 194, 195, -1, -1, 196, 197, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- 198, 199, -1, 200, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 201, -1, -1, -1, -1,
- -1, -1, -1, 202, 203, -1, 204, -1,
- -1, 205, -1, -1, 206, -1, -1, -1,
- -1, -1, -1, -1, 207, -1, 208, -1,
- -1, -1, -1, -1, 209, -1, -1, 210,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 211, -1, -1, -1, -1, 212,
- -1, 213, -1, -1, 214, -1, -1, -1,
- -1, 215, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 216, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 217, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 19, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 20, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 21, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ 22, -1, -1, 23, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 24,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 25, -1, 26, -1,
+ -1, 27, -1, 28, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ 29, -1, -1, -1, 30, 31, 32, -1,
+ -1, -1, -1, 33, 34, -1, -1, 35,
+ 36, -1, -1, -1, 37, -1, 38, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ 39, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 40, -1,
+ -1, 41, -1, -1, -1, 42, -1, 43,
+ -1, -1, 44, -1, 45, -1, -1, -1,
+ -1, 46, 47, -1, -1, -1, -1, -1,
+ 48, 49, -1, 50, 51, -1, -1, 52,
+ -1, -1, 53, -1, 54, -1, 55, -1,
+ -1, -1, -1, -1, 56, -1, 57, 58,
+ 59, -1, -1, -1, 60, -1, -1, -1,
+ -1, -1, -1, -1, -1, 61, 62, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ 63, -1, -1, 64, -1, 65, 66, -1,
+ -1, -1, 67, 68, -1, 69, -1, -1,
+ -1, -1, -1, 70, 71, -1, -1, 72,
+ -1, -1, 73, 74, 75, -1, -1, 76,
+ 77, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 78, 79, -1, -1, 80, -1,
+ -1, -1, -1, 81, 82, -1, -1, -1,
+ 83, -1, -1, -1, -1, 84, -1, -1,
+ 85, -1, -1, 86, -1, -1, -1, -1,
+ 87, 88, -1, -1, 89, -1, 90, 91,
+ -1, -1, -1, -1, 92, -1, -1, 93,
+ -1, -1, -1, 94, -1, -1, 95, -1,
+ -1, 96, -1, -1, -1, 97, -1, -1,
+ -1, -1, 98, -1, -1, 99, -1, 100,
+ 101, 102, 103, 104, -1, 105, -1, -1,
+ 106, 107, -1, -1, 108, -1, 109, -1,
+ -1, -1, -1, -1, -1, -1, 110, 111,
+ -1, -1, -1, -1, -1, 112, -1, -1,
+ -1, 113, 114, -1, 115, 116, -1, 117,
+ -1, 118, -1, -1, -1, -1, 119, -1,
+ -1, -1, 120, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 121, -1, -1, 122, -1, -1,
+ -1, 123, -1, -1, -1, 124, 125, -1,
+ 126, 127, -1, 128, -1, -1, -1, 129,
+ 130, -1, -1, 131, -1, -1, -1, -1,
+ -1, 132, -1, 133, -1, 134, -1, -1,
+ 135, -1, -1, -1, 136, 137, 138, -1,
+ 139, -1, 140, 141, -1, 142, -1, -1,
+ 143, -1, -1, -1, -1, -1, -1, -1,
+ 144, 145, -1, -1, -1, 146, -1, -1,
+ -1, 147, 148, 149, -1, -1, -1, -1,
+ -1, -1, 150, -1, -1, -1, -1, -1,
+ -1, -1, -1, 151, -1, -1, -1, -1,
+ 152, 153, -1, -1, -1, -1, -1, -1,
+ -1, 154, 155, 156, 157, -1, -1, 158,
+ -1, -1, -1, 159, -1, -1, 160, -1,
+ -1, -1, -1, 161, 162, -1, 163, -1,
+ -1, -1, -1, 164, -1, -1, 165, -1,
+ 166, -1, -1, -1, 167, 168, -1, 169,
+ -1, -1, -1, -1, -1, 170, 171, 172,
+ -1, -1, -1, 173, -1, -1, -1, 174,
+ -1, -1, -1, -1, 175, -1, 176, -1,
+ -1, -1, -1, 177, -1, -1, -1, -1,
+ 178, -1, -1, 179, -1, -1, 180, -1,
+ 181, -1, -1, -1, 182, 183, -1, -1,
+ -1, -1, 184, -1, 185, -1, 186, -1,
+ -1, -1, -1, -1, 187, 188, -1, -1,
+ -1, -1, 189, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 190,
+ 191, -1, -1, -1, -1, -1, -1, -1,
+ 192, -1, 193, -1, -1, 194, -1, 195,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 196, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 197, -1, -1, -1, -1,
+ -1, -1, -1, -1, 198, -1, -1, -1,
+ -1, 199, -1, 200, -1, -1, 201, -1,
+ 202, -1, -1, -1, -1, -1, 203, -1,
+ -1, -1, 204, -1, -1, -1, -1, -1,
+ -1, -1, 205, 206, -1, -1, -1, -1,
+ -1, -1, -1, 207, -1, -1, -1, -1,
+ 208, -1, 209, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 210,
+ -1, -1, 211, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 212, -1,
+ 213, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 214, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 218, -1, -1, 219, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 220, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- 221, -1, -1, -1, -1, 222, -1, -1,
+ -1, 215, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 216,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 223, -1, -1,
- -1, -1, -1, -1, 224, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 225, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 217, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 218, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 226, -1,
+ 219, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, 227, -1, -1, -1, -1, -1, -1,
+ -1, -1, 220, -1, -1, 221, -1, -1,
+ -1, -1, -1, -1, -1, -1, 222, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 228, -1,
- 229, -1, -1, -1, -1, -1, 230, -1,
+ -1, -1, -1, -1, 223, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 231, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 224,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, 232, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 225, -1, -1, -1, 226, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- 233, -1, -1, 234, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 235,
+ -1, -1, -1, -1, -1, 227, -1, -1,
+ -1, -1, -1, 228, 229, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- 236, -1, -1, -1, -1, -1, 237, -1,
- -1, -1, -1, -1, -1, -1, 238, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 230, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 239, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 240,
+ -1, -1, -1, -1, -1, 231, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 241, 242, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 243,
+ -1, -1, -1, -1, -1, -1, 232, -1,
+ -1, -1, -1, -1, -1, -1, 233, -1,
+ -1, -1, 234, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 235, -1, -1, -1, 236, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ 237, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 244, -1, -1,
+ -1, -1, -1, -1, 238, -1, -1, 239,
+ -1, -1, 240, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 245, -1, -1,
- -1, -1, 246, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- 247, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 241, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 242,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 243, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- 248, -1, -1, -1, -1, -1, -1, -1,
+ -1, 244, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 245, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
@@ -567,18 +556,20 @@ findValue (register const char *str, register unsigned int len)
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 249, 250, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 246, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 247, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 248, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 251, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 249, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
@@ -587,8 +578,9 @@ findValue (register const char *str, register unsigned int len)
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 250, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, 252
+ 251
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -639,7 +631,6 @@ static const char * const valueList[] = {
"dashed",
"solid",
"double",
-"-apple-aqua",
"caption",
"icon",
"menu",
diff --git a/WebCore/khtml/css/cssvalues.h b/WebCore/khtml/css/cssvalues.h
index 8c68fd3..44e311b 100644
--- a/WebCore/khtml/css/cssvalues.h
+++ b/WebCore/khtml/css/cssvalues.h
@@ -21,248 +21,247 @@ DOM::DOMString getValueName(unsigned short id);
#define CSS_VAL_DASHED 10
#define CSS_VAL_SOLID 11
#define CSS_VAL_DOUBLE 12
-#define CSS_VAL__APPLE_AQUA 13
-#define CSS_VAL_CAPTION 14
-#define CSS_VAL_ICON 15
-#define CSS_VAL_MENU 16
-#define CSS_VAL_MESSAGE_BOX 17
-#define CSS_VAL_SMALL_CAPTION 18
-#define CSS_VAL_STATUS_BAR 19
-#define CSS_VAL_ITALIC 20
-#define CSS_VAL_OBLIQUE 21
-#define CSS_VAL_SMALL_CAPS 22
-#define CSS_VAL_NORMAL 23
-#define CSS_VAL_BOLD 24
-#define CSS_VAL_BOLDER 25
-#define CSS_VAL_LIGHTER 26
-#define CSS_VAL_100 27
-#define CSS_VAL_200 28
-#define CSS_VAL_300 29
-#define CSS_VAL_400 30
-#define CSS_VAL_500 31
-#define CSS_VAL_600 32
-#define CSS_VAL_700 33
-#define CSS_VAL_800 34
-#define CSS_VAL_900 35
-#define CSS_VAL_XX_SMALL 36
-#define CSS_VAL_X_SMALL 37
-#define CSS_VAL_SMALL 38
-#define CSS_VAL_MEDIUM 39
-#define CSS_VAL_LARGE 40
-#define CSS_VAL_X_LARGE 41
-#define CSS_VAL_XX_LARGE 42
-#define CSS_VAL__KHTML_XXX_LARGE 43
-#define CSS_VAL_SMALLER 44
-#define CSS_VAL_LARGER 45
-#define CSS_VAL_WIDER 46
-#define CSS_VAL_NARROWER 47
-#define CSS_VAL_ULTRA_CONDENSED 48
-#define CSS_VAL_EXTRA_CONDENSED 49
-#define CSS_VAL_CONDENSED 50
-#define CSS_VAL_SEMI_CONDENSED 51
-#define CSS_VAL_SEMI_EXPANDED 52
-#define CSS_VAL_EXPANDED 53
-#define CSS_VAL_EXTRA_EXPANDED 54
-#define CSS_VAL_ULTRA_EXPANDED 55
-#define CSS_VAL_SERIF 56
-#define CSS_VAL_SANS_SERIF 57
-#define CSS_VAL_CURSIVE 58
-#define CSS_VAL_FANTASY 59
-#define CSS_VAL_MONOSPACE 60
-#define CSS_VAL__KHTML_BODY 61
-#define CSS_VAL_AQUA 62
-#define CSS_VAL_BLACK 63
-#define CSS_VAL_BLUE 64
-#define CSS_VAL_FUCHSIA 65
-#define CSS_VAL_GRAY 66
-#define CSS_VAL_GREEN 67
-#define CSS_VAL_LIME 68
-#define CSS_VAL_MAROON 69
-#define CSS_VAL_NAVY 70
-#define CSS_VAL_OLIVE 71
-#define CSS_VAL_ORANGE 72
-#define CSS_VAL_PURPLE 73
-#define CSS_VAL_RED 74
-#define CSS_VAL_SILVER 75
-#define CSS_VAL_TEAL 76
-#define CSS_VAL_WHITE 77
-#define CSS_VAL_YELLOW 78
-#define CSS_VAL_TRANSPARENT 79
-#define CSS_VAL_ACTIVEBORDER 80
-#define CSS_VAL_ACTIVECAPTION 81
-#define CSS_VAL_APPWORKSPACE 82
-#define CSS_VAL_BACKGROUND 83
-#define CSS_VAL_BUTTONFACE 84
-#define CSS_VAL_BUTTONHIGHLIGHT 85
-#define CSS_VAL_BUTTONSHADOW 86
-#define CSS_VAL_BUTTONTEXT 87
-#define CSS_VAL_CAPTIONTEXT 88
-#define CSS_VAL_GRAYTEXT 89
-#define CSS_VAL_HIGHLIGHT 90
-#define CSS_VAL_HIGHLIGHTTEXT 91
-#define CSS_VAL_INACTIVEBORDER 92
-#define CSS_VAL_INACTIVECAPTION 93
-#define CSS_VAL_INACTIVECAPTIONTEXT 94
-#define CSS_VAL_INFOBACKGROUND 95
-#define CSS_VAL_INFOTEXT 96
-#define CSS_VAL_MENUTEXT 97
-#define CSS_VAL_SCROLLBAR 98
-#define CSS_VAL_THREEDDARKSHADOW 99
-#define CSS_VAL_THREEDFACE 100
-#define CSS_VAL_THREEDHIGHLIGHT 101
-#define CSS_VAL_THREEDLIGHTSHADOW 102
-#define CSS_VAL_THREEDSHADOW 103
-#define CSS_VAL_WINDOW 104
-#define CSS_VAL_WINDOWFRAME 105
-#define CSS_VAL_WINDOWTEXT 106
-#define CSS_VAL_GREY 107
-#define CSS_VAL__KHTML_TEXT 108
-#define CSS_VAL_REPEAT 109
-#define CSS_VAL_REPEAT_X 110
-#define CSS_VAL_REPEAT_Y 111
-#define CSS_VAL_NO_REPEAT 112
-#define CSS_VAL_BASELINE 113
-#define CSS_VAL_MIDDLE 114
-#define CSS_VAL_SUB 115
-#define CSS_VAL_SUPER 116
-#define CSS_VAL_TEXT_TOP 117
-#define CSS_VAL_TEXT_BOTTOM 118
-#define CSS_VAL_TOP 119
-#define CSS_VAL_BOTTOM 120
-#define CSS_VAL__KHTML_BASELINE_MIDDLE 121
-#define CSS_VAL__KHTML_AUTO 122
-#define CSS_VAL_LEFT 123
-#define CSS_VAL_RIGHT 124
-#define CSS_VAL_CENTER 125
-#define CSS_VAL_JUSTIFY 126
-#define CSS_VAL__KHTML_LEFT 127
-#define CSS_VAL__KHTML_RIGHT 128
-#define CSS_VAL__KHTML_CENTER 129
-#define CSS_VAL_OUTSIDE 130
-#define CSS_VAL_INSIDE 131
-#define CSS_VAL_DISC 132
-#define CSS_VAL_CIRCLE 133
-#define CSS_VAL_SQUARE 134
-#define CSS_VAL_DECIMAL 135
-#define CSS_VAL_DECIMAL_LEADING_ZERO 136
-#define CSS_VAL_LOWER_ROMAN 137
-#define CSS_VAL_UPPER_ROMAN 138
-#define CSS_VAL_LOWER_GREEK 139
-#define CSS_VAL_LOWER_ALPHA 140
-#define CSS_VAL_LOWER_LATIN 141
-#define CSS_VAL_UPPER_ALPHA 142
-#define CSS_VAL_UPPER_LATIN 143
-#define CSS_VAL_HEBREW 144
-#define CSS_VAL_ARMENIAN 145
-#define CSS_VAL_GEORGIAN 146
-#define CSS_VAL_CJK_IDEOGRAPHIC 147
-#define CSS_VAL_HIRAGANA 148
-#define CSS_VAL_KATAKANA 149
-#define CSS_VAL_HIRAGANA_IROHA 150
-#define CSS_VAL_KATAKANA_IROHA 151
-#define CSS_VAL_INLINE 152
-#define CSS_VAL_BLOCK 153
-#define CSS_VAL_LIST_ITEM 154
-#define CSS_VAL_RUN_IN 155
-#define CSS_VAL_COMPACT 156
-#define CSS_VAL_INLINE_BLOCK 157
-#define CSS_VAL_TABLE 158
-#define CSS_VAL_INLINE_TABLE 159
-#define CSS_VAL_TABLE_ROW_GROUP 160
-#define CSS_VAL_TABLE_HEADER_GROUP 161
-#define CSS_VAL_TABLE_FOOTER_GROUP 162
-#define CSS_VAL_TABLE_ROW 163
-#define CSS_VAL_TABLE_COLUMN_GROUP 164
-#define CSS_VAL_TABLE_COLUMN 165
-#define CSS_VAL_TABLE_CELL 166
-#define CSS_VAL_TABLE_CAPTION 167
-#define CSS_VAL__KHTML_BOX 168
-#define CSS_VAL__KHTML_INLINE_BOX 169
-#define CSS_VAL_AUTO 170
-#define CSS_VAL_CROSSHAIR 171
-#define CSS_VAL_DEFAULT 172
-#define CSS_VAL_POINTER 173
-#define CSS_VAL_MOVE 174
-#define CSS_VAL_E_RESIZE 175
-#define CSS_VAL_NE_RESIZE 176
-#define CSS_VAL_NW_RESIZE 177
-#define CSS_VAL_N_RESIZE 178
-#define CSS_VAL_SE_RESIZE 179
-#define CSS_VAL_SW_RESIZE 180
-#define CSS_VAL_S_RESIZE 181
-#define CSS_VAL_W_RESIZE 182
-#define CSS_VAL_TEXT 183
-#define CSS_VAL_WAIT 184
-#define CSS_VAL_HELP 185
-#define CSS_VAL_LTR 186
-#define CSS_VAL_RTL 187
-#define CSS_VAL_CAPITALIZE 188
-#define CSS_VAL_UPPERCASE 189
-#define CSS_VAL_LOWERCASE 190
-#define CSS_VAL_VISIBLE 191
-#define CSS_VAL_COLLAPSE 192
-#define CSS_VAL_ABOVE 193
-#define CSS_VAL_ABSOLUTE 194
-#define CSS_VAL_ALWAYS 195
-#define CSS_VAL_AVOID 196
-#define CSS_VAL_BELOW 197
-#define CSS_VAL_BIDI_OVERRIDE 198
-#define CSS_VAL_BLINK 199
-#define CSS_VAL_BOTH 200
-#define CSS_VAL_CLOSE_QUOTE 201
-#define CSS_VAL_CROP 202
-#define CSS_VAL_CROSS 203
-#define CSS_VAL_EMBED 204
-#define CSS_VAL_FIXED 205
-#define CSS_VAL_HAND 206
-#define CSS_VAL_HIDE 207
-#define CSS_VAL_HIGHER 208
-#define CSS_VAL_INVERT 209
-#define CSS_VAL_LANDSCAPE 210
-#define CSS_VAL_LEVEL 211
-#define CSS_VAL_LINE_THROUGH 212
-#define CSS_VAL_LOUD 213
-#define CSS_VAL_LOWER 214
-#define CSS_VAL_MARQUEE 215
-#define CSS_VAL_MIX 216
-#define CSS_VAL_NO_CLOSE_QUOTE 217
-#define CSS_VAL_NO_OPEN_QUOTE 218
-#define CSS_VAL_NOWRAP 219
-#define CSS_VAL_OPEN_QUOTE 220
-#define CSS_VAL_OVERLINE 221
-#define CSS_VAL_PORTRAIT 222
-#define CSS_VAL_PRE 223
-#define CSS_VAL_RELATIVE 224
-#define CSS_VAL_SCROLL 225
-#define CSS_VAL_SEPARATE 226
-#define CSS_VAL_SHOW 227
-#define CSS_VAL_STATIC 228
-#define CSS_VAL_THICK 229
-#define CSS_VAL_THIN 230
-#define CSS_VAL_UNDERLINE 231
-#define CSS_VAL__KHTML_NOWRAP 232
-#define CSS_VAL_STRETCH 233
-#define CSS_VAL_START 234
-#define CSS_VAL_END 235
-#define CSS_VAL_REVERSE 236
-#define CSS_VAL_HORIZONTAL 237
-#define CSS_VAL_VERTICAL 238
-#define CSS_VAL_INLINE_AXIS 239
-#define CSS_VAL_BLOCK_AXIS 240
-#define CSS_VAL_SINGLE 241
-#define CSS_VAL_MULTIPLE 242
-#define CSS_VAL_FORWARDS 243
-#define CSS_VAL_BACKWARDS 244
-#define CSS_VAL_AHEAD 245
-#define CSS_VAL_UP 246
-#define CSS_VAL_DOWN 247
-#define CSS_VAL_SLOW 248
-#define CSS_VAL_FAST 249
-#define CSS_VAL_INFINITE 250
-#define CSS_VAL_SLIDE 251
-#define CSS_VAL_ALTERNATE 252
-#define CSS_VAL_UNFURL 253
+#define CSS_VAL_CAPTION 13
+#define CSS_VAL_ICON 14
+#define CSS_VAL_MENU 15
+#define CSS_VAL_MESSAGE_BOX 16
+#define CSS_VAL_SMALL_CAPTION 17
+#define CSS_VAL_STATUS_BAR 18
+#define CSS_VAL_ITALIC 19
+#define CSS_VAL_OBLIQUE 20
+#define CSS_VAL_SMALL_CAPS 21
+#define CSS_VAL_NORMAL 22
+#define CSS_VAL_BOLD 23
+#define CSS_VAL_BOLDER 24
+#define CSS_VAL_LIGHTER 25
+#define CSS_VAL_100 26
+#define CSS_VAL_200 27
+#define CSS_VAL_300 28
+#define CSS_VAL_400 29
+#define CSS_VAL_500 30
+#define CSS_VAL_600 31
+#define CSS_VAL_700 32
+#define CSS_VAL_800 33
+#define CSS_VAL_900 34
+#define CSS_VAL_XX_SMALL 35
+#define CSS_VAL_X_SMALL 36
+#define CSS_VAL_SMALL 37
+#define CSS_VAL_MEDIUM 38
+#define CSS_VAL_LARGE 39
+#define CSS_VAL_X_LARGE 40
+#define CSS_VAL_XX_LARGE 41
+#define CSS_VAL__KHTML_XXX_LARGE 42
+#define CSS_VAL_SMALLER 43
+#define CSS_VAL_LARGER 44
+#define CSS_VAL_WIDER 45
+#define CSS_VAL_NARROWER 46
+#define CSS_VAL_ULTRA_CONDENSED 47
+#define CSS_VAL_EXTRA_CONDENSED 48
+#define CSS_VAL_CONDENSED 49
+#define CSS_VAL_SEMI_CONDENSED 50
+#define CSS_VAL_SEMI_EXPANDED 51
+#define CSS_VAL_EXPANDED 52
+#define CSS_VAL_EXTRA_EXPANDED 53
+#define CSS_VAL_ULTRA_EXPANDED 54
+#define CSS_VAL_SERIF 55
+#define CSS_VAL_SANS_SERIF 56
+#define CSS_VAL_CURSIVE 57
+#define CSS_VAL_FANTASY 58
+#define CSS_VAL_MONOSPACE 59
+#define CSS_VAL__KHTML_BODY 60
+#define CSS_VAL_AQUA 61
+#define CSS_VAL_BLACK 62
+#define CSS_VAL_BLUE 63
+#define CSS_VAL_FUCHSIA 64
+#define CSS_VAL_GRAY 65
+#define CSS_VAL_GREEN 66
+#define CSS_VAL_LIME 67
+#define CSS_VAL_MAROON 68
+#define CSS_VAL_NAVY 69
+#define CSS_VAL_OLIVE 70
+#define CSS_VAL_ORANGE 71
+#define CSS_VAL_PURPLE 72
+#define CSS_VAL_RED 73
+#define CSS_VAL_SILVER 74
+#define CSS_VAL_TEAL 75
+#define CSS_VAL_WHITE 76
+#define CSS_VAL_YELLOW 77
+#define CSS_VAL_TRANSPARENT 78
+#define CSS_VAL_ACTIVEBORDER 79
+#define CSS_VAL_ACTIVECAPTION 80
+#define CSS_VAL_APPWORKSPACE 81
+#define CSS_VAL_BACKGROUND 82
+#define CSS_VAL_BUTTONFACE 83
+#define CSS_VAL_BUTTONHIGHLIGHT 84
+#define CSS_VAL_BUTTONSHADOW 85
+#define CSS_VAL_BUTTONTEXT 86
+#define CSS_VAL_CAPTIONTEXT 87
+#define CSS_VAL_GRAYTEXT 88
+#define CSS_VAL_HIGHLIGHT 89
+#define CSS_VAL_HIGHLIGHTTEXT 90
+#define CSS_VAL_INACTIVEBORDER 91
+#define CSS_VAL_INACTIVECAPTION 92
+#define CSS_VAL_INACTIVECAPTIONTEXT 93
+#define CSS_VAL_INFOBACKGROUND 94
+#define CSS_VAL_INFOTEXT 95
+#define CSS_VAL_MENUTEXT 96
+#define CSS_VAL_SCROLLBAR 97
+#define CSS_VAL_THREEDDARKSHADOW 98
+#define CSS_VAL_THREEDFACE 99
+#define CSS_VAL_THREEDHIGHLIGHT 100
+#define CSS_VAL_THREEDLIGHTSHADOW 101
+#define CSS_VAL_THREEDSHADOW 102
+#define CSS_VAL_WINDOW 103
+#define CSS_VAL_WINDOWFRAME 104
+#define CSS_VAL_WINDOWTEXT 105
+#define CSS_VAL_GREY 106
+#define CSS_VAL__KHTML_TEXT 107
+#define CSS_VAL_REPEAT 108
+#define CSS_VAL_REPEAT_X 109
+#define CSS_VAL_REPEAT_Y 110
+#define CSS_VAL_NO_REPEAT 111
+#define CSS_VAL_BASELINE 112
+#define CSS_VAL_MIDDLE 113
+#define CSS_VAL_SUB 114
+#define CSS_VAL_SUPER 115
+#define CSS_VAL_TEXT_TOP 116
+#define CSS_VAL_TEXT_BOTTOM 117
+#define CSS_VAL_TOP 118
+#define CSS_VAL_BOTTOM 119
+#define CSS_VAL__KHTML_BASELINE_MIDDLE 120
+#define CSS_VAL__KHTML_AUTO 121
+#define CSS_VAL_LEFT 122
+#define CSS_VAL_RIGHT 123
+#define CSS_VAL_CENTER 124
+#define CSS_VAL_JUSTIFY 125
+#define CSS_VAL__KHTML_LEFT 126
+#define CSS_VAL__KHTML_RIGHT 127
+#define CSS_VAL__KHTML_CENTER 128
+#define CSS_VAL_OUTSIDE 129
+#define CSS_VAL_INSIDE 130
+#define CSS_VAL_DISC 131
+#define CSS_VAL_CIRCLE 132
+#define CSS_VAL_SQUARE 133
+#define CSS_VAL_DECIMAL 134
+#define CSS_VAL_DECIMAL_LEADING_ZERO 135
+#define CSS_VAL_LOWER_ROMAN 136
+#define CSS_VAL_UPPER_ROMAN 137
+#define CSS_VAL_LOWER_GREEK 138
+#define CSS_VAL_LOWER_ALPHA 139
+#define CSS_VAL_LOWER_LATIN 140
+#define CSS_VAL_UPPER_ALPHA 141
+#define CSS_VAL_UPPER_LATIN 142
+#define CSS_VAL_HEBREW 143
+#define CSS_VAL_ARMENIAN 144
+#define CSS_VAL_GEORGIAN 145
+#define CSS_VAL_CJK_IDEOGRAPHIC 146
+#define CSS_VAL_HIRAGANA 147
+#define CSS_VAL_KATAKANA 148
+#define CSS_VAL_HIRAGANA_IROHA 149
+#define CSS_VAL_KATAKANA_IROHA 150
+#define CSS_VAL_INLINE 151
+#define CSS_VAL_BLOCK 152
+#define CSS_VAL_LIST_ITEM 153
+#define CSS_VAL_RUN_IN 154
+#define CSS_VAL_COMPACT 155
+#define CSS_VAL_INLINE_BLOCK 156
+#define CSS_VAL_TABLE 157
+#define CSS_VAL_INLINE_TABLE 158
+#define CSS_VAL_TABLE_ROW_GROUP 159
+#define CSS_VAL_TABLE_HEADER_GROUP 160
+#define CSS_VAL_TABLE_FOOTER_GROUP 161
+#define CSS_VAL_TABLE_ROW 162
+#define CSS_VAL_TABLE_COLUMN_GROUP 163
+#define CSS_VAL_TABLE_COLUMN 164
+#define CSS_VAL_TABLE_CELL 165
+#define CSS_VAL_TABLE_CAPTION 166
+#define CSS_VAL__KHTML_BOX 167
+#define CSS_VAL__KHTML_INLINE_BOX 168
+#define CSS_VAL_AUTO 169
+#define CSS_VAL_CROSSHAIR 170
+#define CSS_VAL_DEFAULT 171
+#define CSS_VAL_POINTER 172
+#define CSS_VAL_MOVE 173
+#define CSS_VAL_E_RESIZE 174
+#define CSS_VAL_NE_RESIZE 175
+#define CSS_VAL_NW_RESIZE 176
+#define CSS_VAL_N_RESIZE 177
+#define CSS_VAL_SE_RESIZE 178
+#define CSS_VAL_SW_RESIZE 179
+#define CSS_VAL_S_RESIZE 180
+#define CSS_VAL_W_RESIZE 181
+#define CSS_VAL_TEXT 182
+#define CSS_VAL_WAIT 183
+#define CSS_VAL_HELP 184
+#define CSS_VAL_LTR 185
+#define CSS_VAL_RTL 186
+#define CSS_VAL_CAPITALIZE 187
+#define CSS_VAL_UPPERCASE 188
+#define CSS_VAL_LOWERCASE 189
+#define CSS_VAL_VISIBLE 190
+#define CSS_VAL_COLLAPSE 191
+#define CSS_VAL_ABOVE 192
+#define CSS_VAL_ABSOLUTE 193
+#define CSS_VAL_ALWAYS 194
+#define CSS_VAL_AVOID 195
+#define CSS_VAL_BELOW 196
+#define CSS_VAL_BIDI_OVERRIDE 197
+#define CSS_VAL_BLINK 198
+#define CSS_VAL_BOTH 199
+#define CSS_VAL_CLOSE_QUOTE 200
+#define CSS_VAL_CROP 201
+#define CSS_VAL_CROSS 202
+#define CSS_VAL_EMBED 203
+#define CSS_VAL_FIXED 204
+#define CSS_VAL_HAND 205
+#define CSS_VAL_HIDE 206
+#define CSS_VAL_HIGHER 207
+#define CSS_VAL_INVERT 208
+#define CSS_VAL_LANDSCAPE 209
+#define CSS_VAL_LEVEL 210
+#define CSS_VAL_LINE_THROUGH 211
+#define CSS_VAL_LOUD 212
+#define CSS_VAL_LOWER 213
+#define CSS_VAL_MARQUEE 214
+#define CSS_VAL_MIX 215
+#define CSS_VAL_NO_CLOSE_QUOTE 216
+#define CSS_VAL_NO_OPEN_QUOTE 217
+#define CSS_VAL_NOWRAP 218
+#define CSS_VAL_OPEN_QUOTE 219
+#define CSS_VAL_OVERLINE 220
+#define CSS_VAL_PORTRAIT 221
+#define CSS_VAL_PRE 222
+#define CSS_VAL_RELATIVE 223
+#define CSS_VAL_SCROLL 224
+#define CSS_VAL_SEPARATE 225
+#define CSS_VAL_SHOW 226
+#define CSS_VAL_STATIC 227
+#define CSS_VAL_THICK 228
+#define CSS_VAL_THIN 229
+#define CSS_VAL_UNDERLINE 230
+#define CSS_VAL__KHTML_NOWRAP 231
+#define CSS_VAL_STRETCH 232
+#define CSS_VAL_START 233
+#define CSS_VAL_END 234
+#define CSS_VAL_REVERSE 235
+#define CSS_VAL_HORIZONTAL 236
+#define CSS_VAL_VERTICAL 237
+#define CSS_VAL_INLINE_AXIS 238
+#define CSS_VAL_BLOCK_AXIS 239
+#define CSS_VAL_SINGLE 240
+#define CSS_VAL_MULTIPLE 241
+#define CSS_VAL_FORWARDS 242
+#define CSS_VAL_BACKWARDS 243
+#define CSS_VAL_AHEAD 244
+#define CSS_VAL_UP 245
+#define CSS_VAL_DOWN 246
+#define CSS_VAL_SLOW 247
+#define CSS_VAL_FAST 248
+#define CSS_VAL_INFINITE 249
+#define CSS_VAL_SLIDE 250
+#define CSS_VAL_ALTERNATE 251
+#define CSS_VAL_UNFURL 252
-#define CSS_VAL_TOTAL 254
+#define CSS_VAL_TOTAL 253
#endif
diff --git a/WebCore/khtml/css/cssvalues.in b/WebCore/khtml/css/cssvalues.in
index ac0c857..b95b8b6 100644
--- a/WebCore/khtml/css/cssvalues.in
+++ b/WebCore/khtml/css/cssvalues.in
@@ -26,7 +26,6 @@ dotted
dashed
solid
double
--apple-aqua
#
# CSS_PROP_FONT:
#
diff --git a/WebCore/khtml/css/html4.css b/WebCore/khtml/css/html4.css
index 62e4ca1..6da8ae1 100644
--- a/WebCore/khtml/css/html4.css
+++ b/WebCore/khtml/css/html4.css
@@ -345,10 +345,6 @@ INPUT[type="radio"], INPUT[type="checkbox"] {
margin: 3px 0.5ex;
}
-INPUT[type="image"]:active {
- outline: -apple-aqua 3px
-}
-
OPTION,
OPTGROUP,
AREA,
@@ -428,7 +424,7 @@ acronym {
font-style: italic;
}
-:focus { outline: -apple-aqua 3px #1f5ccf}
+:focus { outline: auto 3px #1f5ccf }
a:link { color: #0000EE; text-decoration: underline; }
a:link:active { color: red }
a:visited { color: #551A8B; text-decoration: underline; }
diff --git a/WebCore/khtml/rendering/render_inline.cpp b/WebCore/khtml/rendering/render_inline.cpp
index 2848518..4471d20 100644
--- a/WebCore/khtml/rendering/render_inline.cpp
+++ b/WebCore/khtml/rendering/render_inline.cpp
@@ -296,8 +296,7 @@ void RenderInline::paintObject(QPainter *p, int _x, int _y,
paintLineBoxDecorations(p, _x, _y, _w, _h, _tx, _ty, paintAction);
if (style()->visibility() == VISIBLE && paintAction == PaintActionOutline) {
#if APPLE_CHANGES
- EBorderStyle os = style()->outlineStyle();
- if (os == APPLEAQUA)
+ if (style()->outlineStyleIsAuto())
paintFocusRing(p, _tx, _ty);
else
#endif
diff --git a/WebCore/khtml/rendering/render_object.cpp b/WebCore/khtml/rendering/render_object.cpp
index a95ce9d..9ef7962 100644
--- a/WebCore/khtml/rendering/render_object.cpp
+++ b/WebCore/khtml/rendering/render_object.cpp
@@ -622,9 +622,6 @@ void RenderObject::drawBorder(QPainter *p, int x1, int y1, int x2, int y2,
{
case BNONE:
case BHIDDEN:
-#ifdef APPLE_CHANGES
- case APPLEAQUA:
-#endif
// should not happen
if(invalidisInvert && p->rasterOp() == Qt::XorROP)
p->setRasterOp(Qt::CopyROP);
@@ -938,7 +935,7 @@ void RenderObject::paintOutline(QPainter *p, int _tx, int _ty, int w, int h, con
int offset = style->outlineOffset();
#ifdef APPLE_CHANGES
- if (os == APPLEAQUA) {
+ if (style->outlineStyleIsAuto()) {
p->initFocusRing(ow, offset, oc);
addFocusRingRects(p, _tx, _ty);
p->drawFocusRing();
diff --git a/WebCore/khtml/rendering/render_style.h b/WebCore/khtml/rendering/render_style.h
index 971382e..88c5412 100644
--- a/WebCore/khtml/rendering/render_style.h
+++ b/WebCore/khtml/rendering/render_style.h
@@ -188,9 +188,6 @@ enum EFloat {
// not change this order!
enum EBorderStyle {
BNONE, BHIDDEN, INSET, GROOVE, RIDGE, OUTSET, DOTTED, DASHED, SOLID, DOUBLE
-#ifdef APPLE_CHANGES
- , APPLEAQUA
-#endif
};
@@ -232,10 +229,12 @@ class OutlineValue : public BorderValue
public:
OutlineValue()
{
- offset = 0;
+ _offset = 0;
+ _auto = false;
}
- int offset;
+ int _offset;
+ bool _auto;
};
enum EBorderPrecedence { BOFF, BTABLE, BCOLGROUP, BCOL, BROWGROUP, BROW, BCELL };
@@ -909,6 +908,7 @@ public:
unsigned short outlineSize() const { return outlineWidth() + outlineOffset(); }
unsigned short outlineWidth() const { if (background->outline.style == BNONE) return 0; return background->outline.width; }
EBorderStyle outlineStyle() const { return background->outline.style; }
+ bool outlineStyleIsAuto() const { return background->outline._auto; }
const QColor & outlineColor() const { return background->outline.color; }
EOverflow overflow() const { return noninherited_flags._overflow; }
@@ -995,7 +995,7 @@ public:
// CSS3 Getter Methods
int outlineOffset() const {
- if (background->outline.style == BNONE) return 0; return background->outline.offset;
+ if (background->outline.style == BNONE) return 0; return background->outline._offset;
}
ShadowData* textShadow() const { return css3InheritedData->textShadow; }
float opacity() { return css3NonInheritedData->opacity; }
@@ -1054,7 +1054,11 @@ public:
void setBorderBottomStyle(EBorderStyle v) { SET_VAR(surround,border.bottom.style,v) }
void setBorderBottomColor(const QColor & v) { SET_VAR(surround,border.bottom.color,v) }
void setOutlineWidth(unsigned short v) { SET_VAR(background,outline.width,v) }
- void setOutlineStyle(EBorderStyle v) { SET_VAR(background,outline.style,v) }
+ void setOutlineStyle(EBorderStyle v, bool isAuto = false)
+ {
+ SET_VAR(background,outline.style,v)
+ SET_VAR(background,outline._auto, isAuto)
+ }
void setOutlineColor(const QColor & v) { SET_VAR(background,outline.color,v) }
void setOverflow(EOverflow v) { noninherited_flags._overflow = v; }
@@ -1153,7 +1157,7 @@ public:
void setPageBreakAfter(EPageBreak b) { noninherited_flags._page_break_after = b; }
// CSS3 Setters
- void setOutlineOffset(unsigned short v) { SET_VAR(background,outline.offset,v) }
+ void setOutlineOffset(unsigned short v) { SET_VAR(background,outline._offset,v) }
void setTextShadow(ShadowData* val, bool add=false);
void setOpacity(float f) { SET_VAR(css3NonInheritedData, opacity, f); }
void setBoxAlign(EBoxAlignment a) { SET_VAR(css3NonInheritedData.access()->flexibleBox, align, a); }
diff --git a/WebCore/kwq/KWQRenderTreeDebug.cpp b/WebCore/kwq/KWQRenderTreeDebug.cpp
index fd0ac69..4b32686 100644
--- a/WebCore/kwq/KWQRenderTreeDebug.cpp
+++ b/WebCore/kwq/KWQRenderTreeDebug.cpp
@@ -94,9 +94,6 @@ static void printBorderStyle(QTextStream &ts, const RenderObject &o, const EBord
case khtml::DOUBLE:
ts << "double";
break;
- case khtml::APPLEAQUA:
- ts << "aqua";
- break;
}
ts << " ";
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list