| Index: Source/core/rendering/style/RenderStyle.h
|
| diff --git a/Source/core/rendering/style/RenderStyle.h b/Source/core/rendering/style/RenderStyle.h
|
| index 97e204ec72439dc784e27cc16228972ae3a74a2e..b712ced2c744c0f5c048f66a29d73202f21e68aa 100644
|
| --- a/Source/core/rendering/style/RenderStyle.h
|
| +++ b/Source/core/rendering/style/RenderStyle.h
|
| @@ -225,7 +225,6 @@ protected:
|
| && pseudoBits == other.pseudoBits
|
| && unicodeBidi == other.unicodeBidi
|
| && explicitInheritance == other.explicitInheritance
|
| - && currentColor == other.currentColor
|
| && unique == other.unique
|
| && emptyState == other.emptyState
|
| && firstChildState == other.firstChildState
|
| @@ -259,7 +258,6 @@ protected:
|
| unsigned styleType : 6; // PseudoId
|
| unsigned pseudoBits : 8;
|
| unsigned explicitInheritance : 1; // Explicitly inherits a non-inherited property
|
| - unsigned currentColor : 1; // At least one color has the value 'currentColor'
|
| unsigned unique : 1; // Style can not be shared.
|
|
|
| unsigned emptyState : 1;
|
| @@ -273,7 +271,7 @@ protected:
|
|
|
| unsigned isLink : 1;
|
| // If you add more style bits here, you will also need to update RenderStyle::copyNonInheritedFrom()
|
| - // 63 bits
|
| + // 62 bits
|
| } noninherited_flags;
|
|
|
| // !END SYNC!
|
| @@ -315,7 +313,6 @@ protected:
|
| noninherited_flags.styleType = NOPSEUDO;
|
| noninherited_flags.pseudoBits = 0;
|
| noninherited_flags.explicitInheritance = false;
|
| - noninherited_flags.currentColor = false;
|
| noninherited_flags.unique = false;
|
| noninherited_flags.emptyState = false;
|
| noninherited_flags.firstChildState = false;
|
| @@ -1537,9 +1534,6 @@ public:
|
| void setHasExplicitlyInheritedProperties() { noninherited_flags.explicitInheritance = true; }
|
| bool hasExplicitlyInheritedProperties() const { return noninherited_flags.explicitInheritance; }
|
|
|
| - void setHasCurrentColor() { noninherited_flags.currentColor = true; }
|
| - bool hasCurrentColor() const { return noninherited_flags.currentColor; }
|
| -
|
| bool hasBoxDecorations() const { return hasBorder() || hasBorderRadius() || hasOutline() || hasAppearance() || boxShadow() || hasFilter(); }
|
|
|
| // Initial values for all the properties
|
|
|