Index: trunk/Source/core/layout/style/LayoutStyle.h |
=================================================================== |
--- trunk/Source/core/layout/style/LayoutStyle.h (revision 190671) |
+++ trunk/Source/core/layout/style/LayoutStyle.h (working copy) |
@@ -258,9 +258,8 @@ |
unsigned styleType : 6; // PseudoId |
unsigned pseudoBits : 8; |
- // FIXME: |explicitInheritance| should be moved to ElementRareData. |
- mutable unsigned explicitInheritance : 1; // Explicitly inherits a non-inherited property |
- mutable unsigned unique : 1; // Style can not be shared. |
+ unsigned explicitInheritance : 1; // Explicitly inherits a non-inherited property |
+ unsigned unique : 1; // Style can not be shared. |
unsigned emptyState : 1; |
@@ -1461,7 +1460,7 @@ |
// A unique style is one that has matches something that makes it impossible to share. |
bool unique() const { return noninherited_flags.unique; } |
- void setUnique() const { noninherited_flags.unique = true; } |
+ void setUnique() { noninherited_flags.unique = true; } |
bool isSharable() const; |
@@ -1470,7 +1469,7 @@ |
Color visitedDependentColor(int colorProperty) const; |
- void setHasExplicitlyInheritedProperties() const { noninherited_flags.explicitInheritance = true; } |
+ void setHasExplicitlyInheritedProperties() { noninherited_flags.explicitInheritance = true; } |
bool hasExplicitlyInheritedProperties() const { return noninherited_flags.explicitInheritance; } |
bool hasBoxDecorations() const { return hasBorder() || hasBorderRadius() || hasOutline() || hasAppearance() || boxShadow() || hasFilter() || resize() != RESIZE_NONE; } |