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

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

Issue 2766973002: Generate nonproperty originalDisplay in ComputedStyleBase. (Closed)
Patch Set: Rebase Created 3 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
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); }

Powered by Google App Engine
This is Rietveld 408576698