| 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 2d7f8a0870f8c69cf0cb0d9ae45af76830263322..340e8b6f3fd66282fca8d5435e605ded708ecb46 100644
|
| --- a/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| +++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| @@ -265,8 +265,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
|
|
|
| unsigned m_styleType : 6; // PseudoId
|
| unsigned m_pseudoBits : 8;
|
| - unsigned m_explicitInheritance : 1; // Explicitly inherits a non-inherited
|
| - // property
|
|
|
| unsigned m_emptyState : 1;
|
|
|
| @@ -297,7 +295,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
|
| static_cast<unsigned>(initialVerticalAlign());
|
| m_nonInheritedData.m_styleType = PseudoIdNone;
|
| m_nonInheritedData.m_pseudoBits = 0;
|
| - m_nonInheritedData.m_explicitInheritance = false;
|
| m_nonInheritedData.m_emptyState = false;
|
| m_nonInheritedData.m_hasViewportUnits = false;
|
| m_nonInheritedData.m_isLink = false;
|
| @@ -2466,13 +2463,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
|
| m_inheritedData.m_insideLink = static_cast<unsigned>(insideLink);
|
| }
|
|
|
| - bool hasExplicitlyInheritedProperties() const {
|
| - return m_nonInheritedData.m_explicitInheritance;
|
| - }
|
| - void setHasExplicitlyInheritedProperties() {
|
| - m_nonInheritedData.m_explicitInheritance = true;
|
| - }
|
| -
|
| bool requiresAcceleratedCompositingForExternalReasons(bool b) {
|
| return m_rareNonInheritedData
|
| ->m_requiresAcceleratedCompositingForExternalReasons;
|
|
|