| 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 3b4017542939f1c02322e8aff0c8ca067b6ba86e..22c5d8287db5639c736a80e79310d18c1444cb6b 100644
|
| --- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp
|
| +++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
|
| @@ -561,9 +561,6 @@ StyleDifference ComputedStyle::VisualInvalidationDiff(
|
| bool ComputedStyle::ScrollAnchorDisablingPropertyChanged(
|
| const ComputedStyle& other,
|
| const StyleDifference& diff) const {
|
| - if (GetPosition() != other.GetPosition())
|
| - return true;
|
| -
|
| if (ComputedStyleBase::ScrollAnchorDisablingPropertyChanged(other))
|
| return true;
|
|
|
| @@ -722,28 +719,6 @@ bool ComputedStyle::DiffNeedsFullLayoutAndPaintInvalidation(
|
| return true;
|
| }
|
|
|
| - if (inherited_data_->text_autosizing_multiplier_ !=
|
| - other.inherited_data_->text_autosizing_multiplier_)
|
| - return true;
|
| -
|
| - if (inherited_data_->font_.LoadingCustomFonts() !=
|
| - other.inherited_data_->font_.LoadingCustomFonts())
|
| - return true;
|
| -
|
| - if (BoxDirection() != other.BoxDirection() ||
|
| - RtlOrdering() != other.RtlOrdering() ||
|
| - GetTextAlign() != other.GetTextAlign() ||
|
| - TextTransform() != other.TextTransform() ||
|
| - Direction() != other.Direction() || WhiteSpace() != other.WhiteSpace() ||
|
| - GetWritingMode() != other.GetWritingMode())
|
| - return true;
|
| -
|
| - if (OverflowX() != other.OverflowX() || OverflowY() != other.OverflowY() ||
|
| - Clear() != other.Clear() || GetUnicodeBidi() != other.GetUnicodeBidi() ||
|
| - Floating() != other.Floating() ||
|
| - OriginalDisplay() != other.OriginalDisplay())
|
| - return true;
|
| -
|
| if (IsDisplayTableType(Display())) {
|
| if (BorderCollapse() != other.BorderCollapse() ||
|
| EmptyCells() != other.EmptyCells() ||
|
| @@ -781,10 +756,6 @@ bool ComputedStyle::DiffNeedsFullLayoutAndPaintInvalidation(
|
| (other.Visibility() == EVisibility::kCollapse))
|
| return true;
|
|
|
| - if (HasPseudoStyle(kPseudoIdScrollbar) !=
|
| - other.HasPseudoStyle(kPseudoIdScrollbar))
|
| - return true;
|
| -
|
| // Movement of non-static-positioned object is special cased in
|
| // ComputedStyle::VisualInvalidationDiff().
|
|
|
| @@ -847,10 +818,11 @@ bool ComputedStyle::DiffNeedsPaintInvalidationSubtree(
|
|
|
| bool ComputedStyle::DiffNeedsPaintInvalidationObject(
|
| const ComputedStyle& other) const {
|
| - if (Visibility() != other.Visibility() ||
|
| - PrintColorAdjust() != other.PrintColorAdjust() ||
|
| - InsideLink() != other.InsideLink() || !BorderVisuallyEqual(other) ||
|
| - !RadiiEqual(other) || *background_data_ != *other.background_data_)
|
| + if (ComputedStyleBase::DiffNeedsPaintInvalidationObject(other))
|
| + return true;
|
| +
|
| + if (!BorderVisuallyEqual(other) || !RadiiEqual(other) ||
|
| + *background_data_ != *other.background_data_)
|
| return true;
|
|
|
| if (rare_inherited_data_.Get() != other.rare_inherited_data_.Get()) {
|
| @@ -943,7 +915,7 @@ bool ComputedStyle::DiffNeedsPaintInvalidationObjectForPaintImage(
|
| bool ComputedStyle::DiffNeedsVisualRectUpdate(
|
| const ComputedStyle& other) const {
|
| // Visual rect is empty if visibility is hidden.
|
| - if (Visibility() != other.Visibility())
|
| + if (ComputedStyleBase::DiffNeedsVisualRectUpdate(other))
|
| return true;
|
|
|
| // Need to update visual rect of the resizer.
|
|
|