Generate diffs for all fields on StyleRareInheritedData

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

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 632 matching lines @@
       // do that yet.  We need to make sure SimplifiedLayout can operate
       // correctly on LayoutInlines (we will need to add a
       // selfNeedsSimplifiedLayout bit in order to not get confused and taint
       // every line).  In addition we need to solve the floating object issue
       // when layers come and go. Right now a full layout is necessary to keep
       // floating object lists sane.
       return true;
     }
   }
 
-  if (rare_inherited_data_.Get() != other.rare_inherited_data_.Get()) {
-    if (rare_inherited_data_->highlight_ !=
-            other.rare_inherited_data_->highlight_ ||
-        rare_inherited_data_->text_indent_ !=
-            other.rare_inherited_data_->text_indent_ ||
-        rare_inherited_data_->text_align_last_ !=
-            other.rare_inherited_data_->text_align_last_ ||
-        rare_inherited_data_->text_indent_line_ !=
-            other.rare_inherited_data_->text_indent_line_ ||
-        rare_inherited_data_->effective_zoom_ !=
-            other.rare_inherited_data_->effective_zoom_ ||
-        rare_inherited_data_->word_break_ !=
-            other.rare_inherited_data_->word_break_ ||
-        rare_inherited_data_->overflow_wrap_ !=
-            other.rare_inherited_data_->overflow_wrap_ ||
-        rare_inherited_data_->line_break_ !=
-            other.rare_inherited_data_->line_break_ ||
-        rare_inherited_data_->text_security_ !=
-            other.rare_inherited_data_->text_security_ ||
-        rare_inherited_data_->hyphens_ !=
-            other.rare_inherited_data_->hyphens_ ||
-        rare_inherited_data_->hyphenation_limit_before_ !=
-            other.rare_inherited_data_->hyphenation_limit_before_ ||
-        rare_inherited_data_->hyphenation_limit_after_ !=
-            other.rare_inherited_data_->hyphenation_limit_after_ ||
-        rare_inherited_data_->hyphenation_string_ !=
-            other.rare_inherited_data_->hyphenation_string_ ||
-        rare_inherited_data_->respect_image_orientation_ !=
-            other.rare_inherited_data_->respect_image_orientation_ ||
-        rare_inherited_data_->ruby_position_ !=
-            other.rare_inherited_data_->ruby_position_ ||
-        rare_inherited_data_->text_emphasis_mark_ !=
-            other.rare_inherited_data_->text_emphasis_mark_ ||
-        rare_inherited_data_->text_emphasis_position_ !=
-            other.rare_inherited_data_->text_emphasis_position_ ||
-        rare_inherited_data_->text_emphasis_custom_mark_ !=
-            other.rare_inherited_data_->text_emphasis_custom_mark_ ||
-        rare_inherited_data_->text_justify_ !=
-            other.rare_inherited_data_->text_justify_ ||
-        rare_inherited_data_->text_orientation_ !=
-            other.rare_inherited_data_->text_orientation_ ||
-        rare_inherited_data_->text_combine_ !=
-            other.rare_inherited_data_->text_combine_ ||
-        rare_inherited_data_->tab_size_ !=
-            other.rare_inherited_data_->tab_size_ ||
-        rare_inherited_data_->text_size_adjust_ !=
-            other.rare_inherited_data_->text_size_adjust_ ||
-        rare_inherited_data_->list_style_image_ !=
-            other.rare_inherited_data_->list_style_image_ ||
-        rare_inherited_data_->line_height_step_ !=
-            other.rare_inherited_data_->line_height_step_ ||
-        rare_inherited_data_->text_stroke_width_ !=
-            other.rare_inherited_data_->text_stroke_width_)
-      return true;
-  }
-
   if (IsDisplayTableType(Display())) {
-    if (BorderCollapse() != other.BorderCollapse() ||
-        EmptyCells() != other.EmptyCells() ||
-        CaptionSide() != other.CaptionSide() ||
-        TableLayout() != other.TableLayout())
+    if (ComputedStyleBase::
+            DiffNeedsFullLayoutAndPaintInvalidationDisplayTableType(other))
       return true;
 
     // In the collapsing border model, 'hidden' suppresses other borders, while
     // 'none' does not, so these style differences can be width differences.
     if ((BorderCollapse() == EBorderCollapse::kCollapse) &&
         ((BorderTopStyle() == EBorderStyle::kHidden &&
           other.BorderTopStyle() == EBorderStyle::kNone) ||
          (BorderTopStyle() == EBorderStyle::kNone &&
           other.BorderTopStyle() == EBorderStyle::kHidden) ||
          (BorderBottomStyle() == EBorderStyle::kHidden &&
           other.BorderBottomStyle() == EBorderStyle::kNone) ||
          (BorderBottomStyle() == EBorderStyle::kNone &&
           other.BorderBottomStyle() == EBorderStyle::kHidden) ||
          (BorderLeftStyle() == EBorderStyle::kHidden &&
           other.BorderLeftStyle() == EBorderStyle::kNone) ||
          (BorderLeftStyle() == EBorderStyle::kNone &&
           other.BorderLeftStyle() == EBorderStyle::kHidden) ||
          (BorderRightStyle() == EBorderStyle::kHidden &&
           other.BorderRightStyle() == EBorderStyle::kNone) ||
          (BorderRightStyle() == EBorderStyle::kNone &&
           other.BorderRightStyle() == EBorderStyle::kHidden)))
       return true;
   } else if (Display() == EDisplay::kListItem) {
-    if (ListStyleType() != other.ListStyleType() ||
-        ListStylePosition() != other.ListStylePosition())
+    if (ComputedStyleBase::
+            DiffNeedsFullLayoutAndPaintInvalidationDisplayListItem(other))
       return true;
   }
 
   if ((Visibility() == EVisibility::kCollapse) !=
       (other.Visibility() == EVisibility::kCollapse))
     return true;
 
   // Movement of non-static-positioned object is special cased in
   // ComputedStyle::VisualInvalidationDiff().
 
