Commit 770093e3 authored by joone.hur's avatar joone.hur Committed by Commit bot

Refactoring: Use in-class member initialization in EditingStyle.h

It allows to remove common initialization lists in constructors.

BUG=none

Review-Url: https://codereview.chromium.org/2034303004
Cr-Commit-Position: refs/heads/master@{#398042}
parent 1c8f4c89
...@@ -355,38 +355,24 @@ CSSValue* HTMLFontSizeEquivalent::attributeValueAsCSSValue(Element* element) con ...@@ -355,38 +355,24 @@ CSSValue* HTMLFontSizeEquivalent::attributeValueAsCSSValue(Element* element) con
float EditingStyle::NoFontDelta = 0.0f; float EditingStyle::NoFontDelta = 0.0f;
EditingStyle::EditingStyle()
: m_isMonospaceFont(false)
, m_fontSizeDelta(NoFontDelta)
{
}
EditingStyle::EditingStyle(ContainerNode* node, PropertiesToInclude propertiesToInclude) EditingStyle::EditingStyle(ContainerNode* node, PropertiesToInclude propertiesToInclude)
: m_isMonospaceFont(false)
, m_fontSizeDelta(NoFontDelta)
{ {
init(node, propertiesToInclude); init(node, propertiesToInclude);
} }
EditingStyle::EditingStyle(const Position& position, PropertiesToInclude propertiesToInclude) EditingStyle::EditingStyle(const Position& position, PropertiesToInclude propertiesToInclude)
: m_isMonospaceFont(false)
, m_fontSizeDelta(NoFontDelta)
{ {
init(position.anchorNode(), propertiesToInclude); init(position.anchorNode(), propertiesToInclude);
} }
EditingStyle::EditingStyle(const StylePropertySet* style) EditingStyle::EditingStyle(const StylePropertySet* style)
: m_mutableStyle(style ? style->mutableCopy() : nullptr) : m_mutableStyle(style ? style->mutableCopy() : nullptr)
, m_isMonospaceFont(false)
, m_fontSizeDelta(NoFontDelta)
{ {
extractFontSizeDelta(); extractFontSizeDelta();
} }
EditingStyle::EditingStyle(CSSPropertyID propertyID, const String& value) EditingStyle::EditingStyle(CSSPropertyID propertyID, const String& value)
: m_mutableStyle(nullptr) : m_mutableStyle(nullptr)
, m_isMonospaceFont(false)
, m_fontSizeDelta(NoFontDelta)
{ {
setProperty(propertyID, value); setProperty(propertyID, value);
m_isVerticalAlign = propertyID == CSSPropertyVerticalAlign && (value == "sub" || value == "super"); m_isVerticalAlign = propertyID == CSSPropertyVerticalAlign && (value == "sub" || value == "super");
......
...@@ -145,7 +145,7 @@ public: ...@@ -145,7 +145,7 @@ public:
DECLARE_TRACE(); DECLARE_TRACE();
private: private:
EditingStyle(); EditingStyle() = default;
EditingStyle(ContainerNode*, PropertiesToInclude); EditingStyle(ContainerNode*, PropertiesToInclude);
EditingStyle(const Position&, PropertiesToInclude); EditingStyle(const Position&, PropertiesToInclude);
explicit EditingStyle(const StylePropertySet*); explicit EditingStyle(const StylePropertySet*);
...@@ -161,8 +161,8 @@ private: ...@@ -161,8 +161,8 @@ private:
void mergeStyle(const StylePropertySet*, CSSPropertyOverrideMode); void mergeStyle(const StylePropertySet*, CSSPropertyOverrideMode);
Member<MutableStylePropertySet> m_mutableStyle; Member<MutableStylePropertySet> m_mutableStyle;
bool m_isMonospaceFont; bool m_isMonospaceFont = false;
float m_fontSizeDelta; float m_fontSizeDelta = NoFontDelta;
bool m_isVerticalAlign = false; bool m_isVerticalAlign = false;
friend class HTMLElementEquivalent; friend class HTMLElementEquivalent;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment