Index: Source/core/rendering/style/RenderStyle.cpp |
diff --git a/Source/core/rendering/style/RenderStyle.cpp b/Source/core/rendering/style/RenderStyle.cpp |
index 5bcd76196c6d75b2cb97952fc6763192bb7b5839..329e96083d9d69366b2e3d8d63381110afedc436 100644 |
--- a/Source/core/rendering/style/RenderStyle.cpp |
+++ b/Source/core/rendering/style/RenderStyle.cpp |
@@ -586,8 +586,7 @@ StyleDifference RenderStyle::diff(const RenderStyle* other, unsigned& changedCon |
if ((visibility() == COLLAPSE) != (other->visibility() == COLLAPSE)) |
return StyleDifferenceLayout; |
- if ((rareNonInheritedData->opacity == 1 && other->rareNonInheritedData->opacity < 1) |
- || (rareNonInheritedData->opacity < 1 && other->rareNonInheritedData->opacity == 1)) { |
+ if (rareNonInheritedData->hasOpacity() != other->rareNonInheritedData->hasOpacity()) { |
// FIXME: We would like to use SimplifiedLayout here, but we can't quite do that yet. |
// We need to make sure SimplifiedLayout can operate correctly on RenderInlines (we will need |
// to add a selfNeedsSimplifiedLayout bit in order to not get confused and taint every line). |
@@ -596,6 +595,9 @@ StyleDifference RenderStyle::diff(const RenderStyle* other, unsigned& changedCon |
return StyleDifferenceLayout; |
} |
+ if (rareNonInheritedData->hasFilters() != other->rareNonInheritedData->hasFilters()) |
+ return StyleDifferenceLayout; |
+ |
if (!QuotesData::equals(rareInheritedData->quotes.get(), other->rareInheritedData->quotes.get())) |
return StyleDifferenceLayout; |