Generate diffs for all fields on StyleRareInheritedData

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

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 532 matching lines @@
   }
 
   // border-bottom-color
   void SetBorderBottomColor(const StyleColor& color) {
     if (!compareEqual(BorderBottomColor(), color)) {
       SetBorderBottomColorInternal(color.Resolve(Color()));
       SetBorderBottomColorIsCurrentColor(color.IsCurrentColor());
     }
   }
 
+  StyleColor TextEmphasisColor() const {

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

Why are these moved?

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

They were private before and need to be public to diff

[shend, 2017/05/25 22:19:52]

Hmm, these were private a for a reason (never access colors directly). I would
try to keep them as private. I think it'll still work if they're private.
Otherwise, we can just make it a friend.

+    return rare_inherited_data_->text_emphasis_color_is_current_color_
+               ? StyleColor::CurrentColor()
+               : StyleColor(rare_inherited_data_->text_emphasis_color_);
+  }
+  StyleColor TextFillColor() const {
+    return rare_inherited_data_->text_fill_color_is_current_color_
+               ? StyleColor::CurrentColor()
+               : StyleColor(rare_inherited_data_->text_fill_color_);
+  }
+  StyleColor TextStrokeColor() const {
+    return rare_inherited_data_->text_stroke_color_is_current_color_
+               ? StyleColor::CurrentColor()
+               : StyleColor(rare_inherited_data_->text_stroke_color_);
+  }
+  StyleAutoColor CaretColor() const {
+    if (rare_inherited_data_->caret_color_is_current_color_)
+      return StyleAutoColor::CurrentColor();
+    if (rare_inherited_data_->caret_color_is_auto_)
+      return StyleAutoColor::AutoColor();
+    return StyleAutoColor(rare_inherited_data_->caret_color_);
+  }
+  StyleColor VisitedLinkTextEmphasisColor() const {
+    return rare_inherited_data_
+                   ->visited_link_text_emphasis_color_is_current_color_
+               ? StyleColor::CurrentColor()
+               : StyleColor(
+                     rare_inherited_data_->visited_link_text_emphasis_color_);
+  }
+  StyleColor VisitedLinkTextFillColor() const {
+    return rare_inherited_data_->visited_link_text_fill_color_is_current_color_
+               ? StyleColor::CurrentColor()
+               : StyleColor(
+                     rare_inherited_data_->visited_link_text_fill_color_);
+  }
+  StyleColor VisitedLinkTextStrokeColor() const {
+    return rare_inherited_data_
+                   ->visited_link_text_stroke_color_is_current_color_
+               ? StyleColor::CurrentColor()
+               : StyleColor(
+                     rare_inherited_data_->visited_link_text_stroke_color_);
+  }
+  StyleAutoColor VisitedLinkCaretColor() const {
+    if (rare_inherited_data_->visited_link_caret_color_is_current_color_)
+      return StyleAutoColor::CurrentColor();
+    if (rare_inherited_data_->visited_link_caret_color_is_auto_)
+      return StyleAutoColor::AutoColor();
+    return StyleAutoColor(rare_inherited_data_->visited_link_caret_color_);
+  }
+
   // box-shadow (aka -webkit-box-shadow)
   static ShadowList* InitialBoxShadow() { return 0; }
   ShadowList* BoxShadow() const {
     return rare_non_inherited_data_->box_shadow_.Get();
   }
   void SetBoxShadow(RefPtr<ShadowList>);
 
   // clip
   static LengthBox InitialClip() { return LengthBox(); }
   const LengthBox& Clip() const { return ClipInternal(); }
@@ skipping 2987 matching lines @@
                ? StyleColor::CurrentColor()
                : StyleColor(BorderTopColorInternal());
   }
   StyleColor BorderBottomColor() const {
     return BorderBottomColorIsCurrentColor()
                ? StyleColor::CurrentColor()
                : StyleColor(BorderBottomColorInternal());
   }
 
   StyleColor BackgroundColor() const { return BackgroundColorInternal(); }
-  StyleAutoColor CaretColor() const {
-    if (rare_inherited_data_->caret_color_is_current_color_)
-      return StyleAutoColor::CurrentColor();
-    if (rare_inherited_data_->caret_color_is_auto_)
-      return StyleAutoColor::AutoColor();
-    return StyleAutoColor(rare_inherited_data_->caret_color_);
-  }
   Color GetColor() const;
   StyleColor ColumnRuleColor() const {
     return rare_non_inherited_data_->multi_col_->rule_.GetColor();
   }
   StyleColor OutlineColor() const {
     return rare_non_inherited_data_->outline_.GetColor();
   }
