Generate diffs for all fields on StyleRareNonInheritedData

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 531 matching lines @@
   // invalidation.
   // Should move cases into DiffNeedsFullLayout() if
   // - don't need paint invalidation at all;
   // - or the layoutObject knows how to exactly invalidate paints caused by the
   //   layout change instead of forced full paint invalidation.
 
   if (ComputedStyleBase::DiffNeedsFullLayoutAndPaintInvalidation(*this, other))
     return true;
 
   if (rare_non_inherited_data_.Get() != other.rare_non_inherited_data_.Get()) {
-    if (rare_non_inherited_data_->appearance_ !=
-            other.rare_non_inherited_data_->appearance_ ||
-        rare_non_inherited_data_->margin_before_collapse_ !=
-            other.rare_non_inherited_data_->margin_before_collapse_ ||
-        rare_non_inherited_data_->margin_after_collapse_ !=
-            other.rare_non_inherited_data_->margin_after_collapse_ ||
-        rare_non_inherited_data_->line_clamp_ !=
-            other.rare_non_inherited_data_->line_clamp_ ||
-        rare_non_inherited_data_->text_overflow_ !=
-            other.rare_non_inherited_data_->text_overflow_ ||
-        rare_non_inherited_data_->shape_margin_ !=
-            other.rare_non_inherited_data_->shape_margin_ ||
-        rare_non_inherited_data_->order_ !=
-            other.rare_non_inherited_data_->order_ ||
-        HasFilters() != other.HasFilters())
-      return true;
-
     if (rare_non_inherited_data_->grid_data_.Get() !=
             other.rare_non_inherited_data_->grid_data_.Get() &&
         *rare_non_inherited_data_->grid_data_.Get() !=
             *other.rare_non_inherited_data_->grid_data_.Get())
       return true;
 
     if (rare_non_inherited_data_->grid_item_data_.Get() !=
             other.rare_non_inherited_data_->grid_item_data_.Get() &&
         *rare_non_inherited_data_->grid_item_data_.Get() !=
             *other.rare_non_inherited_data_->grid_item_data_.Get())
@@ skipping 21 matching lines @@
 
     // If the counter directives change, trigger a relayout to re-calculate
     // counter values and rebuild the counter node tree.
     const CounterDirectiveMap* map_a =
         rare_non_inherited_data_->counter_directives_.get();
     const CounterDirectiveMap* map_b =
         other.rare_non_inherited_data_->counter_directives_.get();
     if (!(map_a == map_b || (map_a && map_b && *map_a == *map_b)))
       return true;
 
     // We only need do layout for opacity changes if adding or losing opacity

[nainar, 2017/06/13 07:55:42]

Would generate this but what about the comment?

[shend, 2017/06/13 08:15:53]

Add to JSON :)

[nainar, 2017/06/14 00:29:51]

