Add macro to diff the groups (and their members) in ComputedStyleBase

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 561 matching lines @@
   if (box_data_.Get() != other.box_data_.Get()) {
     if (box_data_->width_ != other.box_data_->width_ ||
         box_data_->min_width_ != other.box_data_->min_width_ ||
         box_data_->max_width_ != other.box_data_->max_width_ ||
         box_data_->height_ != other.box_data_->height_ ||
         box_data_->min_height_ != other.box_data_->min_height_ ||
         box_data_->max_height_ != other.box_data_->max_height_)
       return true;
   }
 
-  if (surround_data_.Get() != other.surround_data_.Get()) {
-    if (!MarginEqual(other) || !OffsetEqual(other) || !PaddingEqual(other))
-      return true;
-  }
+  if (ComputedStyleBase::ScrollAnchorDisablingPropertyChanged(other, diff))
+    return true;
 
   if (diff.TransformChanged())
     return true;
 
   return false;
 }
 
 bool ComputedStyle::DiffNeedsFullLayoutAndPaintInvalidation(
     const ComputedStyle& other) const {
   // FIXME: Not all cases in this method need both full layout and paint
   // 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 (surround_data_.Get() != other.surround_data_.Get()) {
     // If our border widths change, then we need to layout. Other changes to
     // borders only necessitate a paint invalidation.
     if (BorderLeftWidth() != other.BorderLeftWidth() ||
         BorderTopWidth() != other.BorderTopWidth() ||
         BorderBottomWidth() != other.BorderBottomWidth() ||
         BorderRightWidth() != other.BorderRightWidth())
       return true;
+  }
 
-    if (!PaddingEqual(other))
-      return true;
-  }
+  if (ComputedStyleBase::DiffNeedsFullLayoutAndPaintInvalidation(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 ||
@@ skipping 1870 matching lines @@
     if (value < 0)
       fvalue -= 0.5f;
     else
       fvalue += 0.5f;
   }
 
   return RoundForImpreciseConversion<int>(fvalue / zoom_factor);
 }
 
 }  // namespace blink