Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(809)

Unified Diff: third_party/WebKit/Source/core/style/ComputedStyle.h

Issue 2882123002: Move StyleInheritedData.h to a nested class in ComputedStyle. (Closed)
Patch Set: Rebase Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 a326653216a03e1c0813062213b06dfea762d1c7..385ab0edb9d896023e17431358db454d702f825e 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
@@ -44,7 +44,6 @@
#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"
@@ -60,6 +59,7 @@
#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"
@@ -180,6 +180,50 @@ 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_;
« no previous file with comments | « third_party/WebKit/Source/core/style/BUILD.gn ('k') | third_party/WebKit/Source/core/style/ComputedStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698