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

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

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
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/style/ComputedStyle.cpp
diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.cpp b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
index aea39026af72e1ba14185572ef0a6f0226c0b780..1e6afe9da4816c0be507d72ed71436d7b5fc9b6c 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
@@ -239,6 +239,8 @@ void ComputedStyle::propagateIndependentInheritedProperties(
setPointerEvents(parentStyle.pointerEvents());
if (m_nonInheritedData.m_isVisibilityInherited)
setVisibility(parentStyle.visibility());
+ if (m_nonInheritedData.m_isWhiteSpaceInherited)
+ setWhiteSpace(parentStyle.whiteSpace());
}
StyleSelfAlignmentData resolvedSelfAlignment(
@@ -426,6 +428,8 @@ void ComputedStyle::copyNonInheritedFromCached(const ComputedStyle& other) {
other.m_nonInheritedData.m_isPointerEventsInherited;
m_nonInheritedData.m_isVisibilityInherited =
other.m_nonInheritedData.m_isVisibilityInherited;
+ m_nonInheritedData.m_isWhiteSpaceInherited =
+ other.m_nonInheritedData.m_isWhiteSpaceInherited;
if (m_svgStyle != other.m_svgStyle)
m_svgStyle.access()->copyNonInheritedFromCached(other.m_svgStyle.get());
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698