Move outline out of StyleBackgroundData into StyleRareNonInheritedData

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 1488 matching lines @@
   // We restrict the smallest value to int min + 2 because we use int min and
   // int min + 1 as special values in a hash set.
   void setOrder(int o) {
     SET_VAR(m_rareNonInheritedData, m_order,
             max(std::numeric_limits<int>::min() + 2, o));
   }
 
   // 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_background, m_outline.m_offset, v); }
+  void setOutlineOffset(int v) {
+    SET_VAR(m_rareNonInheritedData, m_outline.m_offset, v);
+  }
 
   // Overflow properties.
   // overflow-anchor
   static EOverflowAnchor initialOverflowAnchor() { return AnchorAuto; }
   EOverflowAnchor overflowAnchor() const {
     return static_cast<EOverflowAnchor>(m_nonInheritedData.m_overflowAnchor);
   }
   void setOverflowAnchor(EOverflowAnchor v) {
     m_nonInheritedData.m_overflowAnchor = v;
   }
@@ skipping 1908 matching lines @@
   // Page size utility functions.
   void resetPageSizeType() {
     SET_VAR(m_rareNonInheritedData, m_pageSizeType, PAGE_SIZE_AUTO);
   }
 
   // Outline utility functions.
   bool hasOutline() const {
     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.
   bool hasOutOfFlowPosition() const {
     return position() == AbsolutePosition || position() == FixedPosition;
   }
   bool hasInFlowPosition() const {
     return position() == RelativePosition || position() == StickyPosition;
   }
   bool hasViewportConstrainedPosition() const {
@@ skipping 452 matching lines @@
   }
   StyleColor borderTopColor() const { return m_surround->border.top().color(); }
   StyleColor borderBottomColor() const {
     return m_surround->border.bottom().color();
   }
   StyleColor backgroundColor() const { return m_background->color(); }
   Color color() const;
   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();
   }
   StyleColor textFillColor() const {
     return m_rareInheritedData->textFillColor();
   }
   StyleColor textStrokeColor() const {
     return m_rareInheritedData->textStrokeColor();
   }
   Color visitedLinkColor() const;
@@ skipping 152 matching lines @@
   m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1);
 }
 
 inline bool ComputedStyle::hasPseudoElementStyle() const {
   return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
 }
 
 }  // namespace blink
 
 #endif  // ComputedStyle_h