| Index: third_party/WebKit/Source/core/style/ComputedStyle.h
|
| diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.h b/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| index 2d3e107e091833e5fc70b53a95b1843792a871e0..bff6a2e44c7d90b331b450eaa76f4a4552dd766d 100644
|
| --- a/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| +++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| @@ -179,50 +179,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase<ComputedStyle>,
|
| 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_;
|
|
|