@@ skipping 56 matching lines @@
 
 bool ComputedStyle::DiffNeedsPaintInvalidationObject(
     const ComputedStyle& other) const {
   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()) {
-    if (rare_inherited_data_->user_modify_ !=
-            other.rare_inherited_data_->user_modify_ ||
-        rare_inherited_data_->user_select_ !=
-            other.rare_inherited_data_->user_select_ ||
-        rare_inherited_data_->image_rendering_ !=
-            other.rare_inherited_data_->image_rendering_)
-      return true;
-  }
-
   if (rare_non_inherited_data_.Get() != other.rare_non_inherited_data_.Get()) {
     if (rare_non_inherited_data_->user_drag !=
             other.rare_non_inherited_data_->user_drag ||
         rare_non_inherited_data_->object_fit_ !=
             other.rare_non_inherited_data_->object_fit_ ||
         rare_non_inherited_data_->object_position_ !=
             other.rare_non_inherited_data_->object_position_ ||
         !rare_non_inherited_data_->ShadowDataEquivalent(
             *other.rare_non_inherited_data_.Get()) ||
         !rare_non_inherited_data_->ShapeOutsideDataEquivalent(
@@ skipping 157 matching lines @@
               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_ ||
           CaretColor() != CaretColor() ||
           VisitedLinkCaretColor() != other.VisitedLinkCaretColor()))) {
       diff.SetTextDecorationOrColorChanged();
+    } else {

[shend, 2017/05/25 08:20:19]

Where did this come from?

[nainar, 2017/05/25 08:38:50]

Aaaah landed two patches and the diff changed. Uploaded a new one.

+      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 (ComputedStyleBase::
+                UpdatePropertySpecificDifferencesTextDecorationOrColor(other)) {
+          diff.SetTextDecorationOrColorChanged();
+        }
+      }
     }
   }
 
   bool has_clip = HasOutOfFlowPosition() && !visual_data_->has_auto_clip_;
   bool other_has_clip =
       other.HasOutOfFlowPosition() && !other.visual_data_->has_auto_clip_;
   if (has_clip != other_has_clip ||
       (has_clip && visual_data_->clip_ != other.visual_data_->clip_))
     diff.SetCSSClipChanged();
 }
@@ skipping 1418 matching lines @@
     if (value < 0)
       fvalue -= 0.5f;
     else
       fvalue += 0.5f;
   }
 
   return RoundForImpreciseConversion<int>(fvalue / zoom_factor);
 }
 
 }  // namespace blink