| 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 fcbdce1b64c2b7b458d096b2072ec9ca5948cd49..f4af37123438500e1af0384f14fae7124b352d4c 100644
|
| --- a/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| +++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| @@ -199,7 +199,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
|
| struct InheritedData {
|
| bool operator==(const InheritedData& other) const {
|
| return (m_listStyleType == other.m_listStyleType) &&
|
| - (m_textAlign == other.m_textAlign) &&
|
| (m_hasSimpleUnderline == other.m_hasSimpleUnderline) &&
|
| (m_cursorStyle == other.m_cursorStyle) &&
|
| (m_direction == other.m_direction) &&
|
| @@ -214,7 +213,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
|
| }
|
|
|
| unsigned m_listStyleType : 7; // EListStyleType
|
| - unsigned m_textAlign : 4; // ETextAlign
|
| unsigned m_hasSimpleUnderline : 1; // True if 'underline solid' is the only
|
| // text decoration on this element.
|
| unsigned m_cursorStyle : 6; // ECursor
|
| @@ -319,7 +317,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
|
| ComputedStyleBase::setBitDefaults();
|
| m_inheritedData.m_listStyleType =
|
| static_cast<unsigned>(initialListStyleType());
|
| - m_inheritedData.m_textAlign = static_cast<unsigned>(initialTextAlign());
|
| m_inheritedData.m_hasSimpleUnderline = false;
|
| m_inheritedData.m_cursorStyle = static_cast<unsigned>(initialCursor());
|
| m_inheritedData.m_direction = initialDirection();
|
| @@ -2128,15 +2125,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
|
| SET_VAR(m_rareInheritedData, m_tabSize, size);
|
| }
|
|
|
| - // text-align
|
| - static ETextAlign initialTextAlign() { return ETextAlign::Start; }
|
| - ETextAlign textAlign() const {
|
| - return static_cast<ETextAlign>(m_inheritedData.m_textAlign);
|
| - }
|
| - void setTextAlign(ETextAlign v) {
|
| - m_inheritedData.m_textAlign = static_cast<unsigned>(v);
|
| - }
|
| -
|
| // text-align-last
|
| static TextAlignLast initialTextAlignLast() { return TextAlignLastAuto; }
|
| TextAlignLast getTextAlignLast() const {
|
|
|