| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) |
| 3 * (C) 2000 Antti Koivisto (koivisto@kde.org) | 3 * (C) 2000 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2000 Dirk Mueller (mueller@kde.org) | 4 * (C) 2000 Dirk Mueller (mueller@kde.org) |
| 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r
ights reserved. | 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r
ights reserved. |
| 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) | 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) |
| 7 * | 7 * |
| 8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
| 9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
| 10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
| (...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 218 && pageBreakAfter == other.pageBreakAfter | 218 && pageBreakAfter == other.pageBreakAfter |
| 219 && pageBreakInside == other.pageBreakInside | 219 && pageBreakInside == other.pageBreakInside |
| 220 && styleType == other.styleType | 220 && styleType == other.styleType |
| 221 && affectedByFocus == other.affectedByFocus | 221 && affectedByFocus == other.affectedByFocus |
| 222 && affectedByHover == other.affectedByHover | 222 && affectedByHover == other.affectedByHover |
| 223 && affectedByActive == other.affectedByActive | 223 && affectedByActive == other.affectedByActive |
| 224 && affectedByDrag == other.affectedByDrag | 224 && affectedByDrag == other.affectedByDrag |
| 225 && pseudoBits == other.pseudoBits | 225 && pseudoBits == other.pseudoBits |
| 226 && unicodeBidi == other.unicodeBidi | 226 && unicodeBidi == other.unicodeBidi |
| 227 && explicitInheritance == other.explicitInheritance | 227 && explicitInheritance == other.explicitInheritance |
| 228 && currentColor == other.currentColor | |
| 229 && unique == other.unique | 228 && unique == other.unique |
| 230 && emptyState == other.emptyState | 229 && emptyState == other.emptyState |
| 231 && firstChildState == other.firstChildState | 230 && firstChildState == other.firstChildState |
| 232 && lastChildState == other.lastChildState | 231 && lastChildState == other.lastChildState |
| 233 && isLink == other.isLink; | 232 && isLink == other.isLink; |
| 234 } | 233 } |
| 235 | 234 |
| 236 bool operator!=(const NonInheritedFlags& other) const { return !(*this =
= other); } | 235 bool operator!=(const NonInheritedFlags& other) const { return !(*this =
= other); } |
| 237 | 236 |
| 238 unsigned effectiveDisplay : 5; // EDisplay | 237 unsigned effectiveDisplay : 5; // EDisplay |
| (...skipping 13 matching lines...) Expand all Loading... |
| 252 | 251 |
| 253 // 32 bits | 252 // 32 bits |
| 254 | 253 |
| 255 unsigned pageBreakBefore : 2; // EPageBreak | 254 unsigned pageBreakBefore : 2; // EPageBreak |
| 256 unsigned pageBreakAfter : 2; // EPageBreak | 255 unsigned pageBreakAfter : 2; // EPageBreak |
| 257 unsigned pageBreakInside : 2; // EPageBreak | 256 unsigned pageBreakInside : 2; // EPageBreak |
| 258 | 257 |
| 259 unsigned styleType : 6; // PseudoId | 258 unsigned styleType : 6; // PseudoId |
| 260 unsigned pseudoBits : 8; | 259 unsigned pseudoBits : 8; |
| 261 unsigned explicitInheritance : 1; // Explicitly inherits a non-inherited
property | 260 unsigned explicitInheritance : 1; // Explicitly inherits a non-inherited
property |
| 262 unsigned currentColor : 1; // At least one color has the value 'currentC
olor' | |
| 263 unsigned unique : 1; // Style can not be shared. | 261 unsigned unique : 1; // Style can not be shared. |
| 264 | 262 |
| 265 unsigned emptyState : 1; | 263 unsigned emptyState : 1; |
| 266 unsigned firstChildState : 1; | 264 unsigned firstChildState : 1; |
| 267 unsigned lastChildState : 1; | 265 unsigned lastChildState : 1; |
| 268 | 266 |
| 269 unsigned affectedByFocus : 1; | 267 unsigned affectedByFocus : 1; |
| 270 unsigned affectedByHover : 1; | 268 unsigned affectedByHover : 1; |
| 271 unsigned affectedByActive : 1; | 269 unsigned affectedByActive : 1; |
| 272 unsigned affectedByDrag : 1; | 270 unsigned affectedByDrag : 1; |
| 273 | 271 |
| 274 unsigned isLink : 1; | 272 unsigned isLink : 1; |
| 275 // If you add more style bits here, you will also need to update RenderS
tyle::copyNonInheritedFrom() | 273 // If you add more style bits here, you will also need to update RenderS
tyle::copyNonInheritedFrom() |
| 276 // 63 bits | 274 // 62 bits |
| 277 } noninherited_flags; | 275 } noninherited_flags; |
| 278 | 276 |
| 279 // !END SYNC! | 277 // !END SYNC! |
| 280 | 278 |
| 281 protected: | 279 protected: |
| 282 void setBitDefaults() | 280 void setBitDefaults() |
| 283 { | 281 { |
| 284 inherited_flags._empty_cells = initialEmptyCells(); | 282 inherited_flags._empty_cells = initialEmptyCells(); |
| 285 inherited_flags._caption_side = initialCaptionSide(); | 283 inherited_flags._caption_side = initialCaptionSide(); |
| 286 inherited_flags._list_style_type = initialListStyleType(); | 284 inherited_flags._list_style_type = initialListStyleType(); |
| (...skipping 21 matching lines...) Expand all Loading... |
| 308 noninherited_flags.position = initialPosition(); | 306 noninherited_flags.position = initialPosition(); |
| 309 noninherited_flags.floating = initialFloating(); | 307 noninherited_flags.floating = initialFloating(); |
| 310 noninherited_flags.tableLayout = initialTableLayout(); | 308 noninherited_flags.tableLayout = initialTableLayout(); |
| 311 noninherited_flags.unicodeBidi = initialUnicodeBidi(); | 309 noninherited_flags.unicodeBidi = initialUnicodeBidi(); |
| 312 noninherited_flags.pageBreakBefore = initialPageBreak(); | 310 noninherited_flags.pageBreakBefore = initialPageBreak(); |
| 313 noninherited_flags.pageBreakAfter = initialPageBreak(); | 311 noninherited_flags.pageBreakAfter = initialPageBreak(); |
| 314 noninherited_flags.pageBreakInside = initialPageBreak(); | 312 noninherited_flags.pageBreakInside = initialPageBreak(); |
| 315 noninherited_flags.styleType = NOPSEUDO; | 313 noninherited_flags.styleType = NOPSEUDO; |
| 316 noninherited_flags.pseudoBits = 0; | 314 noninherited_flags.pseudoBits = 0; |
| 317 noninherited_flags.explicitInheritance = false; | 315 noninherited_flags.explicitInheritance = false; |
| 318 noninherited_flags.currentColor = false; | |
| 319 noninherited_flags.unique = false; | 316 noninherited_flags.unique = false; |
| 320 noninherited_flags.emptyState = false; | 317 noninherited_flags.emptyState = false; |
| 321 noninherited_flags.firstChildState = false; | 318 noninherited_flags.firstChildState = false; |
| 322 noninherited_flags.lastChildState = false; | 319 noninherited_flags.lastChildState = false; |
| 323 noninherited_flags.hasViewportUnits = false; | 320 noninherited_flags.hasViewportUnits = false; |
| 324 noninherited_flags.affectedByFocus = false; | 321 noninherited_flags.affectedByFocus = false; |
| 325 noninherited_flags.affectedByHover = false; | 322 noninherited_flags.affectedByHover = false; |
| 326 noninherited_flags.affectedByActive = false; | 323 noninherited_flags.affectedByActive = false; |
| 327 noninherited_flags.affectedByDrag = false; | 324 noninherited_flags.affectedByDrag = false; |
| 328 noninherited_flags.isLink = false; | 325 noninherited_flags.isLink = false; |
| (...skipping 1201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1530 bool lastChildState() const { return noninherited_flags.lastChildState; } | 1527 bool lastChildState() const { return noninherited_flags.lastChildState; } |
| 1531 void setLastChildState() { setUnique(); noninherited_flags.lastChildState =
true; } | 1528 void setLastChildState() { setUnique(); noninherited_flags.lastChildState =
true; } |
| 1532 | 1529 |
| 1533 StyleColor visitedDependentDecorationStyleColor() const; | 1530 StyleColor visitedDependentDecorationStyleColor() const; |
| 1534 Color visitedDependentDecorationColor() const; | 1531 Color visitedDependentDecorationColor() const; |
| 1535 Color visitedDependentColor(int colorProperty) const; | 1532 Color visitedDependentColor(int colorProperty) const; |
| 1536 | 1533 |
| 1537 void setHasExplicitlyInheritedProperties() { noninherited_flags.explicitInhe
ritance = true; } | 1534 void setHasExplicitlyInheritedProperties() { noninherited_flags.explicitInhe
ritance = true; } |
| 1538 bool hasExplicitlyInheritedProperties() const { return noninherited_flags.ex
plicitInheritance; } | 1535 bool hasExplicitlyInheritedProperties() const { return noninherited_flags.ex
plicitInheritance; } |
| 1539 | 1536 |
| 1540 void setHasCurrentColor() { noninherited_flags.currentColor = true; } | |
| 1541 bool hasCurrentColor() const { return noninherited_flags.currentColor; } | |
| 1542 | |
| 1543 bool hasBoxDecorations() const { return hasBorder() || hasBorderRadius() ||
hasOutline() || hasAppearance() || boxShadow() || hasFilter(); } | 1537 bool hasBoxDecorations() const { return hasBorder() || hasBorderRadius() ||
hasOutline() || hasAppearance() || boxShadow() || hasFilter(); } |
| 1544 | 1538 |
| 1545 // Initial values for all the properties | 1539 // Initial values for all the properties |
| 1546 static EBorderCollapse initialBorderCollapse() { return BSEPARATE; } | 1540 static EBorderCollapse initialBorderCollapse() { return BSEPARATE; } |
| 1547 static EBorderStyle initialBorderStyle() { return BNONE; } | 1541 static EBorderStyle initialBorderStyle() { return BNONE; } |
| 1548 static OutlineIsAuto initialOutlineStyleIsAuto() { return AUTO_OFF; } | 1542 static OutlineIsAuto initialOutlineStyleIsAuto() { return AUTO_OFF; } |
| 1549 static NinePieceImage initialNinePieceImage() { return NinePieceImage(); } | 1543 static NinePieceImage initialNinePieceImage() { return NinePieceImage(); } |
| 1550 static LengthSize initialBorderRadius() { return LengthSize(Length(0, Fixed)
, Length(0, Fixed)); } | 1544 static LengthSize initialBorderRadius() { return LengthSize(Length(0, Fixed)
, Length(0, Fixed)); } |
| 1551 static ECaptionSide initialCaptionSide() { return CAPTOP; } | 1545 static ECaptionSide initialCaptionSide() { return CAPTOP; } |
| 1552 static EClear initialClear() { return CNONE; } | 1546 static EClear initialClear() { return CNONE; } |
| (...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1916 inline bool RenderStyle::hasPseudoElementStyle() const | 1910 inline bool RenderStyle::hasPseudoElementStyle() const |
| 1917 { | 1911 { |
| 1918 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; | 1912 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; |
| 1919 } | 1913 } |
| 1920 | 1914 |
| 1921 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect
::Radii&); | 1915 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect
::Radii&); |
| 1922 | 1916 |
| 1923 } // namespace blink | 1917 } // namespace blink |
| 1924 | 1918 |
| 1925 #endif // RenderStyle_h | 1919 #endif // RenderStyle_h |
| OLD | NEW |