| Index: Source/core/rendering/style/RenderStyle.h
|
| diff --git a/Source/core/rendering/style/RenderStyle.h b/Source/core/rendering/style/RenderStyle.h
|
| index 24c33b617929f37f7862916ad31e583a342b5e82..9c83e7af99d43f3d2b25a775eda17d1589fa8b05 100644
|
| --- a/Source/core/rendering/style/RenderStyle.h
|
| +++ b/Source/core/rendering/style/RenderStyle.h
|
| @@ -215,6 +215,7 @@ protected:
|
| && _pseudoBits == other._pseudoBits
|
| && _unicodeBidi == other._unicodeBidi
|
| && explicitInheritance == other.explicitInheritance
|
| + && currentColor == other.currentColor
|
| && unique == other.unique
|
| && emptyState == other.emptyState
|
| && firstChildState == other.firstChildState
|
| @@ -243,6 +244,7 @@ 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;
|
| unsigned firstChildState : 1;
|
| @@ -262,7 +264,7 @@ protected:
|
| unsigned _affectedByDrag : 1;
|
| unsigned _isLink : 1;
|
| // If you add more style bits here, you will also need to update RenderStyle::copyNonInheritedFrom()
|
| - // 60 bits
|
| + // 61 bits
|
| } noninherited_flags;
|
|
|
| // !END SYNC!
|
| @@ -304,6 +306,7 @@ 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;
|
| @@ -1450,6 +1453,9 @@ 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; }
|
| +
|
| void reportMemoryUsage(MemoryObjectInfo*) const;
|
|
|
| // Initial values for all the properties
|
|
|