Generate subgroup StyleSurroundData in ComputedStyle.

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 103 matching lines @@
 
 PassRefPtr<ComputedStyle> ComputedStyle::clone(const ComputedStyle& other) {
   return adoptRef(new ComputedStyle(other));
 }
 
 ALWAYS_INLINE ComputedStyle::ComputedStyle()
     : ComputedStyleBase(), RefCounted<ComputedStyle>() {
   m_box.init();
   m_visual.init();
   m_background.init();
-  m_surround.init();
   m_rareNonInheritedData.init();
   m_rareNonInheritedData.access()->m_deprecatedFlexibleBox.init();
   m_rareNonInheritedData.access()->m_flexibleBox.init();
   m_rareNonInheritedData.access()->m_multiCol.init();
   m_rareNonInheritedData.access()->m_transform.init();
   m_rareNonInheritedData.access()->m_willChange.init();
   m_rareNonInheritedData.access()->m_filter.init();
   m_rareNonInheritedData.access()->m_backdropFilter.init();
   m_rareNonInheritedData.access()->m_grid.init();
   m_rareNonInheritedData.access()->m_gridItem.init();
   m_rareNonInheritedData.access()->m_scrollSnap.init();
   m_rareInheritedData.init();
   m_styleInheritedData.init();
   m_svgStyle.init();
 }
 
 ALWAYS_INLINE ComputedStyle::ComputedStyle(const ComputedStyle& o)
     : ComputedStyleBase(o),
       RefCounted<ComputedStyle>(),
       m_box(o.m_box),
       m_visual(o.m_visual),
       m_background(o.m_background),
-      m_surround(o.m_surround),
       m_rareNonInheritedData(o.m_rareNonInheritedData),
       m_rareInheritedData(o.m_rareInheritedData),
       m_styleInheritedData(o.m_styleInheritedData),
       m_svgStyle(o.m_svgStyle),
       m_nonInheritedData(o.m_nonInheritedData) {}
 
 static StyleRecalcChange diffPseudoStyles(const ComputedStyle& oldStyle,
                                           const ComputedStyle& newStyle) {
   // If the pseudoStyles have changed, ensure layoutObject triggers setStyle.
   if (!oldStyle.hasAnyPublicPseudoStyles() &&
@@ skipping 174 matching lines @@
   m_styleInheritedData = inheritParent.m_styleInheritedData;
   if (m_svgStyle != inheritParent.m_svgStyle)
     m_svgStyle.access()->inheritFrom(inheritParent.m_svgStyle.get());
 }
 
 void ComputedStyle::copyNonInheritedFromCached(const ComputedStyle& other) {
   ComputedStyleBase::copyNonInheritedFromCached(other);
   m_box = other.m_box;
   m_visual = other.m_visual;
   m_background = other.m_background;
-  m_surround = other.m_surround;
   m_rareNonInheritedData = other.m_rareNonInheritedData;
 
   // The flags are copied one-by-one because m_nonInheritedData.m_contains a
   // bunch of stuff other than real style data.
   // See comments for each skipped flag below.
   setOriginalDisplay(
       other.originalDisplay());  // Not generated in ComputedStyleBase.
   setVerticalAlign(
       other.verticalAlign());  // Not generated in ComputedStyleBase
   m_nonInheritedData.m_hasViewportUnits =
@@ skipping 128 matching lines @@
 
 bool ComputedStyle::nonInheritedEqual(const ComputedStyle& other) const {
   // compare everything except the pseudoStyle pointer
   return ComputedStyleBase::nonInheritedEqual(other) &&
          originalDisplay() ==
              other.originalDisplay() &&  // Not generated in ComputedStyleBase
          verticalAlign() ==
              other.verticalAlign() &&  // Not generated in ComputedStyleBase
          m_box == other.m_box &&
          m_visual == other.m_visual && m_background == other.m_background &&
-         m_surround == other.m_surround &&
          m_rareNonInheritedData == other.m_rareNonInheritedData &&
          m_svgStyle->nonInheritedEqual(*other.m_svgStyle);
 }
 
 bool ComputedStyle::inheritedDataShared(const ComputedStyle& other) const {
   // This is a fast check that only looks if the data structures are shared.
   // TODO(sashab): Should ComputedStyleBase have an inheritedDataShared method?
   return ComputedStyleBase::inheritedEqual(other) &&
          m_styleInheritedData.get() == other.m_styleInheritedData.get() &&
          m_svgStyle.get() == other.m_svgStyle.get() &&
@@ skipping 1996 matching lines @@
     if (value < 0)
       fvalue -= 0.5f;
     else
       fvalue += 0.5f;
   }
 
   return roundForImpreciseConversion<int>(fvalue / zoomFactor);
 }
 
 }  // namespace blink