Move outline out of StyleBackgroundData into StyleRareNonInheritedData

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 a9bd24e01ed43aa0cd13d50dfcf1e86389a86ba2..458f0dd5e580f179b0cec2a546644e314c6eebb7 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
@@ -1506,41 +1506,46 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
   // Outline properties.
   // outline-color
   void setOutlineColor(const StyleColor& v) {
-    SET_BORDERVALUE_COLOR(m_background, m_outline, v);
+    SET_BORDERVALUE_COLOR(m_rareNonInheritedData, m_outline, v);
   }
 
   // outline-style
-  EBorderStyle outlineStyle() const { return m_background->outline().style(); }
+  EBorderStyle outlineStyle() const {
+    return m_rareNonInheritedData->m_outline.style();
+  }
   void setOutlineStyle(EBorderStyle v) {
-    SET_VAR(m_background, m_outline.m_style, v);
+    SET_VAR(m_rareNonInheritedData, m_outline.m_style, v);
   }
   static OutlineIsAuto initialOutlineStyleIsAuto() { return OutlineIsAutoOff; }
   OutlineIsAuto outlineStyleIsAuto() const {
-    return static_cast<OutlineIsAuto>(m_background->outline().isAuto());
+    return static_cast<OutlineIsAuto>(
+        m_rareNonInheritedData->m_outline.isAuto());
   }
   void setOutlineStyleIsAuto(OutlineIsAuto isAuto) {
-    SET_VAR(m_background, m_outline.m_isAuto, isAuto);
+    SET_VAR(m_rareNonInheritedData, m_outline.m_isAuto, isAuto);
   }
 
   // outline-width
   static unsigned short initialOutlineWidth() { return 3; }
   int outlineWidth() const {
-    if (m_background->outline().style() == BorderStyleNone)
+    if (m_rareNonInheritedData->m_outline.style() == BorderStyleNone)
       return 0;
-    return m_background->outline().width();
+    return m_rareNonInheritedData->m_outline.width();
   }
   void setOutlineWidth(unsigned short v) {
-    SET_VAR(m_background, m_outline.m_width, v);
+    SET_VAR(m_rareNonInheritedData, m_outline.m_width, v);
   }
 
   // outline-offset
   static int initialOutlineOffset() { return 0; }
   int outlineOffset() const {
-    if (m_background->outline().style() == BorderStyleNone)
+    if (m_rareNonInheritedData->m_outline.style() == BorderStyleNone)
       return 0;
-    return m_background->outline().offset();
+    return m_rareNonInheritedData->m_outline.offset();
+  }
+  void setOutlineOffset(int v) {
+    SET_VAR(m_rareNonInheritedData, m_outline.m_offset, v);
   }
-  void setOutlineOffset(int v) { SET_VAR(m_background, m_outline.m_offset, v); }
 
   // Overflow properties.
   // overflow-anchor
@@ -3469,18 +3474,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
     return outlineWidth() > 0 && outlineStyle() > BorderStyleHidden;
   }
   int outlineOutsetExtent() const;
-  bool isOutlineEquivalent(const ComputedStyle* otherStyle) const {
-    // No other style, so we don't have an outline then we consider them to be
-    // the same.
-    if (!otherStyle)
-      return !hasOutline();
-    return m_background->outline().visuallyEqual(
-        otherStyle->m_background->outline());
-  }
-  void setOutlineFromStyle(const ComputedStyle& o) {
-    DCHECK(!isOutlineEquivalent(&o));
-    m_background.access()->m_outline = o.m_background->m_outline;
-  }
   float getOutlineStrokeWidthForFocusRing() const;
 
   // Position utility functions.
@@ -3953,7 +3946,9 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
   StyleColor columnRuleColor() const {
     return m_rareNonInheritedData->m_multiCol->m_rule.color();
   }
-  StyleColor outlineColor() const { return m_background->outline().color(); }
+  StyleColor outlineColor() const {
+    return m_rareNonInheritedData->m_outline.color();
+  }
   StyleColor textEmphasisColor() const {
     return m_rareInheritedData->textEmphasisColor();
   }