Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1567)

Unified Diff: Source/core/rendering/style/RenderStyle.cpp

Issue 23526037: Fix redrawing of a composited element with a filter. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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;
« no previous file with comments | « LayoutTests/css3/filters/remove-filter-repaint-expected.html ('k') | Source/core/rendering/style/StyleRareNonInheritedData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698