Move StyleRareInheritedData accessors to be inline in ComputedStyle.

third_party/WebKit/Source/core/style/ComputedStyle.cpp

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 f4ddbc24d241a7349c12a07fae6013710d75b2be..3a17ece6e696bfa1527635405052481fd1c80ba2 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
@@ -1072,18 +1072,14 @@ void ComputedStyle::UpdatePropertySpecificDifferences(
         diff.SetTextDecorationOrColorChanged();
       } else {
         if (rare_inherited_data_.Get() != other.rare_inherited_data_.Get() &&
-            (rare_inherited_data_->TextFillColor() !=
-                 other.rare_inherited_data_->TextFillColor() ||
-             rare_inherited_data_->TextStrokeColor() !=
-                 other.rare_inherited_data_->TextStrokeColor() ||
-             rare_inherited_data_->TextEmphasisColor() !=
-                 other.rare_inherited_data_->TextEmphasisColor() ||
-             rare_inherited_data_->VisitedLinkTextFillColor() !=
-                 other.rare_inherited_data_->VisitedLinkTextFillColor() ||
-             rare_inherited_data_->VisitedLinkTextStrokeColor() !=
-                 other.rare_inherited_data_->VisitedLinkTextStrokeColor() ||
-             rare_inherited_data_->VisitedLinkTextEmphasisColor() !=
-                 other.rare_inherited_data_->VisitedLinkTextEmphasisColor() ||
+            (TextFillColor() != other.TextFillColor() ||

[Bugs Nash, 2017/05/09 23:55:00]

much nicer!

+             TextStrokeColor() != other.TextStrokeColor() ||
+             TextEmphasisColor() != other.TextEmphasisColor() ||
+             VisitedLinkTextFillColor() != other.VisitedLinkTextFillColor() ||
+             VisitedLinkTextStrokeColor() !=
+                 other.VisitedLinkTextStrokeColor() ||
+             VisitedLinkTextEmphasisColor() !=
+                 other.VisitedLinkTextEmphasisColor() ||
              rare_inherited_data_->text_emphasis_fill !=
                  other.rare_inherited_data_->text_emphasis_fill ||
              rare_inherited_data_->text_underline_position_ !=
@@ -1092,10 +1088,8 @@ void ComputedStyle::UpdatePropertySpecificDifferences(
                  other.rare_inherited_data_->text_decoration_skip_ ||
              rare_inherited_data_->applied_text_decorations !=
                  other.rare_inherited_data_->applied_text_decorations ||
-             rare_inherited_data_->CaretColor() !=
-                 other.rare_inherited_data_->CaretColor() ||
-             rare_inherited_data_->VisitedLinkCaretColor() !=
-                 other.rare_inherited_data_->VisitedLinkCaretColor())) {
+             CaretColor() != CaretColor() ||
+             VisitedLinkCaretColor() != other.VisitedLinkCaretColor())) {
           diff.SetTextDecorationOrColorChanged();
         }
       }