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

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

Issue 2516263002: Changed ETextTransform to an enum class and renamed its members (Closed)
Patch Set: Created 4 years, 1 month 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 14cc888aeb622d8f99b86ca5243f4f686ef8a2f4..b545d2f5d5cbc9bdad68dfde29ea1479c621069b 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
@@ -369,7 +369,8 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
m_inheritedData.m_listStylePosition =
static_cast<unsigned>(initialListStylePosition());
m_inheritedData.m_textAlign = static_cast<unsigned>(initialTextAlign());
- m_inheritedData.m_textTransform = initialTextTransform();
+ m_inheritedData.m_textTransform =
+ static_cast<unsigned>(initialTextTransform());
m_inheritedData.m_hasSimpleUnderline = false;
m_inheritedData.m_cursorStyle = static_cast<unsigned>(initialCursor());
m_inheritedData.m_direction = initialDirection();
@@ -2303,12 +2304,12 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
}
// text-transform (aka -epub-text-transform)
- static ETextTransform initialTextTransform() { return TTNONE; }
+ static ETextTransform initialTextTransform() { return ETextTransform::None; }
ETextTransform textTransform() const {
return static_cast<ETextTransform>(m_inheritedData.m_textTransform);
}
void setTextTransform(ETextTransform v) {
- m_inheritedData.m_textTransform = v;
+ m_inheritedData.m_textTransform = static_cast<unsigned>(v);
}
// white-space inherited
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutText.cpp ('k') | third_party/WebKit/Source/core/style/ComputedStyleConstants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698