Move outline out of StyleBackgroundData into StyleRareNonInheritedData

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

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2011 Adobe Systems Incorporated. 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.
@@ skipping 945 matching lines @@
         m_rareNonInheritedData->m_maskBoxImage !=
             other.m_rareNonInheritedData->m_maskBoxImage)
       return true;
   }
 
   return false;
 }
 
 bool ComputedStyle::diffNeedsPaintInvalidationObject(
     const ComputedStyle& other) const {
-  if (!m_background->outline().visuallyEqual(other.m_background->outline()))
-    return true;
-
   if (visibility() != other.visibility() ||
       m_inheritedData.m_printColorAdjust !=
           other.m_inheritedData.m_printColorAdjust ||
       m_inheritedData.m_insideLink != other.m_inheritedData.m_insideLink ||
       !m_surround->border.visuallyEqual(other.m_surround->border) ||
-      !m_background->visuallyEqual(*other.m_background))
+      *m_background != *other.m_background)
     return true;
 
   if (m_rareInheritedData.get() != other.m_rareInheritedData.get()) {
     if (m_rareInheritedData->userModify !=
             other.m_rareInheritedData->userModify ||
         m_rareInheritedData->userSelect !=
             other.m_rareInheritedData->userSelect ||
         m_rareInheritedData->m_imageRendering !=
             other.m_rareInheritedData->m_imageRendering)
       return true;
   }
 
   if (m_rareNonInheritedData.get() != other.m_rareNonInheritedData.get()) {
     if (m_rareNonInheritedData->userDrag !=
             other.m_rareNonInheritedData->userDrag ||
         m_rareNonInheritedData->m_objectFit !=
             other.m_rareNonInheritedData->m_objectFit ||
         m_rareNonInheritedData->m_objectPosition !=
             other.m_rareNonInheritedData->m_objectPosition ||
         !m_rareNonInheritedData->shadowDataEquivalent(
             *other.m_rareNonInheritedData.get()) ||
         !m_rareNonInheritedData->shapeOutsideDataEquivalent(
             *other.m_rareNonInheritedData.get()) ||
         !m_rareNonInheritedData->clipPathDataEquivalent(
             *other.m_rareNonInheritedData.get()) ||
+        !m_rareNonInheritedData->m_outline.visuallyEqual(
+            other.m_rareNonInheritedData->m_outline) ||
         (visitedLinkBorderLeftColor() != other.visitedLinkBorderLeftColor() &&
          borderLeftWidth()) ||
         (visitedLinkBorderRightColor() != other.visitedLinkBorderRightColor() &&
          borderRightWidth()) ||
         (visitedLinkBorderBottomColor() !=
              other.visitedLinkBorderBottomColor() &&
          borderBottomWidth()) ||
         (visitedLinkBorderTopColor() != other.visitedLinkBorderTopColor() &&
          borderTopWidth()) ||
         (visitedLinkOutlineColor() != other.visitedLinkOutlineColor() &&
@@ skipping 70 matching lines @@
             *other.m_rareNonInheritedData.get()))
       diff.setNeedsRecomputeOverflow();
 
     if (m_rareNonInheritedData->m_backdropFilter !=
         other.m_rareNonInheritedData->m_backdropFilter)
       diff.setBackdropFilterChanged();
 
     if (!m_rareNonInheritedData->reflectionDataEquivalent(
             *other.m_rareNonInheritedData.get()))
       diff.setFilterChanged();
+
+    if (!m_rareNonInheritedData->m_outline.visuallyEqual(
+            other.m_rareNonInheritedData->m_outline))
+      diff.setNeedsRecomputeOverflow();
   }
 
-  if (!m_background->outline().visuallyEqual(other.m_background->outline()) ||
-      !m_surround->border.visualOverflowEqual(other.m_surround->border))
+  if (!m_surround->border.visualOverflowEqual(other.m_surround->border))
     diff.setNeedsRecomputeOverflow();
 
   if (!diff.needsPaintInvalidation()) {
     if (m_styleInheritedData->color != other.m_styleInheritedData->color ||
         m_styleInheritedData->visitedLinkColor !=
             other.m_styleInheritedData->visitedLinkColor ||
         m_inheritedData.m_textUnderline !=
             other.m_inheritedData.m_textUnderline ||
         m_visual->textDecoration != other.m_visual->textDecoration) {
       diff.setTextDecorationOrColorChanged();
@@ skipping 1293 matching lines @@
     if (value < 0)
       fvalue -= 0.5f;
     else
       fvalue += 0.5f;
   }
 
   return roundForImpreciseConversion<int>(fvalue / zoomFactor);
 }
 
 }  // namespace blink