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

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

Issue 2528283002: Move text-transform to be generated in ComputedStyleBase (Closed)
Patch Set: Rebase 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 2ee781a0144d73908be32b0099d7b765d2edeae9..548a7b350b1b0449cc19dcf960738027f6c525e2 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
@@ -216,7 +216,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
inline bool compareEqualNonIndependent(const InheritedData& other) const {
return (m_listStyleType == other.m_listStyleType) &&
(m_textAlign == other.m_textAlign) &&
- (m_textTransform == other.m_textTransform) &&
(m_hasSimpleUnderline == other.m_hasSimpleUnderline) &&
(m_cursorStyle == other.m_cursorStyle) &&
(m_direction == other.m_direction) &&
@@ -231,7 +230,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
unsigned m_listStyleType : 7; // EListStyleType
unsigned m_textAlign : 4; // ETextAlign
- unsigned m_textTransform : 2; // ETextTransform
unsigned m_hasSimpleUnderline : 1; // True if 'underline solid' is the only
// text decoration on this element.
unsigned m_cursorStyle : 6; // ECursor
@@ -362,8 +360,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
m_inheritedData.m_listStyleType =
static_cast<unsigned>(initialListStyleType());
m_inheritedData.m_textAlign = static_cast<unsigned>(initialTextAlign());
- 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();
@@ -2279,15 +2275,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
SET_VAR(m_rareInheritedData, m_textSizeAdjust, sizeAdjust);
}
- // text-transform (aka -epub-text-transform)
- 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 = static_cast<unsigned>(v);
- }
-
// white-space inherited
static EWhiteSpace initialWhiteSpace() { return EWhiteSpace::Normal; }
EWhiteSpace whiteSpace() const {
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSProperties.in ('k') | third_party/WebKit/Source/core/style/ComputedStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698