-  StyleColor TextEmphasisColor() const {
-    return rare_inherited_data_->text_emphasis_color_is_current_color_
-               ? StyleColor::CurrentColor()
-               : StyleColor(rare_inherited_data_->text_emphasis_color_);
-  }
-  StyleColor TextFillColor() const {
-    return rare_inherited_data_->text_fill_color_is_current_color_
-               ? StyleColor::CurrentColor()
-               : StyleColor(rare_inherited_data_->text_fill_color_);
-  }
-  StyleColor TextStrokeColor() const {
-    return rare_inherited_data_->text_stroke_color_is_current_color_
-               ? StyleColor::CurrentColor()
-               : StyleColor(rare_inherited_data_->text_stroke_color_);
-  }
-  StyleAutoColor VisitedLinkCaretColor() const {
-    if (rare_inherited_data_->visited_link_caret_color_is_current_color_)
-      return StyleAutoColor::CurrentColor();
-    if (rare_inherited_data_->visited_link_caret_color_is_auto_)
-      return StyleAutoColor::AutoColor();
-    return StyleAutoColor(rare_inherited_data_->visited_link_caret_color_);
-  }
   StyleColor VisitedLinkBackgroundColor() const {
     return rare_non_inherited_data_->visited_link_background_color_;
   }
   StyleColor VisitedLinkBorderLeftColor() const {
     return rare_non_inherited_data_->visited_link_border_left_color_;
   }
   StyleColor VisitedLinkBorderRightColor() const {
     return rare_non_inherited_data_->visited_link_border_right_color_;
   }
   StyleColor VisitedLinkBorderBottomColor() const {
     return rare_non_inherited_data_->visited_link_border_bottom_color_;
   }
   StyleColor VisitedLinkBorderTopColor() const {
     return rare_non_inherited_data_->visited_link_border_top_color_;
   }
   StyleColor VisitedLinkOutlineColor() const {
     return rare_non_inherited_data_->visited_link_outline_color_;
   }
   StyleColor VisitedLinkColumnRuleColor() const {
     return rare_non_inherited_data_->multi_col_
         ->visited_link_column_rule_color_;
   }
   StyleColor TextDecorationColor() const {
     return rare_non_inherited_data_->text_decoration_color_;
   }
   StyleColor VisitedLinkTextDecorationColor() const {
     return rare_non_inherited_data_->visited_link_text_decoration_color_;
   }
-  StyleColor VisitedLinkTextEmphasisColor() const {
-    return rare_inherited_data_
-                   ->visited_link_text_emphasis_color_is_current_color_
-               ? StyleColor::CurrentColor()
-               : StyleColor(
-                     rare_inherited_data_->visited_link_text_emphasis_color_);
-  }
-  StyleColor VisitedLinkTextFillColor() const {
-    return rare_inherited_data_->visited_link_text_fill_color_is_current_color_
-               ? StyleColor::CurrentColor()
-               : StyleColor(
-                     rare_inherited_data_->visited_link_text_fill_color_);
-  }
-  StyleColor VisitedLinkTextStrokeColor() const {
-    return rare_inherited_data_
-                   ->visited_link_text_stroke_color_is_current_color_
-               ? StyleColor::CurrentColor()
-               : StyleColor(
-                     rare_inherited_data_->visited_link_text_stroke_color_);
-  }
 
   StyleColor DecorationColorIncludingFallback(bool visited_link) const;
   Color ColorIncludingFallback(int color_property, bool visited_link) const;
 
   Color StopColor() const { return SvgStyle().StopColor(); }
   Color FloodColor() const { return SvgStyle().FloodColor(); }
   Color LightingColor() const { return SvgStyle().LightingColor(); }
 
   void AddAppliedTextDecoration(const AppliedTextDecoration&);
   void OverrideTextDecorationColors(Color propagated_color);
@@ skipping 116 matching lines @@
       PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId)));
 }
 
 inline bool ComputedStyle::HasPseudoElementStyle() const {
   return PseudoBitsInternal() & kElementPseudoIdMask;
 }
 
 }  // namespace blink
 
 #endif  // ComputedStyle_h