Generate diffs for all fields on StyleRareInheritedData

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

Index: third_party/WebKit/Source/core/style/ComputedStyle.h
diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.h b/third_party/WebKit/Source/core/style/ComputedStyle.h
index 157b51d451d5e8403e659654b96f14e805fc3b2b..102cc5965ca1729341ae8e889ee062a75bcd6bcc 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
@@ -550,6 +550,56 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase<ComputedStyle>,
     }
   }
 
+  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 {
@@ -3557,13 +3607,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase<ComputedStyle>,
   }
 
   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();
@@ -3571,28 +3614,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase<ComputedStyle>,
   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_;
   }
@@ -3621,26 +3642,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase<ComputedStyle>,
   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;