Moved to predicate function and generating test for that predicate 

     // could trigger a change
     // in us being a stacking context.
     if (IsStackingContext() != other.IsStackingContext() &&
         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
       // 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
@@ skipping 41 matching lines @@
 
   // Movement of non-static-positioned object is special cased in
   // ComputedStyle::VisualInvalidationDiff().
 
   return false;
 }
 
 bool ComputedStyle::DiffNeedsFullLayout(const ComputedStyle& other) const {
   if (ComputedStyleBase::DiffNeedsFullLayout(*this, other))
     return true;
-
-  if (box_data_.Get() != other.box_data_.Get()) {
-    if (box_data_->vertical_align_length_ !=
-        other.box_data_->vertical_align_length_)
-      return true;
-  }
-
-  if (VerticalAlign() != other.VerticalAlign() ||
-      GetPosition() != other.GetPosition())
-    return true;
-
-  if (rare_non_inherited_data_.Get() != other.rare_non_inherited_data_.Get()) {
-    if (rare_non_inherited_data_->align_content_ !=
-            other.rare_non_inherited_data_->align_content_ ||
-        rare_non_inherited_data_->align_items_ !=
-            other.rare_non_inherited_data_->align_items_ ||
-        rare_non_inherited_data_->align_self_ !=
-            other.rare_non_inherited_data_->align_self_ ||
-        rare_non_inherited_data_->justify_content_ !=
-            other.rare_non_inherited_data_->justify_content_ ||
-        rare_non_inherited_data_->justify_items_ !=
-            other.rare_non_inherited_data_->justify_items_ ||
-        rare_non_inherited_data_->justify_self_ !=
-            other.rare_non_inherited_data_->justify_self_ ||
-        rare_non_inherited_data_->contain_ !=
-            other.rare_non_inherited_data_->contain_)
-      return true;
-  }
-
   return false;
 }
 
 bool ComputedStyle::DiffNeedsPaintInvalidationSubtree(
     const ComputedStyle& other) const {
-  if (rare_non_inherited_data_.Get() != other.rare_non_inherited_data_.Get()) {
-    if (rare_non_inherited_data_->effective_blend_mode_ !=
-            other.rare_non_inherited_data_->effective_blend_mode_ ||
-        rare_non_inherited_data_->isolation_ !=
-            other.rare_non_inherited_data_->isolation_)
-      return true;
-
-    if (rare_non_inherited_data_->mask_ !=
-            other.rare_non_inherited_data_->mask_ ||
-        rare_non_inherited_data_->mask_box_image_ !=
-            other.rare_non_inherited_data_->mask_box_image_)
-      return true;
-  }
-
+  if (ComputedStyleBase::DiffNeedsPaintInvalidationSubtree(*this, other))
+    return true;
   return false;
 }
 
 bool ComputedStyle::DiffNeedsPaintInvalidationObject(
     const ComputedStyle& other) const {
   if (ComputedStyleBase::DiffNeedsPaintInvalidationObject(*this, other))
     return true;
 
   if (!BorderVisuallyEqual(other) || !RadiiEqual(other) ||
       *background_data_ != *other.background_data_)
     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_ ||
-        !BoxShadowDataEquivalent(other) || !ShapeOutsideDataEquivalent(other) ||
-        !ClipPathDataEquivalent(other) ||
-        !rare_non_inherited_data_->outline_.VisuallyEqual(
-            other.rare_non_inherited_data_->outline_) ||
-        (VisitedLinkBorderLeftColor() != other.VisitedLinkBorderLeftColor() &&
-         BorderLeftWidth()) ||
-        (VisitedLinkBorderRightColor() != other.VisitedLinkBorderRightColor() &&
-         BorderRightWidth()) ||
-        (VisitedLinkBorderBottomColor() !=
-             other.VisitedLinkBorderBottomColor() &&
-         BorderBottomWidth()) ||
-        (VisitedLinkBorderTopColor() != other.VisitedLinkBorderTopColor() &&
-         BorderTopWidth()) ||
-        (VisitedLinkOutlineColor() != other.VisitedLinkOutlineColor() &&
-         OutlineWidth()) ||
-        (VisitedLinkBackgroundColor() != other.VisitedLinkBackgroundColor()))
-      return true;
-  }
-
-  if (Resize() != other.Resize())
-    return true;
-
   if (rare_non_inherited_data_->paint_images_) {
     for (const auto& image : *rare_non_inherited_data_->paint_images_) {
       if (DiffNeedsPaintInvalidationObjectForPaintImage(image, other))
         return true;
     }
   }
 
   return false;
 }
 
