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

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

Issue 2538983002: Made CSS white-space property use IndependentInherit (Closed)
Patch Set: Rebase Created 4 years 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 727c18c51a5a7e2005b5a87d4d4ede904d082447..b72f5ac2cdecab92c4c883c4eefc9e887840fc82 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
@@ -210,7 +210,8 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
// These must match the properties tagged 'independent' in
// CSSProperties.in.
// TODO(sashab): Generate this function.
- return (m_pointerEvents == other.m_pointerEvents);
+ return (m_pointerEvents == other.m_pointerEvents) &&
+ (m_whiteSpace == other.m_whiteSpace);
}
inline bool compareEqualNonIndependent(const InheritedData& other) const {
@@ -219,7 +220,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
(m_hasSimpleUnderline == other.m_hasSimpleUnderline) &&
(m_cursorStyle == other.m_cursorStyle) &&
(m_direction == other.m_direction) &&
- (m_whiteSpace == other.m_whiteSpace) &&
(m_borderCollapse == other.m_borderCollapse) &&
(m_boxDirection == other.m_boxDirection) &&
(m_rtlOrdering == other.m_rtlOrdering) &&
@@ -348,6 +348,7 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
// InheritedFlags
unsigned m_isPointerEventsInherited : 1;
unsigned m_isVisibilityInherited : 1;
+ unsigned m_isWhiteSpaceInherited : 1;
// If you add more style bits here, you will also need to update
// ComputedStyle::copyNonInheritedFromCached() 68 bits
@@ -406,6 +407,7 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
// All independently inherited properties default to being inherited.
m_nonInheritedData.m_isPointerEventsInherited = true;
m_nonInheritedData.m_isVisibilityInherited = true;
+ m_nonInheritedData.m_isWhiteSpaceInherited = true;
}
private:
@@ -2283,6 +2285,9 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
void setWhiteSpace(EWhiteSpace v) {
m_inheritedData.m_whiteSpace = static_cast<unsigned>(v);
}
+ void setWhiteSpaceIsInherited(bool isInherited) {
+ m_nonInheritedData.m_isWhiteSpaceInherited = isInherited;
+ }
// word-break inherited (aka -epub-word-break)
static EWordBreak initialWordBreak() { return NormalWordBreak; }
« 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