| Index: Source/core/rendering/style/RenderStyle.cpp
|
| diff --git a/Source/core/rendering/style/RenderStyle.cpp b/Source/core/rendering/style/RenderStyle.cpp
|
| index a78996704b7d0b7d1a9e550f80a9aeabedd55631..eb5de93a58cb7a2652e168564ae10ff78e883385 100644
|
| --- a/Source/core/rendering/style/RenderStyle.cpp
|
| +++ b/Source/core/rendering/style/RenderStyle.cpp
|
| @@ -186,14 +186,14 @@ StyleRecalcChange RenderStyle::stylePropagationDiff(const RenderStyle* oldStyle,
|
| || oldStyle->alignItems() != newStyle->alignItems())
|
| return Reattach;
|
|
|
| - if (*oldStyle == *newStyle)
|
| - return diffPseudoStyles(oldStyle, newStyle);
|
| -
|
| if (oldStyle->inheritedNotEqual(newStyle)
|
| || oldStyle->hasExplicitlyInheritedProperties()
|
| || newStyle->hasExplicitlyInheritedProperties())
|
| return Inherit;
|
|
|
| + if (*oldStyle == *newStyle)
|
| + return diffPseudoStyles(oldStyle, newStyle);
|
| +
|
| return NoInherit;
|
| }
|
|
|
| @@ -339,9 +339,10 @@ void RenderStyle::removeCachedPseudoStyle(PseudoId pid)
|
| bool RenderStyle::inheritedNotEqual(const RenderStyle* other) const
|
| {
|
| return inherited_flags != other->inherited_flags
|
| - || inherited != other->inherited
|
| - || m_svgStyle->inheritedNotEqual(other->m_svgStyle.get())
|
| - || rareInheritedData != other->rareInheritedData;
|
| + || inherited != other->inherited
|
| + || font().loadingCustomFonts() != other->font().loadingCustomFonts()
|
| + || m_svgStyle->inheritedNotEqual(other->m_svgStyle.get())
|
| + || rareInheritedData != other->rareInheritedData;
|
| }
|
|
|
| bool RenderStyle::inheritedDataShared(const RenderStyle* other) const
|
|
|