Move outline out of StyleBackgroundData into StyleRareNonInheritedData

third_party/WebKit/Source/core/style/StyleRareNonInheritedData.cpp

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. 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.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 36 matching lines @@
   DataPersistent<void*> dataPersistents[2];
   void* ownPtrs[4];
   Persistent<void*> persistentHandles[2];
   void* refPtrs[3];
   void* uniquePtrs[1];
 
   FillLayer fillLayers;
   NinePieceImage ninePieces;
   FloatSize floatSize;
   Length lengths;
+  OutlineValue outline;
 
   StyleColor styleColors[8];
 
   Vector<String> m_callbackSelectors;
 
   StyleContentAlignmentData contentAlignmentData[2];
   StyleSelfAlignmentData selfAlignmentData[4];
 
   unsigned m_bitFields[2];
 };
@@ skipping 95 matching lines @@
                         ? CSSTransitionData::create(*o.m_transitions)
                         : nullptr),
       m_boxShadow(o.m_boxShadow),
       m_boxReflect(o.m_boxReflect),
       m_shapeOutside(o.m_shapeOutside),
       m_clipPath(o.m_clipPath),
       m_mask(o.m_mask),
       m_maskBoxImage(o.m_maskBoxImage),
       m_pageSize(o.m_pageSize),
       m_shapeMargin(o.m_shapeMargin),
+      m_outline(o.m_outline),
       m_textDecorationColor(o.m_textDecorationColor),
       m_visitedLinkTextDecorationColor(o.m_visitedLinkTextDecorationColor),
       m_visitedLinkBackgroundColor(o.m_visitedLinkBackgroundColor),
       m_visitedLinkOutlineColor(o.m_visitedLinkOutlineColor),
       m_visitedLinkBorderLeftColor(o.m_visitedLinkBorderLeftColor),
       m_visitedLinkBorderRightColor(o.m_visitedLinkBorderRightColor),
       m_visitedLinkBorderTopColor(o.m_visitedLinkBorderTopColor),
       m_visitedLinkBorderBottomColor(o.m_visitedLinkBorderBottomColor),
       m_variables(o.m_variables ? o.m_variables->copy() : nullptr),
       m_alignContent(o.m_alignContent),
@@ skipping 53 matching lines @@
          m_flexibleBox == o.m_flexibleBox && m_multiCol == o.m_multiCol &&
          m_transform == o.m_transform && m_willChange == o.m_willChange &&
          m_filter == o.m_filter && m_backdropFilter == o.m_backdropFilter &&
          m_grid == o.m_grid && m_gridItem == o.m_gridItem &&
          m_scrollSnap == o.m_scrollSnap && contentDataEquivalent(o) &&
          counterDataEquivalent(o) && shadowDataEquivalent(o) &&
          reflectionDataEquivalent(o) && animationDataEquivalent(o) &&
          transitionDataEquivalent(o) && shapeOutsideDataEquivalent(o) &&
          m_mask == o.m_mask && m_maskBoxImage == o.m_maskBoxImage &&
          m_pageSize == o.m_pageSize && m_shapeMargin == o.m_shapeMargin &&
-         clipPathDataEquivalent(o) &&
+         m_outline == o.m_outline && clipPathDataEquivalent(o) &&
          m_textDecorationColor == o.m_textDecorationColor &&
          m_visitedLinkTextDecorationColor ==
              o.m_visitedLinkTextDecorationColor &&
          m_visitedLinkBackgroundColor == o.m_visitedLinkBackgroundColor &&
          m_visitedLinkOutlineColor == o.m_visitedLinkOutlineColor &&
          m_visitedLinkBorderLeftColor == o.m_visitedLinkBorderLeftColor &&
          m_visitedLinkBorderRightColor == o.m_visitedLinkBorderRightColor &&
          m_visitedLinkBorderTopColor == o.m_visitedLinkBorderTopColor &&
          m_visitedLinkBorderBottomColor == o.m_visitedLinkBorderBottomColor &&
          m_callbackSelectors == o.m_callbackSelectors &&
@@ skipping 89 matching lines @@
     const StyleRareNonInheritedData& o) const {
   return dataEquivalent(m_shapeOutside, o.m_shapeOutside);
 }
 
 bool StyleRareNonInheritedData::clipPathDataEquivalent(
     const StyleRareNonInheritedData& o) const {
   return dataEquivalent(m_clipPath, o.m_clipPath);
 }
 
 }  // namespace blink