Index: third_party/WebKit/Source/core/style/ComputedStyle.cpp |
diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.cpp b/third_party/WebKit/Source/core/style/ComputedStyle.cpp |
index 2375dd056bf312629dc9279eec4949984a287521..c253065de99c64062921b10122b2413a2efc374f 100644 |
--- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp |
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp |
@@ -593,8 +593,7 @@ bool ComputedStyle::DiffNeedsFullLayoutAndPaintInvalidation( |
other.rare_non_inherited_data_->shape_margin_ || |
rare_non_inherited_data_->order_ != |
other.rare_non_inherited_data_->order_ || |
- rare_non_inherited_data_->HasFilters() != |
- other.rare_non_inherited_data_->HasFilters()) |
+ HasFilters() != other.HasFilters()) |
return true; |
if (rare_non_inherited_data_->grid_.Get() != |
@@ -640,8 +639,7 @@ bool ComputedStyle::DiffNeedsFullLayoutAndPaintInvalidation( |
// could trigger a change |
// in us being a stacking context. |
if (IsStackingContext() != other.IsStackingContext() && |
- rare_non_inherited_data_->HasOpacity() != |
- other.rare_non_inherited_data_->HasOpacity()) { |
+ HasOpacity() != other.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 LayoutInlines (we will need to add a |
@@ -1305,6 +1303,11 @@ void ComputedStyle::ApplyTransform( |
} |
} |
+bool ComputedStyle::HasFilters() const { |
+ return rare_non_inherited_data_->filter_.Get() && |
+ !rare_non_inherited_data_->filter_->operations_.IsEmpty(); |
+} |
+ |
void ComputedStyle::ApplyMotionPathTransform( |
float origin_x, |
float origin_y, |