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 13ae90feb05b3918b289f6ef62b78868a7e495d3..3f9faf14bdb97dc79359d74be94f61296b5baf78 100644 |
--- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp |
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp |
@@ -227,10 +227,9 @@ StyleRecalcChange ComputedStyle::stylePropagationDiff(const ComputedStyle* oldSt |
// TODO(sashab): Generate this function. |
void ComputedStyle::propagateIndependentInheritedProperties(const ComputedStyle& parentStyle) |
{ |
+ ComputedStyleBase::propagateIndependentInheritedProperties(parentStyle); |
if (m_nonInheritedData.m_isPointerEventsInherited) |
setPointerEvents(parentStyle.pointerEvents()); |
- if (m_nonInheritedData.m_isVisibilityInherited) |
- setVisibility(parentStyle.visibility()); |
} |
StyleSelfAlignmentData resolvedSelfAlignment(const StyleSelfAlignmentData& value, ItemPosition normalValueBehavior) |
@@ -326,6 +325,7 @@ void ComputedStyle::inheritFrom(const ComputedStyle& inheritParent, IsAtShadowBo |
void ComputedStyle::copyNonInheritedFromCached(const ComputedStyle& other) |
{ |
+ ComputedStyleBase::copyNonInheritedFromCached(other); |
m_box = other.m_box; |
m_visual = other.m_visual; |
m_background = other.m_background; |
@@ -387,7 +387,6 @@ void ComputedStyle::copyNonInheritedFromCached(const ComputedStyle& other) |
// Any properties that are inherited on a style are also inherited on elements |
// that share this style. |
m_nonInheritedData.m_isPointerEventsInherited = other.m_nonInheritedData.m_isPointerEventsInherited; |
- m_nonInheritedData.m_isVisibilityInherited = other.m_nonInheritedData.m_isVisibilityInherited; |
if (m_svgStyle != other.m_svgStyle) |
m_svgStyle.access()->copyNonInheritedFromCached(other.m_svgStyle.get()); |