Move StyleInheritedData.h to a nested class in ComputedStyle.

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 26 matching lines @@
 #include "core/style/LineClampValue.h"
 #include "core/style/NinePieceImage.h"
 #include "core/style/SVGComputedStyle.h"
 #include "core/style/StyleContentAlignmentData.h"
 #include "core/style/StyleDeprecatedFlexibleBoxData.h"
 #include "core/style/StyleDifference.h"
 #include "core/style/StyleFilterData.h"
 #include "core/style/StyleFlexibleBoxData.h"
 #include "core/style/StyleGridData.h"
 #include "core/style/StyleGridItemData.h"
-#include "core/style/StyleInheritedData.h"
 #include "core/style/StyleMultiColData.h"
 #include "core/style/StyleOffsetRotation.h"
 #include "core/style/StyleRareInheritedData.h"
 #include "core/style/StyleRareNonInheritedData.h"
 #include "core/style/StyleReflection.h"
 #include "core/style/StyleSelfAlignmentData.h"
 #include "core/style/StyleTransformData.h"
 #include "core/style/StyleWillChangeData.h"
 #include "core/style/TransformOrigin.h"
 #include "platform/Length.h"
 #include "platform/LengthBox.h"
 #include "platform/LengthPoint.h"
 #include "platform/LengthSize.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/ThemeTypes.h"
+#include "platform/fonts/Font.h"
 #include "platform/fonts/FontDescription.h"
 #include "platform/geometry/FloatRoundedRect.h"
 #include "platform/geometry/LayoutRectOutsets.h"
 #include "platform/graphics/Color.h"
 #include "platform/graphics/TouchAction.h"
 #include "platform/scroll/ScrollTypes.h"
 #include "platform/text/TextDirection.h"
 #include "platform/text/UnicodeBidi.h"
 #include "platform/transforms/TransformOperations.h"
 #include "platform/wtf/Forward.h"
@@ skipping 100 matching lines @@
   friend class ColorPropertyFunctions;
 
   // FIXME: When we stop resolving currentColor at style time, these can be
   // removed.
   friend class CSSToStyleMap;
   friend class FilterOperationResolver;
   friend class StyleBuilderConverter;
   friend class StyleResolverState;
   friend class StyleResolver;
 
+ private:
+  class StyleInheritedData : public RefCountedCopyable<StyleInheritedData> {
+   public:
+    static PassRefPtr<StyleInheritedData> Create() {
+      return AdoptRef(new StyleInheritedData);
+    }
+    PassRefPtr<StyleInheritedData> Copy() const {
+      return AdoptRef(new StyleInheritedData(*this));
+    }
+
+    bool operator==(const StyleInheritedData& other) const {
+      return line_height_ == other.line_height_ && font_ == other.font_ &&
+             color_ == other.color_ &&
+             visited_link_color_ == other.visited_link_color_ &&
+             horizontal_border_spacing_ == other.horizontal_border_spacing_ &&
+             text_autosizing_multiplier_ == other.text_autosizing_multiplier_ &&
+             vertical_border_spacing_ == other.vertical_border_spacing_;
+    }
+    bool operator!=(const StyleInheritedData& o) const { return !(*this == o); }
+
+    short horizontal_border_spacing_;
+    short vertical_border_spacing_;
+
+    // could be packed in a short but doesn't
+    // make a difference currently because of padding
+    Length line_height_;
+
+    Font font_;
+    Color color_;
+    Color visited_link_color_;
+    float text_autosizing_multiplier_;
+
+   private:
+    StyleInheritedData()
+        : horizontal_border_spacing_(0),
+          vertical_border_spacing_(0),
+          line_height_(Length(-100.0, kPercent)),
+          color_(Color::kBlack),
+          visited_link_color_(Color::kBlack),
+          text_autosizing_multiplier_(1) {}
+
+    StyleInheritedData(const StyleInheritedData&) = default;
+  };
+
  protected:
   // non-inherited attributes
   DataRef<StyleRareNonInheritedData> rare_non_inherited_data_;
 
   // inherited attributes
   DataRef<StyleRareInheritedData> rare_inherited_data_;
   DataRef<StyleInheritedData> inherited_data_;
 
   // list of associated pseudo styles
   std::unique_ptr<PseudoStyleCache> cached_pseudo_styles_;
@@ skipping 3580 matching lines @@
       PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId)));
 }
 
 inline bool ComputedStyle::HasPseudoElementStyle() const {
   return PseudoBitsInternal() & kElementPseudoIdMask;
 }
 
 }  // namespace blink
 
 #endif  // ComputedStyle_h