Split up the if checks in ComputedStyle to make them easy to generate

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 f2649cfb05b1b5b9e926f7f8d338710c9c48de70..951419fb4c8273b2fae7ec6b6d7fa40b997c1796 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
@@ -1017,27 +1017,39 @@ void ComputedStyle::UpdatePropertySpecificDifferences(
         rare_non_inherited_data_->perspective_origin_ !=
             other.rare_non_inherited_data_->perspective_origin_)
       diff.SetTransformChanged();
+  }
 
+  if (rare_non_inherited_data_.Get() != other.rare_non_inherited_data_.Get()) {
     if (rare_non_inherited_data_->opacity !=
         other.rare_non_inherited_data_->opacity)
       diff.SetOpacityChanged();
+  }
 
+  if (rare_non_inherited_data_.Get() != other.rare_non_inherited_data_.Get()) {
     if (rare_non_inherited_data_->filter_ !=
         other.rare_non_inherited_data_->filter_)
       diff.SetFilterChanged();
+  }
 
+  if (rare_non_inherited_data_.Get() != other.rare_non_inherited_data_.Get()) {
     if (!rare_non_inherited_data_->ShadowDataEquivalent(
             *other.rare_non_inherited_data_.Get()))
       diff.SetNeedsRecomputeOverflow();
+  }
 
+  if (rare_non_inherited_data_.Get() != other.rare_non_inherited_data_.Get()) {
     if (rare_non_inherited_data_->backdrop_filter_ !=
         other.rare_non_inherited_data_->backdrop_filter_)
       diff.SetBackdropFilterChanged();
+  }
 
+  if (rare_non_inherited_data_.Get() != other.rare_non_inherited_data_.Get()) {
     if (!rare_non_inherited_data_->ReflectionDataEquivalent(
             *other.rare_non_inherited_data_.Get()))
       diff.SetFilterChanged();
+  }
 
+  if (rare_non_inherited_data_.Get() != other.rare_non_inherited_data_.Get()) {
     if (!rare_non_inherited_data_->outline_.VisuallyEqual(
             other.rare_non_inherited_data_->outline_))
       diff.SetNeedsRecomputeOverflow();
@@ -1053,43 +1065,45 @@ void ComputedStyle::UpdatePropertySpecificDifferences(
         HasSimpleUnderlineInternal() != other.HasSimpleUnderlineInternal() ||
         visual_data_->text_decoration != other.visual_data_->text_decoration) {
       diff.SetTextDecorationOrColorChanged();
-    } else if (rare_non_inherited_data_.Get() !=
-                   other.rare_non_inherited_data_.Get() &&
-               (rare_non_inherited_data_->text_decoration_style_ !=
-                    other.rare_non_inherited_data_->text_decoration_style_ ||
-                rare_non_inherited_data_->text_decoration_color_ !=
-                    other.rare_non_inherited_data_->text_decoration_color_ ||
-                rare_non_inherited_data_->visited_link_text_decoration_color_ !=
-                    other.rare_non_inherited_data_
-                        ->visited_link_text_decoration_color_)) {
-      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() ||
-                rare_inherited_data_->text_emphasis_fill !=
-                    other.rare_inherited_data_->text_emphasis_fill ||
-                rare_inherited_data_->text_underline_position_ !=
-                    other.rare_inherited_data_->text_underline_position_ ||
-                rare_inherited_data_->text_decoration_skip_ !=
-                    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())) {
-      diff.SetTextDecorationOrColorChanged();
+    } else {
+      if (rare_non_inherited_data_.Get() !=
+              other.rare_non_inherited_data_.Get() &&
+          (rare_non_inherited_data_->text_decoration_style_ !=
+               other.rare_non_inherited_data_->text_decoration_style_ ||
+           rare_non_inherited_data_->text_decoration_color_ !=
+               other.rare_non_inherited_data_->text_decoration_color_ ||
+           rare_non_inherited_data_->visited_link_text_decoration_color_ !=
+               other.rare_non_inherited_data_
+                   ->visited_link_text_decoration_color_)) {
+        diff.SetTextDecorationOrColorChanged();
+      }
+      if (rare_inherited_data_.Get() != other.rare_inherited_data_.Get() &&

[shend, 2017/05/04 01:04:04]

Not exactly the same behaviour as the original code. I think this should be
another else, with an if inside of it.

[nainar, 2017/05/04 01:08:56]

Yup. You're right. Wonder why this passes tests though. Low test coverage? Done
regardless

+          (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() ||
+           rare_inherited_data_->text_emphasis_fill !=
+               other.rare_inherited_data_->text_emphasis_fill ||
+           rare_inherited_data_->text_underline_position_ !=
+               other.rare_inherited_data_->text_underline_position_ ||
+           rare_inherited_data_->text_decoration_skip_ !=
+               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())) {
+        diff.SetTextDecorationOrColorChanged();
+      }
     }
   }