Added support for isInherited flags to ComputedStyleBase

third_party/WebKit/Source/core/style/ComputedStyle.cpp

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 209 matching lines @@
 
     if (oldStyle->hasExplicitlyInheritedProperties())
         return Inherit;
 
     return NoInherit;
 }
 
 // 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)
 {
     // To avoid needing to copy the RareNonInheritedData, we repurpose the 'auto' flag to not just mean 'auto' prior to running the StyleAdjuster but also mean 'normal' after running it.
     if (value.position() == ItemPositionNormal || value.position() == ItemPositionAuto)
         return {normalValueBehavior, OverflowAlignmentDefault};
     return value;
 }
 
@@ skipping 75 matching lines @@
         m_rareInheritedData = inheritParent.m_rareInheritedData;
     }
     m_styleInheritedData = inheritParent.m_styleInheritedData;
     m_inheritedData = inheritParent.m_inheritedData;
     if (m_svgStyle != inheritParent.m_svgStyle)
         m_svgStyle.access()->inheritFrom(inheritParent.m_svgStyle.get());
 }
 
 void ComputedStyle::copyNonInheritedFromCached(const ComputedStyle& other)
 {
+    ComputedStyleBase::copyNonInheritedFromCached(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 bunch of stuff other than real style data.
     // See comments for each skipped flag below.
     m_nonInheritedData.m_effectiveDisplay = other.m_nonInheritedData.m_effectiveDisplay;
     m_nonInheritedData.m_originalDisplay = other.m_nonInheritedData.m_originalDisplay;
@@ skipping 41 matching lines @@
     // m_nonInheritedData.m_emptyState
     // m_nonInheritedData.m_affectedByFocus
     // m_nonInheritedData.m_affectedByHover
     // m_nonInheritedData.m_affectedByActive
     // m_nonInheritedData.m_affectedByDrag
     // m_nonInheritedData.m_isLink
 
     // 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());
     DCHECK_EQ(zoom(), initialZoom());
 }
 
 bool ComputedStyle::operator==(const ComputedStyle& o) const
 {
     return inheritedEqual(o)
         && nonInheritedEqual(o);
@@ skipping 1649 matching lines @@
         if (value < 0)
             fvalue -= 0.5f;
         else
             fvalue += 0.5f;
     }
 
     return roundForImpreciseConversion<int>(fvalue / zoomFactor);
 }
 
 } // namespace blink