| 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 c5478dda4d1dddbe2fa7cd5a7fabecbe71e03baf..8ac1b923640bc205a75d9ea9873e4fcfe32fb334 100644
|
| --- a/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| +++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| @@ -206,8 +206,7 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
|
| // don't inherit
|
| struct NonInheritedData {
|
| NonInheritedData()
|
| - : m_originalDisplay(static_cast<unsigned>(initialDisplay())),
|
| - m_verticalAlign(static_cast<unsigned>(initialVerticalAlign())),
|
| + : m_verticalAlign(static_cast<unsigned>(initialVerticalAlign())),
|
| m_hasViewportUnits(false),
|
| m_hasRemUnits(false) {}
|
|
|
| @@ -215,8 +214,7 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
|
| // should not cause an inequality.
|
| bool operator==(const NonInheritedData& other) const {
|
| // Generated properties are compared in ComputedStyleBase
|
| - return m_originalDisplay == other.m_originalDisplay &&
|
| - m_verticalAlign == other.m_verticalAlign;
|
| + return m_verticalAlign == other.m_verticalAlign;
|
| // Differences in the following fields do not cause inequality:
|
| // hasViewportUnits
|
| // styleType
|
| @@ -236,7 +234,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
|
| return !(*this == other);
|
| }
|
|
|
| - unsigned m_originalDisplay : 5; // EDisplay
|
| unsigned m_verticalAlign : 4; // EVerticalAlign
|
|
|
| // This is set if we used viewport units when resolving a length.
|
| @@ -799,14 +796,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
|
| }
|
| void setContent(ContentData*);
|
|
|
| - // display
|
| - EDisplay originalDisplay() const {
|
| - return static_cast<EDisplay>(m_nonInheritedData.m_originalDisplay);
|
| - }
|
| - void setOriginalDisplay(EDisplay v) {
|
| - m_nonInheritedData.m_originalDisplay = static_cast<unsigned>(v);
|
| - }
|
| -
|
| // Flex properties.
|
| // flex-basis (aka -webkit-flex-basis)
|
| static Length initialFlexBasis() { return Length(Auto); }
|
|
|