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 1a56c52aafc5092a7b2c276ec2e3f5b216500b36..c7943404ea6ab894be3df0afb3bc570d162681ce 100644 |
--- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp |
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp |
@@ -121,7 +121,6 @@ ALWAYS_INLINE ComputedStyle::ComputedStyle() |
m_box.init(); |
m_visual.init(); |
m_background.init(); |
- m_surround.init(); |
m_rareNonInheritedData.init(); |
m_rareNonInheritedData.access()->m_deprecatedFlexibleBox.init(); |
m_rareNonInheritedData.access()->m_flexibleBox.init(); |
@@ -144,7 +143,6 @@ ALWAYS_INLINE ComputedStyle::ComputedStyle(const ComputedStyle& o) |
m_box(o.m_box), |
m_visual(o.m_visual), |
m_background(o.m_background), |
- m_surround(o.m_surround), |
m_rareNonInheritedData(o.m_rareNonInheritedData), |
m_rareInheritedData(o.m_rareInheritedData), |
m_styleInheritedData(o.m_styleInheritedData), |
@@ -339,7 +337,6 @@ void ComputedStyle::copyNonInheritedFromCached(const ComputedStyle& other) { |
m_box = other.m_box; |
m_visual = other.m_visual; |
m_background = other.m_background; |
- m_surround = other.m_surround; |
m_rareNonInheritedData = other.m_rareNonInheritedData; |
// The flags are copied one-by-one because m_nonInheritedData.m_contains a |
@@ -488,7 +485,6 @@ bool ComputedStyle::nonInheritedEqual(const ComputedStyle& other) const { |
other.verticalAlign() && // Not generated in ComputedStyleBase |
m_box == other.m_box && |
m_visual == other.m_visual && m_background == other.m_background && |
- m_surround == other.m_surround && |
m_rareNonInheritedData == other.m_rareNonInheritedData && |
m_svgStyle->nonInheritedEqual(*other.m_svgStyle); |
} |