@@ skipping 27 matching lines @@
     }
   }
 
   return false;
 }
 
 // This doesn't include conditions needing layout or overflow recomputation
 // which implies visual rect update.
 bool ComputedStyle::DiffNeedsVisualRectUpdate(
     const ComputedStyle& other) const {
-  // Visual rect is empty if visibility is hidden.
+  // Visual rect is empty if visibility is hidden. Also need to update visual
+  // rect of the resizer.
   if (ComputedStyleBase::DiffNeedsVisualRectUpdate(*this, other))
     return true;
-
-  // Need to update visual rect of the resizer.
-  if (Resize() != other.Resize())
-    return true;
-
   return false;
 }
 
 void ComputedStyle::UpdatePropertySpecificDifferences(
     const ComputedStyle& other,
     StyleDifference& diff) const {
-  if (box_data_->z_index_ != other.box_data_->z_index_ ||
-      IsStackingContext() != other.IsStackingContext())
+  if (ComputedStyleBase::UpdatePropertySpecificDifferencesZIndex(*this, other))
     diff.SetZIndexChanged();
 
   if (rare_non_inherited_data_.Get() != other.rare_non_inherited_data_.Get()) {
     // It's possible for the old and new style transform data to be equivalent
     // while hasTransform() differs, as it checks a number of conditions aside
     // from just the matrix, including but not limited to animation state.
     if (HasTransform() != other.HasTransform() ||
         !TransformDataEquivalent(other) ||
         rare_non_inherited_data_->perspective_ !=
             other.rare_non_inherited_data_->perspective_ ||
         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 (ComputedStyleBase::UpdatePropertySpecificDifferencesOpacity(*this, other))
+    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_) ||
-        !ReflectionDataEquivalent(other))
-      diff.SetFilterChanged();
-  }
+  if (ComputedStyleBase::UpdatePropertySpecificDifferencesFilter(*this, other))
+    diff.SetFilterChanged();
 
-  if (rare_non_inherited_data_.Get() != other.rare_non_inherited_data_.Get()) {
-    if (!BoxShadowDataEquivalent(other) ||
-        !rare_non_inherited_data_->outline_.VisuallyEqual(
-            other.rare_non_inherited_data_->outline_))
-      diff.SetNeedsRecomputeOverflow();
-  }
-
-  if (!BorderVisualOverflowEqual(other))
+  if (ComputedStyleBase::
+          UpdatePropertySpecificDifferencesNeedsRecomputeOverflow(*this, other))
     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 (ComputedStyleBase::UpdatePropertySpecificDifferencesBackdropFilter(*this,
+                                                                         other))
+    diff.SetBackdropFilterChanged();
 
   if (!diff.NeedsFullPaintInvalidation()) {
     if ((inherited_data_->color_ != other.inherited_data_->color_ ||
          inherited_data_->visited_link_color_ !=
              other.inherited_data_->visited_link_color_ ||
          HasSimpleUnderlineInternal() != other.HasSimpleUnderlineInternal() ||
          visual_data_->text_decoration_ !=
              other.visual_data_->text_decoration_) ||
-        (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_)) ||
         ComputedStyleBase::
             UpdatePropertySpecificDifferencesTextDecorationOrColor(*this,
                                                                    other)) {
       diff.SetTextDecorationOrColorChanged();
     }
   }
 
   bool has_clip = HasOutOfFlowPosition() && !visual_data_->has_auto_clip_;

[nainar, 2017/06/13 07:55:42]

Doing this in a separate CL. Question should I move to this to a separate
predicate or just remove references to the group here.  

[shend, 2017/06/13 08:15:53]

Make predicate and generate diff :)

[nainar, 2017/06/14 00:29:51]

Will do this in a separate CL - since its on VisualData

   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();
 }
 
 void ComputedStyle::AddPaintImage(StyleImage* image) {
   if (!rare_non_inherited_data_.Access()->paint_images_) {
     rare_non_inherited_data_.Access()->paint_images_ =
@@ skipping 1445 matching lines @@
     if (value < 0)
       fvalue -= 0.5f;
     else
       fvalue += 0.5f;
   }
 
   return RoundForImpreciseConversion<int>(fvalue / zoom_factor);
 }
 
 }  // namespace blink