Move StyleInheritedData.cpp to be inline in StyleInheritedData.h.
This patch removes StyleInheritedData.cpp, and moves all its contents to be
inline in StyleInheritedData.h
This is prework for generating StyleInheritedData.
BUG=628043
Review-Url: https://codereview.chromium.org/2883803002
Cr-Commit-Position: refs/heads/master@{#471691}
diff --git a/third_party/WebKit/Source/core/style/BUILD.gn b/third_party/WebKit/Source/core/style/BUILD.gn
index aee7515..25da73a 100644
--- a/third_party/WebKit/Source/core/style/BUILD.gn
+++ b/third_party/WebKit/Source/core/style/BUILD.gn
@@ -79,7 +79,6 @@
"StyleGridItemData.h",
"StyleImage.cpp",
"StyleImage.h",
- "StyleInheritedData.cpp",
"StyleInheritedData.h",
"StyleInheritedVariables.cpp",
"StyleInheritedVariables.h",
diff --git a/third_party/WebKit/Source/core/style/StyleInheritedData.cpp b/third_party/WebKit/Source/core/style/StyleInheritedData.cpp
deleted file mode 100644
index 12ae76f..0000000
--- a/third_party/WebKit/Source/core/style/StyleInheritedData.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#include "core/style/StyleInheritedData.h"
-
-#include "core/style/ComputedStyle.h"
-
-namespace blink {
-
-StyleInheritedData::StyleInheritedData()
- : horizontal_border_spacing_(
- ComputedStyle::InitialHorizontalBorderSpacing()),
- vertical_border_spacing_(ComputedStyle::InitialVerticalBorderSpacing()),
- line_height_(ComputedStyle::InitialLineHeight()),
- color_(ComputedStyle::InitialColor()),
- visited_link_color_(ComputedStyle::InitialColor()),
- text_autosizing_multiplier_(1) {}
-
-bool StyleInheritedData::operator==(const StyleInheritedData& o) const {
- return line_height_ == o.line_height_ && font_ == o.font_ &&
- color_ == o.color_ && visited_link_color_ == o.visited_link_color_ &&
- horizontal_border_spacing_ == o.horizontal_border_spacing_ &&
- text_autosizing_multiplier_ == o.text_autosizing_multiplier_ &&
- vertical_border_spacing_ == o.vertical_border_spacing_;
-}
-
-} // namespace blink
diff --git a/third_party/WebKit/Source/core/style/StyleInheritedData.h b/third_party/WebKit/Source/core/style/StyleInheritedData.h
index bbcbe48..b3e01f78 100644
--- a/third_party/WebKit/Source/core/style/StyleInheritedData.h
+++ b/third_party/WebKit/Source/core/style/StyleInheritedData.h
@@ -47,7 +47,14 @@
return AdoptRef(new StyleInheritedData(*this));
}
- bool operator==(const StyleInheritedData&) const;
+ 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_;
@@ -63,7 +70,14 @@
float text_autosizing_multiplier_;
private:
- StyleInheritedData();
+ 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;
};
