Changeset 5358 in webkit
- Timestamp:
- Nov 2, 2003 9:53:27 PM (21 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog-2005-08-23
r5354 r5358 1 2003-11-01 David Hyatt <hyatt@apple.com> 2 3 Fix for 3468924, an implementation of outline-offset. We also give :focus links a built-in offset of 4 outline-width/2 by default for the Apple Aqua style. 5 6 Fix for 3470660, input type=image excluded from tab order. 7 8 Reviewed by darin 9 10 * khtml/css/cssparser.cpp: 11 (CSSParser::parseValue): 12 * khtml/css/cssproperties.c: 13 (hash_prop): 14 (findProp): 15 * khtml/css/cssproperties.h: 16 * khtml/css/cssproperties.in: 17 * khtml/css/cssstyleselector.cpp: 18 (khtml::CSSStyleSelector::applyRule): 19 * khtml/css/html4.css: 20 * khtml/rendering/render_box.cpp: 21 (RenderBox::getAbsoluteRepaintRect): 22 (RenderBox::computeAbsoluteRepaintRect): 23 * khtml/rendering/render_flow.cpp: 24 (RenderFlow::getAbsoluteRepaintRect): 25 * khtml/rendering/render_inline.cpp: 26 (RenderInline::paintFocusRing): 27 (RenderInline::paintOutlines): 28 (RenderInline::paintOutline): 29 * khtml/rendering/render_object.cpp: 30 (RenderObject::paintOutline): 31 * khtml/rendering/render_style.h: 32 (khtml::OutlineValue::OutlineValue): 33 (khtml::RenderStyle::outlineSize): 34 (khtml::RenderStyle::outlineOffset): 35 (khtml::RenderStyle::setOutlineOffset): 36 * khtml/rendering/render_text.cpp: 37 (RenderText::paintObject): 38 * kwq/KWQPainter.h: 39 * kwq/KWQPainter.mm: 40 (QPainterPrivate::QPainterPrivate): 41 (QPainter::initFocusRing): 42 (QPainter::addFocusRingRect): 43 1 44 2003-11-01 Maciej Stachowiak <mjs@apple.com> 2 45 -
trunk/WebCore/khtml/css/cssparser.cpp
r5340 r5358 993 993 994 994 /* CSS3 properties */ 995 case CSS_PROP_OUTLINE_OFFSET: 996 valid_primitive = validUnit(value, FLength, strict&(!nonCSSHint)); 997 break; 995 998 case CSS_PROP_TEXT_SHADOW: // CSS2 property, dropped in CSS2.1, back in CSS3, so treat as CSS3 996 999 if (id == CSS_VAL_NONE) -
trunk/WebCore/khtml/css/cssproperties.c
r5340 r5358 8 8 int id; 9 9 }; 10 /* maximum key range = 988, duplicates = 0 */10 /* maximum key range = 1183, duplicates = 0 */ 11 11 12 12 #ifdef __GNUC__ … … 22 22 static const unsigned short asso_values[] = 23 23 { 24 993, 993, 993, 993, 993, 993, 993, 993, 993, 993,25 993, 993, 993, 993, 993, 993, 993, 993, 993, 993,26 993, 993, 993, 993, 993, 993, 993, 993, 993, 993,27 993, 993, 993, 993, 993, 993, 993, 993, 993, 993,28 993, 993, 993, 993, 993, 0, 993, 993, 993, 993,29 993, 10, 993, 993, 993, 993, 993, 993, 993, 993,30 993, 993, 993, 993, 993, 993, 993, 993, 993, 993,31 993, 993, 993, 993, 993, 993, 993, 993, 993, 993,32 993, 993, 993, 993, 993, 993, 993, 993, 993, 993,33 993, 993, 993, 993, 993, 993, 993, 15, 10,0,34 0, 0, 180, 35, 0, 0, 0, 0, 0,10,35 315, 0, 65, 25, 0, 25, 0, 20, 30, 240,36 125, 155, 5, 993, 993, 993, 993, 993, 993, 993,37 993, 993, 993, 993, 993, 993, 993, 993, 993, 993,38 993, 993, 993, 993, 993, 993, 993, 993, 993, 993,39 993, 993, 993, 993, 993, 993, 993, 993, 993, 993,40 993, 993, 993, 993, 993, 993, 993, 993, 993, 993,41 993, 993, 993, 993, 993, 993, 993, 993, 993, 993,42 993, 993, 993, 993, 993, 993, 993, 993, 993, 993,43 993, 993, 993, 993, 993, 993, 993, 993, 993, 993,44 993, 993, 993, 993, 993, 993, 993, 993, 993, 993,45 993, 993, 993, 993, 993, 993, 993, 993, 993, 993,46 993, 993, 993, 993, 993, 993, 993, 993, 993, 993,47 993, 993, 993, 993, 993, 993, 993, 993, 993, 993,48 993, 993, 993, 993, 993, 993, 993, 993, 993, 993,49 993, 993, 993, 993, 993, 99324 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 25 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 26 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 27 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 28 1188, 1188, 1188, 1188, 1188, 0, 1188, 1188, 1188, 1188, 29 1188, 5, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 30 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 31 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 32 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 33 1188, 1188, 1188, 1188, 1188, 1188, 1188, 15, 10, 0, 34 0, 0, 10, 35, 0, 0, 5, 0, 0, 10, 35 320, 0, 65, 25, 0, 25, 0, 200, 20, 260, 36 135, 155, 45, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 37 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 38 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 39 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 40 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 41 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 42 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 43 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 44 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 45 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 46 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 47 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 48 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 49 1188, 1188, 1188, 1188, 1188, 1188 50 50 }; 51 51 register int hval = len; … … 131 131 enum 132 132 { 133 TOTAL_KEYWORDS = 1 29,133 TOTAL_KEYWORDS = 130, 134 134 MIN_WORD_LENGTH = 3, 135 135 MAX_WORD_LENGTH = 32, 136 136 MIN_HASH_VALUE = 5, 137 MAX_HASH_VALUE = 992137 MAX_HASH_VALUE = 1187 138 138 }; 139 139 … … 141 141 { 142 142 {"color", CSS_PROP_COLOR}, 143 {"left", CSS_PROP_LEFT}, 143 144 {"border", CSS_PROP_BORDER}, 144 145 {"clear", CSS_PROP_CLEAR}, 145 146 {"border-color", CSS_PROP_BORDER_COLOR}, 146 147 {"bottom", CSS_PROP_BOTTOM}, 147 {"size", CSS_PROP_SIZE}, 148 {"float", CSS_PROP_FLOAT}, 149 {"border-left", CSS_PROP_BORDER_LEFT}, 150 {"border-left-color", CSS_PROP_BORDER_LEFT_COLOR}, 148 151 {"right", CSS_PROP_RIGHT}, 149 152 {"height", CSS_PROP_HEIGHT}, 150 153 {"border-bottom", CSS_PROP_BORDER_BOTTOM}, 151 154 {"border-bottom-color", CSS_PROP_BORDER_BOTTOM_COLOR}, 152 {"cursor", CSS_PROP_CURSOR},153 155 {"border-right", CSS_PROP_BORDER_RIGHT}, 154 156 {"border-right-color", CSS_PROP_BORDER_RIGHT_COLOR}, 155 157 {"top", CSS_PROP_TOP}, 156 158 {"clip", CSS_PROP_CLIP}, 157 {"quotes", CSS_PROP_QUOTES}, 159 {"size", CSS_PROP_SIZE}, 160 {"marker-offset", CSS_PROP_MARKER_OFFSET}, 158 161 {"border-top", CSS_PROP_BORDER_TOP}, 159 162 {"scrollbar-track-color", CSS_PROP_SCROLLBAR_TRACK_COLOR}, 160 163 {"border-top-color", CSS_PROP_BORDER_TOP_COLOR}, 161 {" -khtml-marquee", CSS_PROP__KHTML_MARQUEE},164 {"scrollbar-face-color", CSS_PROP_SCROLLBAR_FACE_COLOR}, 162 165 {"scrollbar-3dlight-color", CSS_PROP_SCROLLBAR_3DLIGHT_COLOR}, 163 166 {"page", CSS_PROP_PAGE}, 164 167 {"border-collapse", CSS_PROP_BORDER_COLLAPSE}, 165 168 {"scrollbar-highlight-color", CSS_PROP_SCROLLBAR_HIGHLIGHT_COLOR}, 166 {"left", CSS_PROP_LEFT}, 167 {"-khtml-marquee-speed", CSS_PROP__KHTML_MARQUEE_SPEED}, 169 {"page-break-before", CSS_PROP_PAGE_BREAK_BEFORE}, 170 {"page-break-after", CSS_PROP_PAGE_BREAK_AFTER}, 171 {"border-style", CSS_PROP_BORDER_STYLE}, 168 172 {"max-height", CSS_PROP_MAX_HEIGHT}, 169 {"float", CSS_PROP_FLOAT},170 {"border-left", CSS_PROP_BORDER_LEFT},171 {"border-style", CSS_PROP_BORDER_STYLE},172 {"border-left-color", CSS_PROP_BORDER_LEFT_COLOR},173 173 {"list-style", CSS_PROP_LIST_STYLE}, 174 {"table-layout", CSS_PROP_TABLE_LAYOUT}, 174 {"border-left-style", CSS_PROP_BORDER_LEFT_STYLE}, 175 {"visibility", CSS_PROP_VISIBILITY}, 175 176 {"border-bottom-style", CSS_PROP_BORDER_BOTTOM_STYLE}, 176 {"visibility", CSS_PROP_VISIBILITY}, 177 {"-khtml-box-pack", CSS_PROP__KHTML_BOX_PACK}, 177 {"cursor", CSS_PROP_CURSOR}, 178 178 {"opacity", CSS_PROP_OPACITY}, 179 179 {"border-right-style", CSS_PROP_BORDER_RIGHT_STYLE}, 180 {"-khtml-box-pack", CSS_PROP__KHTML_BOX_PACK}, 181 {"quotes", CSS_PROP_QUOTES}, 180 182 {"width", CSS_PROP_WIDTH}, 181 {"border-width", CSS_PROP_BORDER_WIDTH},182 {"scrollbar-face-color", CSS_PROP_SCROLLBAR_FACE_COLOR},183 183 {"empty-cells", CSS_PROP_EMPTY_CELLS}, 184 184 {"display", CSS_PROP_DISPLAY}, 185 185 {"border-top-style", CSS_PROP_BORDER_TOP_STYLE}, 186 {"-khtml-marquee -style", CSS_PROP__KHTML_MARQUEE_STYLE},186 {"-khtml-marquee", CSS_PROP__KHTML_MARQUEE}, 187 187 {"list-style-image", CSS_PROP_LIST_STYLE_IMAGE}, 188 {"border-width", CSS_PROP_BORDER_WIDTH}, 189 {"border-left-width", CSS_PROP_BORDER_LEFT_WIDTH}, 190 {"overflow", CSS_PROP_OVERFLOW}, 191 {"-khtml-flow-mode", CSS_PROP__KHTML_FLOW_MODE}, 188 192 {"border-bottom-width", CSS_PROP_BORDER_BOTTOM_WIDTH}, 193 {"-khtml-box-flex", CSS_PROP__KHTML_BOX_FLEX}, 189 194 {"border-right-width", CSS_PROP_BORDER_RIGHT_WIDTH}, 190 195 {"direction", CSS_PROP_DIRECTION}, 196 {"font", CSS_PROP_FONT}, 191 197 {"scrollbar-arrow-color", CSS_PROP_SCROLLBAR_ARROW_COLOR}, 192 198 {"border-top-width", CSS_PROP_BORDER_TOP_WIDTH}, 193 {"outline", CSS_PROP_OUTLINE}, 194 {"page-break-before", CSS_PROP_PAGE_BREAK_BEFORE}, 195 {"outline-color", CSS_PROP_OUTLINE_COLOR}, 196 {"page-break-after", CSS_PROP_PAGE_BREAK_AFTER}, 199 {"line-height", CSS_PROP_LINE_HEIGHT}, 200 {"font-stretch", CSS_PROP_FONT_STRETCH}, 201 {"-khtml-marquee-speed", CSS_PROP__KHTML_MARQUEE_SPEED}, 197 202 {"scrollbar-shadow-color", CSS_PROP_SCROLLBAR_SHADOW_COLOR}, 203 {"min-height", CSS_PROP_MIN_HEIGHT}, 198 204 {"white-space", CSS_PROP_WHITE_SPACE}, 199 {"unicode-bidi", CSS_PROP_UNICODE_BIDI}, 200 {"line-height", CSS_PROP_LINE_HEIGHT}, 201 {"min-height", CSS_PROP_MIN_HEIGHT}, 205 {"margin", CSS_PROP_MARGIN}, 202 206 {"scrollbar-darkshadow-color", CSS_PROP_SCROLLBAR_DARKSHADOW_COLOR}, 203 {"counter-reset", CSS_PROP_COUNTER_RESET}, 204 {"margin", CSS_PROP_MARGIN}, 205 {"border-left-style", CSS_PROP_BORDER_LEFT_STYLE}, 207 {"margin-left", CSS_PROP_MARGIN_LEFT}, 208 {"table-layout", CSS_PROP_TABLE_LAYOUT}, 209 {"font-size", CSS_PROP_FONT_SIZE}, 210 {"margin-bottom", CSS_PROP_MARGIN_BOTTOM}, 211 {"position", CSS_PROP_POSITION}, 212 {"vertical-align", CSS_PROP_VERTICAL_ALIGN}, 213 {"margin-right", CSS_PROP_MARGIN_RIGHT}, 206 214 {"max-width", CSS_PROP_MAX_WIDTH}, 207 {"background", CSS_PROP_BACKGROUND},208 {"margin-bottom", CSS_PROP_MARGIN_BOTTOM},209 {"background-color", CSS_PROP_BACKGROUND_COLOR},210 {"position", CSS_PROP_POSITION},211 {"text-shadow", CSS_PROP_TEXT_SHADOW},212 {"-khtml-marquee-direction", CSS_PROP__KHTML_MARQUEE_DIRECTION},213 {"margin-right", CSS_PROP_MARGIN_RIGHT},214 {"marker-offset", CSS_PROP_MARKER_OFFSET},215 {"vertical-align", CSS_PROP_VERTICAL_ALIGN},216 215 {"orphans", CSS_PROP_ORPHANS}, 217 216 {"caption-side", CSS_PROP_CAPTION_SIDE}, 217 {"list-style-type", CSS_PROP_LIST_STYLE_TYPE}, 218 218 {"padding", CSS_PROP_PADDING}, 219 {"list-style-type", CSS_PROP_LIST_STYLE_TYPE}, 220 {"border-left-width", CSS_PROP_BORDER_LEFT_WIDTH}, 219 {"text-shadow", CSS_PROP_TEXT_SHADOW}, 221 220 {"margin-top", CSS_PROP_MARGIN_TOP}, 222 {"z-index", CSS_PROP_Z_INDEX}, 223 {"-khtml-flow-mode", CSS_PROP__KHTML_FLOW_MODE}, 224 {"overflow", CSS_PROP_OVERFLOW}, 221 {"padding-left", CSS_PROP_PADDING_LEFT}, 222 {"-khtml-marquee-style", CSS_PROP__KHTML_MARQUEE_STYLE}, 225 223 {"padding-bottom", CSS_PROP_PADDING_BOTTOM}, 226 {"-khtml-box-flex", CSS_PROP__KHTML_BOX_FLEX},227 224 {"letter-spacing", CSS_PROP_LETTER_SPACING}, 225 {"padding-right", CSS_PROP_PADDING_RIGHT}, 226 {"border-spacing", CSS_PROP_BORDER_SPACING}, 228 227 {"text-decoration", CSS_PROP_TEXT_DECORATION}, 229 {"background-image", CSS_PROP_BACKGROUND_IMAGE},230 228 {"text-decoration-color", CSS_PROP_TEXT_DECORATION_COLOR}, 231 229 {"-khtml-box-orient", CSS_PROP__KHTML_BOX_ORIENT}, 232 {"padding-right", CSS_PROP_PADDING_RIGHT},233 {"border-spacing", CSS_PROP_BORDER_SPACING},234 230 {"-khtml-box-direction", CSS_PROP__KHTML_BOX_DIRECTION}, 231 {"page-break-inside", CSS_PROP_PAGE_BREAK_INSIDE}, 232 {"z-index", CSS_PROP_Z_INDEX}, 233 {"padding-top", CSS_PROP_PADDING_TOP}, 234 {"text-align", CSS_PROP_TEXT_ALIGN}, 235 {"-khtml-box-lines", CSS_PROP__KHTML_BOX_LINES}, 236 {"font-style", CSS_PROP_FONT_STYLE}, 237 {"outline", CSS_PROP_OUTLINE}, 238 {"text-transform", CSS_PROP_TEXT_TRANSFORM}, 239 {"font-family", CSS_PROP_FONT_FAMILY}, 240 {"outline-color", CSS_PROP_OUTLINE_COLOR}, 241 {"-khtml-box-align", CSS_PROP__KHTML_BOX_ALIGN}, 242 {"unicode-bidi", CSS_PROP_UNICODE_BIDI}, 243 {"-khtml-border-vertical-spacing", CSS_PROP__KHTML_BORDER_VERTICAL_SPACING}, 244 {"widows", CSS_PROP_WIDOWS}, 245 {"counter-reset", CSS_PROP_COUNTER_RESET}, 246 {"outline-offset", CSS_PROP_OUTLINE_OFFSET}, 247 {"background", CSS_PROP_BACKGROUND}, 248 {"background-color", CSS_PROP_BACKGROUND_COLOR}, 249 {"min-width", CSS_PROP_MIN_WIDTH}, 250 {"-khtml-marquee-direction", CSS_PROP__KHTML_MARQUEE_DIRECTION}, 251 {"-khtml-box-flex-group", CSS_PROP__KHTML_BOX_FLEX_GROUP}, 252 {"list-style-position", CSS_PROP_LIST_STYLE_POSITION}, 253 {"font-weight", CSS_PROP_FONT_WEIGHT}, 254 {"content", CSS_PROP_CONTENT}, 255 {"background-image", CSS_PROP_BACKGROUND_IMAGE}, 256 {"font-size-adjust", CSS_PROP_FONT_SIZE_ADJUST}, 235 257 {"-khtml-marquee-repetition", CSS_PROP__KHTML_MARQUEE_REPETITION}, 236 258 {"background-repeat", CSS_PROP_BACKGROUND_REPEAT}, 237 {"page-break-inside", CSS_PROP_PAGE_BREAK_INSIDE}, 238 {"font", CSS_PROP_FONT}, 239 {"text-align", CSS_PROP_TEXT_ALIGN}, 240 {"-khtml-box-lines", CSS_PROP__KHTML_BOX_LINES}, 241 {"padding-top", CSS_PROP_PADDING_TOP}, 242 {"widows", CSS_PROP_WIDOWS}, 243 {"-khtml-box-align", CSS_PROP__KHTML_BOX_ALIGN}, 259 {"font-variant", CSS_PROP_FONT_VARIANT}, 244 260 {"outline-style", CSS_PROP_OUTLINE_STYLE}, 245 {"font-stretch", CSS_PROP_FONT_STRETCH}, 246 {"font-size", CSS_PROP_FONT_SIZE}, 247 {"-khtml-border-vertical-spacing", CSS_PROP__KHTML_BORDER_VERTICAL_SPACING}, 248 {"margin-left", CSS_PROP_MARGIN_LEFT}, 249 {"min-width", CSS_PROP_MIN_WIDTH}, 261 {"word-spacing", CSS_PROP_WORD_SPACING}, 262 {"text-indent", CSS_PROP_TEXT_INDENT}, 250 263 {"outline-width", CSS_PROP_OUTLINE_WIDTH}, 251 {"-khtml-box-flex-group", CSS_PROP__KHTML_BOX_FLEX_GROUP},252 {"font-size-adjust", CSS_PROP_FONT_SIZE_ADJUST},253 264 {"-khtml-box-ordinal-group", CSS_PROP__KHTML_BOX_ORDINAL_GROUP}, 254 {"padding-left", CSS_PROP_PADDING_LEFT}, 255 {"list-style-position", CSS_PROP_LIST_STYLE_POSITION}, 256 {"content", CSS_PROP_CONTENT}, 257 {"text-transform", CSS_PROP_TEXT_TRANSFORM}, 258 {"font-style", CSS_PROP_FONT_STYLE}, 259 {"word-spacing", CSS_PROP_WORD_SPACING}, 265 {"-khtml-border-horizontal-spacing", CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING}, 260 266 {"-khtml-marquee-increment", CSS_PROP__KHTML_MARQUEE_INCREMENT}, 261 {"text-indent", CSS_PROP_TEXT_INDENT},262 267 {"background-attachment", CSS_PROP_BACKGROUND_ATTACHMENT}, 263 {"font-weight", CSS_PROP_FONT_WEIGHT},264 268 {"background-position", CSS_PROP_BACKGROUND_POSITION}, 265 {"-khtml-border-horizontal-spacing", CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING},266 {"font-family", CSS_PROP_FONT_FAMILY},267 {"font-variant", CSS_PROP_FONT_VARIANT},268 269 {"background-position-x", CSS_PROP_BACKGROUND_POSITION_X}, 269 270 {"background-position-y", CSS_PROP_BACKGROUND_POSITION_Y}, … … 274 275 { 275 276 -1, -1, -1, -1, -1, 0, -1, -1, -1, -1, 276 -1, -1, -1, -1, -1, -1, 1, -1, -1, -1, 277 2, -1, 3, -1, -1, -1, 4, -1, -1, -1, 278 -1, -1, -1, -1, 5, -1, -1, -1, -1, -1, 279 6, 7, -1, 8, -1, -1, -1, -1, -1, 9, 280 -1, 10, -1, -1, -1, -1, -1, 11, -1, -1, 281 -1, -1, -1, 12, -1, -1, -1, -1, 13, 14, 282 -1, -1, -1, -1, -1, -1, 15, -1, -1, -1, 283 -1, -1, -1, -1, -1, 16, 17, -1, -1, -1, 284 -1, 18, -1, -1, 19, -1, -1, -1, -1, -1, 285 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 286 -1, -1, -1, -1, -1, -1, -1, -1, 20, 21, 287 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 288 22, -1, -1, -1, -1, -1, -1, -1, -1, -1, 289 -1, -1, -1, -1, -1, 23, -1, -1, -1, -1, 290 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 291 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 292 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 293 -1, -1, -1, -1, 24, -1, -1, -1, -1, -1, 294 25, -1, -1, -1, -1, 26, -1, -1, -1, -1, 295 27, 28, 29, -1, -1, -1, -1, 30, -1, -1, 296 -1, -1, -1, -1, -1, 31, -1, -1, -1, -1, 297 -1, -1, -1, -1, -1, -1, -1, 32, -1, 33, 298 34, -1, -1, -1, -1, -1, -1, -1, -1, -1, 299 35, -1, 36, 37, -1, 38, -1, -1, -1, -1, 300 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 301 -1, -1, 39, -1, -1, 40, 41, 42, -1, -1, 302 -1, 43, -1, -1, -1, -1, -1, -1, -1, -1, 303 44, 45, -1, -1, -1, -1, -1, -1, -1, 46, 304 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 305 -1, -1, -1, 47, -1, -1, -1, -1, -1, -1, 306 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 307 -1, -1, -1, -1, 48, -1, 49, -1, -1, -1, 308 -1, 50, -1, -1, -1, -1, -1, -1, -1, -1, 309 -1, -1, 51, -1, -1, -1, -1, 52, 53, -1, 310 -1, 54, 55, -1, -1, -1, 56, 57, -1, -1, 311 -1, 58, -1, -1, -1, -1, -1, -1, -1, -1, 312 59, 60, -1, 61, -1, -1, -1, -1, -1, -1, 313 -1, 62, -1, -1, -1, -1, -1, 63, -1, -1, 314 -1, -1, -1, -1, -1, -1, -1, -1, -1, 64, 315 -1, -1, -1, -1, -1, 65, -1, -1, 66, -1, 316 -1, 67, -1, 68, -1, -1, 69, -1, -1, 70, 317 -1, -1, 71, 72, 73, -1, -1, 74, -1, -1, 318 -1, -1, 75, -1, -1, -1, -1, 76, -1, -1, 319 77, -1, -1, -1, -1, -1, -1, 78, -1, -1, 320 79, -1, 80, -1, -1, -1, 81, -1, 82, -1, 321 -1, -1, -1, -1, 83, 84, -1, -1, -1, 85, 322 86, 87, -1, -1, -1, -1, 88, 89, 90, 91, 323 92, -1, -1, -1, -1, 93, -1, -1, -1, -1, 324 -1, -1, 94, -1, -1, -1, -1, 95, -1, 96, 325 97, 98, -1, -1, -1, -1, 99, -1, -1, -1, 326 -1, 100, -1, -1, -1, -1, -1, -1, -1, -1, 327 -1, -1, -1, -1, -1, -1, 101, -1, 102, -1, 328 -1, -1, 103, -1, 104, -1, -1, -1, -1, -1, 329 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 330 105, -1, -1, -1, -1, -1, -1, -1, -1, -1, 331 -1, -1, -1, -1, -1, -1, 106, -1, -1, -1, 332 -1, -1, -1, -1, 107, -1, -1, -1, -1, -1, 333 -1, -1, -1, -1, -1, -1, -1, -1, 108, -1, 277 -1, -1, -1, -1, 1, -1, 2, -1, -1, -1, 278 3, -1, 4, -1, -1, -1, 5, -1, -1, -1, 279 6, 7, -1, -1, -1, -1, -1, 8, -1, -1, 280 9, 10, -1, 11, -1, -1, -1, -1, -1, 12, 281 -1, -1, -1, -1, -1, -1, -1, 13, -1, -1, 282 -1, -1, -1, 14, -1, -1, -1, -1, 15, 16, 283 -1, -1, -1, -1, 17, -1, -1, -1, -1, -1, 284 -1, -1, -1, 18, -1, 19, 20, -1, -1, -1, 285 -1, 21, -1, -1, -1, 22, -1, -1, -1, -1, 286 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 287 -1, -1, -1, 23, -1, -1, -1, -1, -1, 24, 288 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 289 25, -1, -1, -1, -1, -1, -1, -1, -1, -1, 290 -1, -1, -1, -1, -1, 26, -1, -1, -1, -1, 291 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 292 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 293 -1, -1, -1, -1, -1, -1, -1, 27, -1, -1, 294 -1, 28, -1, -1, -1, -1, -1, -1, -1, -1, 295 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 296 -1, -1, 29, -1, -1, 30, -1, -1, -1, -1, 297 -1, -1, -1, -1, -1, 31, -1, 32, -1, -1, 298 33, -1, -1, -1, -1, -1, -1, -1, -1, 34, 299 -1, 35, -1, -1, -1, -1, -1, -1, -1, -1, 300 -1, -1, 36, 37, -1, -1, -1, -1, -1, -1, 301 38, -1, -1, -1, -1, -1, 39, -1, -1, -1, 302 -1, -1, -1, -1, -1, 40, 41, 42, -1, -1, 303 -1, 43, -1, -1, 44, -1, -1, -1, -1, -1, 304 -1, 45, 46, -1, -1, -1, -1, -1, -1, -1, 305 -1, -1, -1, -1, -1, -1, -1, 47, 48, -1, 306 -1, -1, -1, -1, -1, -1, 49, -1, -1, 50, 307 -1, -1, -1, -1, -1, 51, -1, -1, -1, -1, 308 -1, -1, -1, 52, -1, -1, -1, -1, -1, 53, 309 -1, -1, -1, -1, 54, -1, -1, -1, -1, -1, 310 -1, -1, -1, -1, -1, -1, 55, -1, -1, -1, 311 -1, 56, -1, -1, -1, -1, -1, -1, -1, -1, 312 -1, -1, -1, -1, -1, -1, 57, 58, -1, -1, 313 59, -1, 60, -1, -1, 61, 62, -1, -1, -1, 314 -1, -1, -1, -1, -1, -1, 63, -1, -1, -1, 315 -1, 64, -1, -1, -1, -1, -1, -1, -1, -1, 316 -1, 65, -1, -1, -1, -1, -1, 66, -1, 67, 317 -1, -1, -1, 68, -1, -1, -1, -1, 69, 70, 318 -1, -1, -1, -1, -1, -1, -1, 71, -1, 72, 319 -1, -1, 73, -1, -1, -1, -1, 74, -1, -1, 320 75, -1, 76, -1, -1, -1, 77, -1, -1, -1, 321 -1, -1, -1, -1, -1, 78, -1, 79, -1, -1, 322 80, -1, -1, -1, -1, -1, -1, -1, -1, 81, 323 -1, -1, -1, -1, 82, -1, -1, -1, -1, -1, 324 -1, -1, -1, 83, 84, 85, -1, -1, -1, -1, 325 -1, 86, 87, -1, -1, 88, -1, -1, -1, -1, 326 -1, -1, 89, -1, -1, -1, -1, 90, -1, -1, 327 -1, 91, -1, -1, -1, 92, 93, -1, -1, -1, 328 94, -1, -1, -1, -1, -1, -1, 95, -1, 96, 329 -1, 97, -1, 98, -1, -1, -1, -1, -1, -1, 330 -1, 99, 100, -1, -1, 101, -1, -1, -1, -1, 331 -1, 102, -1, -1, -1, -1, -1, -1, 103, -1, 332 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 333 -1, -1, -1, -1, -1, -1, -1, -1, -1, 104, 334 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 335 105, -1, -1, -1, -1, -1, 106, -1, -1, 107, 336 -1, -1, -1, -1, 108, -1, -1, -1, -1, -1, 337 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 334 338 -1, 109, -1, -1, -1, -1, -1, -1, -1, -1, 335 -1, 110, -1, -1, -1, -1, -1, -1, -1, -1, 336 -1, -1, -1, -1, -1, -1, -1, -1, -1, 111, 337 -1, -1, 112, -1, -1, -1, -1, -1, -1, 113, 338 -1, -1, -1, -1, -1, -1, -1, 114, -1, -1, 339 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 340 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 341 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 342 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 343 -1, -1, -1, -1, 115, 116, -1, -1, -1, -1, 344 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 345 -1, -1, -1, -1, -1, -1, -1, 117, -1, -1, 346 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 347 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 348 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 349 -1, -1, -1, -1, 118, -1, -1, -1, -1, -1, 350 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 351 -1, -1, -1, -1, -1, -1, 119, -1, -1, -1, 352 -1, 120, -1, -1, -1, -1, -1, -1, -1, -1, 353 -1, 121, -1, -1, -1, -1, -1, -1, -1, -1, 354 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 355 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 356 -1, -1, -1, -1, -1, -1, -1, -1, -1, 122, 339 -1, -1, -1, -1, 110, -1, 111, -1, -1, -1, 340 -1, -1, -1, -1, -1, -1, -1, 112, -1, -1, 341 -1, -1, -1, -1, -1, -1, 113, -1, -1, -1, 342 -1, 114, -1, -1, -1, -1, -1, -1, -1, -1, 343 115, -1, -1, -1, -1, -1, -1, 116, -1, -1, 344 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 345 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 346 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 347 -1, -1, 117, 118, -1, -1, -1, -1, -1, -1, 348 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 349 -1, -1, 119, -1, -1, -1, -1, -1, -1, -1, 350 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 351 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 352 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 353 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 354 -1, -1, -1, -1, -1, -1, 120, -1, -1, -1, 355 -1, -1, -1, 121, -1, -1, -1, -1, -1, -1, 356 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 357 -1, -1, -1, -1, 122, -1, -1, -1, -1, -1, 358 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 359 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 360 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 361 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 362 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 357 363 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 358 364 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 359 365 -1, -1, 123, -1, -1, -1, -1, -1, -1, -1, 360 366 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 361 -1, -1, -1, -1, -1, -1, 124, -1, -1, -1, 362 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 363 -1, -1, 125, -1, -1, -1, -1, -1, -1, -1, 364 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 365 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 366 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 367 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 368 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 369 -1, -1, -1, -1, -1, -1, 126, -1, -1, -1, 367 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 368 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 369 -1, -1, -1, -1, 124, -1, -1, -1, -1, -1, 370 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 371 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 372 -1, 125, -1, -1, -1, -1, -1, -1, -1, -1, 373 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 374 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 375 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 376 -1, -1, -1, -1, -1, -1, -1, -1, -1, 126, 377 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 378 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 379 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 380 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 381 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 382 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 383 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 384 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 385 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 386 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 387 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 370 388 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 371 389 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 372 390 -1, -1, -1, -1, -1, -1, 127, -1, -1, -1, 373 391 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 374 -1, -1, 128 392 -1, -1, -1, -1, -1, -1, 128, -1, -1, -1, 393 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 394 -1, -1, -1, -1, -1, -1, -1, 129 375 395 }; 376 396 … … 472 492 "orphans", 473 493 "outline-color", 494 "outline-offset", 474 495 "outline-style", 475 496 "outline-width", -
trunk/WebCore/khtml/css/cssproperties.h
r5340 r5358 84 84 #define CSS_PROP_ORPHANS 75 85 85 #define CSS_PROP_OUTLINE_COLOR 76 86 #define CSS_PROP_OUTLINE_STYLE 77 87 #define CSS_PROP_OUTLINE_WIDTH 78 88 #define CSS_PROP_OVERFLOW 79 89 #define CSS_PROP_PADDING_TOP 80 90 #define CSS_PROP_PADDING_RIGHT 81 91 #define CSS_PROP_PADDING_BOTTOM 82 92 #define CSS_PROP_PADDING_LEFT 83 93 #define CSS_PROP_PAGE 84 94 #define CSS_PROP_PAGE_BREAK_AFTER 85 95 #define CSS_PROP_PAGE_BREAK_BEFORE 86 96 #define CSS_PROP_PAGE_BREAK_INSIDE 87 97 #define CSS_PROP_POSITION 88 98 #define CSS_PROP_QUOTES 89 99 #define CSS_PROP_RIGHT 90 100 #define CSS_PROP_SIZE 91 101 #define CSS_PROP_TABLE_LAYOUT 92 102 #define CSS_PROP_TEXT_ALIGN 93 103 #define CSS_PROP_TEXT_DECORATION 94 104 #define CSS_PROP_TEXT_DECORATION_COLOR 95 105 #define CSS_PROP_TEXT_INDENT 96 106 #define CSS_PROP_TEXT_SHADOW 97 107 #define CSS_PROP_TEXT_TRANSFORM 98 108 #define CSS_PROP_TOP 99 109 #define CSS_PROP_UNICODE_BIDI 100 110 #define CSS_PROP_VERTICAL_ALIGN 101 111 #define CSS_PROP_VISIBILITY 102 112 #define CSS_PROP_WHITE_SPACE 103 113 #define CSS_PROP_WIDOWS 104 114 #define CSS_PROP_WIDTH 105 115 #define CSS_PROP_WORD_SPACING 106 116 #define CSS_PROP_Z_INDEX 107 117 #define CSS_PROP_BACKGROUND 108 118 #define CSS_PROP_BORDER 109 119 #define CSS_PROP_BORDER_COLOR 110 120 #define CSS_PROP_BORDER_STYLE 111 121 #define CSS_PROP_BORDER_TOP 112 122 #define CSS_PROP_BORDER_RIGHT 113 123 #define CSS_PROP_BORDER_BOTTOM 114 124 #define CSS_PROP_BORDER_LEFT 115 125 #define CSS_PROP_BORDER_WIDTH 116 126 #define CSS_PROP_FONT 117 127 #define CSS_PROP_LIST_STYLE 118 128 #define CSS_PROP_MARGIN 119 129 #define CSS_PROP_OUTLINE 120 130 #define CSS_PROP_PADDING 121 131 #define CSS_PROP_SCROLLBAR_FACE_COLOR 122 132 #define CSS_PROP_SCROLLBAR_SHADOW_COLOR 123 133 #define CSS_PROP_SCROLLBAR_HIGHLIGHT_COLOR 124 134 #define CSS_PROP_SCROLLBAR_3DLIGHT_COLOR 125 135 #define CSS_PROP_SCROLLBAR_DARKSHADOW_COLOR 126 136 #define CSS_PROP_SCROLLBAR_TRACK_COLOR 127 137 #define CSS_PROP_SCROLLBAR_ARROW_COLOR 128 138 #define CSS_PROP__KHTML_FLOW_MODE 129 86 #define CSS_PROP_OUTLINE_OFFSET 77 87 #define CSS_PROP_OUTLINE_STYLE 78 88 #define CSS_PROP_OUTLINE_WIDTH 79 89 #define CSS_PROP_OVERFLOW 80 90 #define CSS_PROP_PADDING_TOP 81 91 #define CSS_PROP_PADDING_RIGHT 82 92 #define CSS_PROP_PADDING_BOTTOM 83 93 #define CSS_PROP_PADDING_LEFT 84 94 #define CSS_PROP_PAGE 85 95 #define CSS_PROP_PAGE_BREAK_AFTER 86 96 #define CSS_PROP_PAGE_BREAK_BEFORE 87 97 #define CSS_PROP_PAGE_BREAK_INSIDE 88 98 #define CSS_PROP_POSITION 89 99 #define CSS_PROP_QUOTES 90 100 #define CSS_PROP_RIGHT 91 101 #define CSS_PROP_SIZE 92 102 #define CSS_PROP_TABLE_LAYOUT 93 103 #define CSS_PROP_TEXT_ALIGN 94 104 #define CSS_PROP_TEXT_DECORATION 95 105 #define CSS_PROP_TEXT_DECORATION_COLOR 96 106 #define CSS_PROP_TEXT_INDENT 97 107 #define CSS_PROP_TEXT_SHADOW 98 108 #define CSS_PROP_TEXT_TRANSFORM 99 109 #define CSS_PROP_TOP 100 110 #define CSS_PROP_UNICODE_BIDI 101 111 #define CSS_PROP_VERTICAL_ALIGN 102 112 #define CSS_PROP_VISIBILITY 103 113 #define CSS_PROP_WHITE_SPACE 104 114 #define CSS_PROP_WIDOWS 105 115 #define CSS_PROP_WIDTH 106 116 #define CSS_PROP_WORD_SPACING 107 117 #define CSS_PROP_Z_INDEX 108 118 #define CSS_PROP_BACKGROUND 109 119 #define CSS_PROP_BORDER 110 120 #define CSS_PROP_BORDER_COLOR 111 121 #define CSS_PROP_BORDER_STYLE 112 122 #define CSS_PROP_BORDER_TOP 113 123 #define CSS_PROP_BORDER_RIGHT 114 124 #define CSS_PROP_BORDER_BOTTOM 115 125 #define CSS_PROP_BORDER_LEFT 116 126 #define CSS_PROP_BORDER_WIDTH 117 127 #define CSS_PROP_FONT 118 128 #define CSS_PROP_LIST_STYLE 119 129 #define CSS_PROP_MARGIN 120 130 #define CSS_PROP_OUTLINE 121 131 #define CSS_PROP_PADDING 122 132 #define CSS_PROP_SCROLLBAR_FACE_COLOR 123 133 #define CSS_PROP_SCROLLBAR_SHADOW_COLOR 124 134 #define CSS_PROP_SCROLLBAR_HIGHLIGHT_COLOR 125 135 #define CSS_PROP_SCROLLBAR_3DLIGHT_COLOR 126 136 #define CSS_PROP_SCROLLBAR_DARKSHADOW_COLOR 127 137 #define CSS_PROP_SCROLLBAR_TRACK_COLOR 128 138 #define CSS_PROP_SCROLLBAR_ARROW_COLOR 129 139 #define CSS_PROP__KHTML_FLOW_MODE 130 139 140 140 141 #define CSS_PROP_MAX CSS_PROP_Z_INDEX 141 #define CSS_PROP_TOTAL 13 0142 #define CSS_PROP_TOTAL 131 142 143 #endif 143 144 -
trunk/WebCore/khtml/css/cssproperties.in
r5340 r5358 95 95 orphans 96 96 outline-color 97 outline-offset 97 98 outline-style 98 99 outline-width -
trunk/WebCore/khtml/css/cssstyleselector.cpp
r5340 r5358 3316 3316 3317 3317 // CSS3 Properties 3318 case CSS_PROP_OUTLINE_OFFSET: { 3319 if (value->cssValueType() == CSSValue::CSS_INHERIT) { 3320 if (!parentNode) return; 3321 style->setOutlineOffset(parentStyle->outlineOffset()); 3322 return; 3323 } 3324 3325 int offset = primitiveValue->computeLength(style, paintDeviceMetrics); 3326 if (offset < 0) return; 3327 3328 style->setOutlineOffset(offset); 3329 break; 3330 } 3331 3318 3332 case CSS_PROP_TEXT_SHADOW: { 3319 3333 if (value->cssValueType() == CSSValue::CSS_INHERIT) { -
trunk/WebCore/khtml/html/html_formimpl.cpp
r5345 r5358 823 823 bool HTMLGenericFormElementImpl::isKeyboardFocusable() const 824 824 { 825 if (isFocusable() && m_render->isWidget()) { 826 return static_cast<RenderWidget*>(m_render)->widget() && 827 ((static_cast<RenderWidget*>(m_render)->widget()->focusPolicy() == QWidget::TabFocus) || 828 (static_cast<RenderWidget*>(m_render)->widget()->focusPolicy() == QWidget::StrongFocus)); 825 if (isFocusable()) { 826 if (m_render->isWidget()) { 827 return static_cast<RenderWidget*>(m_render)->widget() && 828 ((static_cast<RenderWidget*>(m_render)->widget()->focusPolicy() == QWidget::TabFocus) || 829 (static_cast<RenderWidget*>(m_render)->widget()->focusPolicy() == QWidget::StrongFocus)); 830 } 831 return true; 829 832 } 830 833 return false; … … 833 836 bool HTMLGenericFormElementImpl::isMouseFocusable() const 834 837 { 835 if (isFocusable() && m_render->isWidget()) { 836 return static_cast<RenderWidget*>(m_render)->widget() && 837 ((static_cast<RenderWidget*>(m_render)->widget()->focusPolicy() == QWidget::ClickFocus) || 838 (static_cast<RenderWidget*>(m_render)->widget()->focusPolicy() == QWidget::StrongFocus)); 838 if (isFocusable()) { 839 if (m_render->isWidget()) { 840 return static_cast<RenderWidget*>(m_render)->widget() && 841 ((static_cast<RenderWidget*>(m_render)->widget()->focusPolicy() == QWidget::ClickFocus) || 842 (static_cast<RenderWidget*>(m_render)->widget()->focusPolicy() == QWidget::StrongFocus)); 843 } 844 return true; 839 845 } 840 846 return false; -
trunk/WebCore/khtml/rendering/render_box.cpp
r5313 r5358 581 581 QRect RenderBox::getAbsoluteRepaintRect() 582 582 { 583 int ow = style() ? style()->outline Width() : 0;583 int ow = style() ? style()->outlineSize() : 0; 584 584 QRect r(-ow, -ow, overflowWidth(false)+ow*2, overflowHeight(false)+ow*2); 585 585 computeAbsoluteRepaintRect(r); … … 612 612 // scrollbars. 613 613 if (o->style()->hidesOverflow() && o->layer()) { 614 int ow = o->style() ? o->style()->outline Width() : 0;614 int ow = o->style() ? o->style()->outlineSize() : 0; 615 615 QRect boxRect(-ow, -ow, o->width()+ow*2, o->height()+ow*2); 616 616 o->layer()->subtractScrollOffset(x,y); // For overflow:auto/scroll/hidden. -
trunk/WebCore/khtml/rendering/render_flow.cpp
r5335 r5358 240 240 241 241 // Now invalidate a rectangle. 242 int ow = style() ? style()->outline Width() : 0;242 int ow = style() ? style()->outlineSize() : 0; 243 243 if (isCompact()) 244 244 left -= m_x; … … 250 250 relativePositionOffset(left, top); 251 251 #endif 252 int eow = ow; 253 #ifdef APPLE_CHANGES 254 // Fudge a little to make sure we don't leave artifacts. 255 // We need to do better at this. 256 if (ow && style()->outlineStyle() == APPLEAQUA) 257 eow += 2; 258 #endif 259 QRect r(-eow+left, -eow+top, width()+eow*2, height()+eow*2); 252 QRect r(-ow+left, -ow+top, width()+ow*2, height()+ow*2); 260 253 containingBlock()->computeAbsoluteRepaintRect(r); 261 254 if (ow) { … … 277 270 else { 278 271 if (firstLineBox() && firstLineBox()->topOverflow() < 0) { 279 int ow = style() ? style()->outline Width() : 0;272 int ow = style() ? style()->outlineSize() : 0; 280 273 QRect r(-ow, -ow+firstLineBox()->topOverflow(), 281 274 overflowWidth(false)+ow*2, -
trunk/WebCore/khtml/rendering/render_inline.cpp
r5344 r5358 332 332 if (ow == 0 || m_isContinuation) // Continuations get painted by the original inline. 333 333 return; 334 334 335 335 QColor oc = style()->outlineColor(); 336 336 if (!oc.isValid()) 337 337 oc = style()->color(); 338 338 339 p->initFocusRing(ow, oc);339 p->initFocusRing(ow, style()->outlineOffset(), oc); 340 340 addFocusRingRects(p, tx, ty); 341 341 p->drawFocusRing(); … … 346 346 void RenderInline::paintOutlines(QPainter *p, int _tx, int _ty) 347 347 { 348 if (style()->outlineWidth() == 0 || style()->outlineStyle() <= BHIDDEN) 349 return; 350 348 351 QPtrList <QRect> rects; 349 352 rects.setAutoDelete(true); … … 370 373 oc = style()->color(); 371 374 372 int t = ty + thisline.top(); 373 int l = tx + thisline.left(); 374 int b = ty + thisline.bottom() + 1; 375 int r = tx + thisline.right() + 1; 375 int offset = style()->outlineOffset(); 376 377 int t = ty + thisline.top() - offset; 378 int l = tx + thisline.left() - offset; 379 int b = ty + thisline.bottom() + offset + 1; 380 int r = tx + thisline.right() + offset + 1; 376 381 377 382 // left edge -
trunk/WebCore/khtml/rendering/render_object.cpp
r5335 r5358 924 924 925 925 EBorderStyle os = style->outlineStyle(); 926 if (os <= BHIDDEN) 927 return; 928 926 929 QColor oc = style->outlineColor(); 927 930 if (!oc.isValid()) 928 931 oc = style->color(); 929 932 933 int offset = style->outlineOffset(); 934 930 935 #ifdef APPLE_CHANGES 931 936 if (os == APPLEAQUA) { 932 p->initFocusRing(ow, o c);937 p->initFocusRing(ow, offset, oc); 933 938 addFocusRingRects(p, _tx, _ty); 934 939 p->drawFocusRing(); … … 938 943 #endif 939 944 945 _tx -= offset; 946 _ty -= offset; 947 w += 2*offset; 948 h += 2*offset; 949 940 950 drawBorder(p, _tx-ow, _ty-ow, _tx, _ty+h+ow, BSLeft, 941 951 QColor(oc), style->color(), … … 1041 1051 QRect RenderObject::getAbsoluteRepaintRectWithOutline(int ow) 1042 1052 { 1043 int eow = ow;1044 #if APPLE_CHANGES1045 // Fudge a little to make sure we don't leave artifacts.1046 // We need to do better at this.1047 if (style()->outlineStyle() == APPLEAQUA)1048 eow += 2;1049 #endif1050 1053 QRect r(getAbsoluteRepaintRect()); 1051 r.setRect(r.x()- eow, r.y()-eow, r.width()+eow*2, r.height()+eow*2);1054 r.setRect(r.x()-ow, r.y()-ow, r.width()+ow*2, r.height()+ow*2); 1052 1055 1053 1056 if (continuation() && !isInline()) -
trunk/WebCore/khtml/rendering/render_style.h
r5337 r5358 226 226 }; 227 227 228 class OutlineValue : public BorderValue 229 { 230 public: 231 OutlineValue() 232 { 233 offset = 0; 234 } 235 236 int offset; 237 }; 238 228 239 enum EBorderPrecedence { BOFF, BTABLE, BCOLGROUP, BCOL, BROWGROUP, BROW, BCELL }; 229 240 … … 404 415 Length x_position; 405 416 Length y_position; 406 BorderValue outline;417 OutlineValue outline; 407 418 }; 408 419 … … 903 914 bool borderBottomIsTransparent() const { return surround->border.bottom.isTransparent(); } 904 915 905 unsigned short outlineWidth() const906 { if(background->outline.style == BNONE) return 0; return background->outline.width; }916 unsigned short outlineSize() const { return outlineWidth() + outlineOffset(); } 917 unsigned short outlineWidth() const { if (background->outline.style == BNONE) return 0; return background->outline.width; } 907 918 EBorderStyle outlineStyle() const { return background->outline.style; } 908 919 const QColor & outlineColor() const { return background->outline.color; } … … 992 1003 993 1004 // CSS3 Getter Methods 1005 int outlineOffset() const { 1006 if (background->outline.style == BNONE) return 0; return background->outline.offset; 1007 } 994 1008 ShadowData* textShadow() const { return css3InheritedData->textShadow; } 995 1009 float opacity() { return css3NonInheritedData->opacity; } … … 1160 1174 1161 1175 // CSS3 Setters 1176 void setOutlineOffset(unsigned short v) { SET_VAR(background,outline.offset,v) } 1162 1177 void setTextShadow(ShadowData* val, bool add=false); 1163 1178 void setOpacity(float f) { SET_VAR(css3NonInheritedData, opacity, f); } -
trunk/WebCore/khtml/rendering/render_text.cpp
r5327 r5358 557 557 int tx, int ty, PaintAction paintAction) 558 558 { 559 int ow = style()->outlineWidth();560 559 RenderStyle* pseudoStyle = style(true); 561 560 if (pseudoStyle == style()) pseudoStyle = 0; … … 774 773 #endif 775 774 776 } while (++si < (int)m_lines.count() && m_lines[si]->checkVerticalPoint(y -ow, ty, h));775 } while (++si < (int)m_lines.count() && m_lines[si]->checkVerticalPoint(y, ty, h)); 777 776 778 777 #if APPLE_CHANGES -
trunk/WebCore/kwq/KWQPainter.h
r5327 r5358 115 115 void clearShadow(); 116 116 117 void initFocusRing(int width );118 void initFocusRing(int width, const QColor &);117 void initFocusRing(int width, int offset); 118 void initFocusRing(int width, int offset, const QColor& color); 119 119 void addFocusRingRect(int x, int y, int width, int height); 120 120 void drawFocusRing(); -
trunk/WebCore/kwq/KWQPainter.mm
r5327 r5358 55 55 56 56 struct QPainterPrivate { 57 QPainterPrivate() : textRenderer(0), focusRingPath(0), focusRingWidth(0), hasFocusRingColor(false) { } 57 QPainterPrivate() : textRenderer(0), focusRingPath(0), focusRingWidth(0), focusRingOffset(0), 58 hasFocusRingColor(false) { } 58 59 ~QPainterPrivate() { [textRenderer release]; [focusRingPath release]; } 59 60 QPState state; … … 63 64 NSBezierPath *focusRingPath; 64 65 int focusRingWidth; 66 int focusRingOffset; 65 67 bool hasFocusRingColor; 66 68 QColor focusRingColor; … … 675 677 } 676 678 677 void QPainter::initFocusRing(int width )679 void QPainter::initFocusRing(int width, int offset) 678 680 { 679 681 clearFocusRing(); 680 682 data->focusRingWidth = width; 681 683 data->hasFocusRingColor = false; 684 data->focusRingOffset = offset; 682 685 data->focusRingPath = [[NSBezierPath alloc] init]; 683 686 [data->focusRingPath setWindingRule:NSNonZeroWindingRule]; 684 687 } 685 688 686 void QPainter::initFocusRing(int width, const QColor &color)687 { 688 initFocusRing(width );689 void QPainter::initFocusRing(int width, int offset, const QColor &color) 690 { 691 initFocusRing(width, offset); 689 692 data->hasFocusRingColor = true; 690 693 data->focusRingColor = color; … … 695 698 ASSERT(data->focusRingPath); 696 699 NSRect rect = NSMakeRect(x, y, width, height); 697 int offset = (data->focusRingWidth >> 1);700 int offset = (data->focusRingWidth-1)/2 + data->focusRingOffset; 698 701 rect = NSInsetRect(rect, -offset, -offset); 699 702 [data->focusRingPath appendBezierPathWithRect:rect]; … … 708 711 NSRect bounds = [data->focusRingPath bounds]; 709 712 if (!NSIsEmptyRect(bounds)) { 710 int radius = (data->focusRingWidth >> 1);713 int radius = (data->focusRingWidth-1)/2; 711 714 NSColor *color = data->hasFocusRingColor ? data->focusRingColor.getNSColor() : nil; 712 715 [NSGraphicsContext saveGraphicsState];
Note: See TracChangeset
for help on using the changeset viewer.