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

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

Issue 2366273002: Move caption-side 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 14cc888aeb622d8f99b86ca5243f4f686ef8a2f4..0bf0301aca2e7b6176df80847484ff28bfc2e5f5 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
@@ -214,8 +214,7 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
}
inline bool compareEqualNonIndependent(const InheritedData& other) const {
- return (m_captionSide == other.m_captionSide) &&
- (m_listStyleType == other.m_listStyleType) &&
+ return (m_listStyleType == other.m_listStyleType) &&
(m_listStylePosition == other.m_listStylePosition) &&
(m_textAlign == other.m_textAlign) &&
(m_textTransform == other.m_textTransform) &&
@@ -231,7 +230,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
(m_writingMode == other.m_writingMode);
}
- unsigned m_captionSide : 2; // ECaptionSide
unsigned m_listStyleType : 7; // EListStyleType
unsigned m_listStylePosition : 1; // EListStylePosition
unsigned m_textAlign : 4; // ETextAlign
@@ -363,7 +361,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
void setBitDefaults() {
ComputedStyleBase::setBitDefaults();
- m_inheritedData.m_captionSide = static_cast<unsigned>(initialCaptionSide());
m_inheritedData.m_listStyleType =
static_cast<unsigned>(initialListStyleType());
m_inheritedData.m_listStylePosition =
@@ -2078,15 +2075,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
short verticalBorderSpacing() const;
void setVerticalBorderSpacing(short);
- // caption-side (aka -epub-caption-side)
- static ECaptionSide initialCaptionSide() { return ECaptionSide::Top; }
- ECaptionSide captionSide() const {
- return static_cast<ECaptionSide>(m_inheritedData.m_captionSide);
- }
- void setCaptionSide(ECaptionSide v) {
- m_inheritedData.m_captionSide = static_cast<unsigned>(v);
- }
-
// cursor
static ECursor initialCursor() { return ECursor::Auto; }
ECursor cursor() 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