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

Unified Diff: Source/core/editing/EditingStyle.cpp

Issue 1020833002: Remove duplicate Enum Font Pitch (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebasing patch Created 5 years, 9 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
« no previous file with comments | « Source/core/css/CSSComputedStyleDeclaration.cpp ('k') | Source/platform/fonts/FixedPitchFontType.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/editing/EditingStyle.cpp
diff --git a/Source/core/editing/EditingStyle.cpp b/Source/core/editing/EditingStyle.cpp
index bda4e45789add02b43cc79ef4bc77f1b9deca25a..23735a15bc7f01b5f6c9a21d8657a94d3eecee18 100644
--- a/Source/core/editing/EditingStyle.cpp
+++ b/Source/core/editing/EditingStyle.cpp
@@ -347,20 +347,20 @@ PassRefPtrWillBeRawPtr<CSSValue> HTMLFontSizeEquivalent::attributeValueAsCSSValu
float EditingStyle::NoFontDelta = 0.0f;
EditingStyle::EditingStyle()
- : m_fixedPitchFontType(NonFixedPitchFont)
+ : m_fixedPitchFontType(VariablePitchFont)
, m_fontSizeDelta(NoFontDelta)
{
}
EditingStyle::EditingStyle(ContainerNode* node, PropertiesToInclude propertiesToInclude)
- : m_fixedPitchFontType(NonFixedPitchFont)
+ : m_fixedPitchFontType(VariablePitchFont)
, m_fontSizeDelta(NoFontDelta)
{
init(node, propertiesToInclude);
}
EditingStyle::EditingStyle(const Position& position, PropertiesToInclude propertiesToInclude)
- : m_fixedPitchFontType(NonFixedPitchFont)
+ : m_fixedPitchFontType(VariablePitchFont)
, m_fontSizeDelta(NoFontDelta)
{
init(position.deprecatedNode(), propertiesToInclude);
@@ -368,7 +368,7 @@ EditingStyle::EditingStyle(const Position& position, PropertiesToInclude propert
EditingStyle::EditingStyle(const StylePropertySet* style)
: m_mutableStyle(style ? style->mutableCopy() : nullptr)
- , m_fixedPitchFontType(NonFixedPitchFont)
+ , m_fixedPitchFontType(VariablePitchFont)
, m_fontSizeDelta(NoFontDelta)
{
extractFontSizeDelta();
@@ -376,7 +376,7 @@ EditingStyle::EditingStyle(const StylePropertySet* style)
EditingStyle::EditingStyle(CSSPropertyID propertyID, const String& value)
: m_mutableStyle(nullptr)
- , m_fixedPitchFontType(NonFixedPitchFont)
+ , m_fixedPitchFontType(VariablePitchFont)
, m_fontSizeDelta(NoFontDelta)
{
setProperty(propertyID, value);
@@ -580,7 +580,7 @@ void EditingStyle::overrideWithStyle(const StylePropertySet* style)
void EditingStyle::clear()
{
m_mutableStyle.clear();
- m_fixedPitchFontType = NonFixedPitchFont;
+ m_fixedPitchFontType = VariablePitchFont;
m_fontSizeDelta = NoFontDelta;
}
« no previous file with comments | « Source/core/css/CSSComputedStyleDeclaration.cpp ('k') | Source/platform/fonts/FixedPitchFontType.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698