Added support for non-inherited flags in 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 311 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;
     m_nonInheritedData.m_overflowAnchor = other.m_nonInheritedData.m_overflowAnchor;
     m_nonInheritedData.m_overflowX = other.m_nonInheritedData.m_overflowX;
     m_nonInheritedData.m_overflowY = other.m_nonInheritedData.m_overflowY;
     m_nonInheritedData.m_verticalAlign = other.m_nonInheritedData.m_verticalAlign;
     m_nonInheritedData.m_clear = other.m_nonInheritedData.m_clear;
     m_nonInheritedData.m_position = other.m_nonInheritedData.m_position;
-    m_nonInheritedData.m_floating = other.m_nonInheritedData.m_floating;
     m_nonInheritedData.m_tableLayout = other.m_nonInheritedData.m_tableLayout;
     m_nonInheritedData.m_unicodeBidi = other.m_nonInheritedData.m_unicodeBidi;
     m_nonInheritedData.m_hasViewportUnits = other.m_nonInheritedData.m_hasViewportUnits;
     m_nonInheritedData.m_breakBefore = other.m_nonInheritedData.m_breakBefore;
     m_nonInheritedData.m_breakAfter = other.m_nonInheritedData.m_breakAfter;
     m_nonInheritedData.m_breakInside = other.m_nonInheritedData.m_breakInside;
     m_nonInheritedData.m_hasRemUnits = other.m_nonInheritedData.m_hasRemUnits;
 
     // Correctly set during selector matching:
     // m_nonInheritedData.m_styleType
@@ skipping 132 matching lines @@
 }
 
 bool ComputedStyle::loadingCustomFontsEqual(const ComputedStyle& other) const
 {
     return font().loadingCustomFonts() == other.font().loadingCustomFonts();
 }
 
 bool ComputedStyle::nonInheritedEqual(const ComputedStyle& other) const
 {
     // compare everything except the pseudoStyle pointer
-    return m_nonInheritedData == other.m_nonInheritedData
+    return ComputedStyleBase::nonInheritedEqual(other)
+        && m_nonInheritedData == other.m_nonInheritedData
         && 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);
 }
 
 bool ComputedStyle::inheritedDataShared(const ComputedStyle& other) const
 {
@@ skipping 192 matching lines @@
         || m_inheritedData.m_textTransform != other.m_inheritedData.m_textTransform
         || m_inheritedData.m_direction != other.m_inheritedData.m_direction
         || m_inheritedData.m_whiteSpace != other.m_inheritedData.m_whiteSpace
         || m_inheritedData.m_writingMode != other.m_inheritedData.m_writingMode)
         return true;
 
     if (m_nonInheritedData.m_overflowX != other.m_nonInheritedData.m_overflowX
         || m_nonInheritedData.m_overflowY != other.m_nonInheritedData.m_overflowY
         || m_nonInheritedData.m_clear != other.m_nonInheritedData.m_clear
         || m_nonInheritedData.m_unicodeBidi != other.m_nonInheritedData.m_unicodeBidi
-        || m_nonInheritedData.m_floating != other.m_nonInheritedData.m_floating
+        || floating() != other.floating()
         || m_nonInheritedData.m_originalDisplay != other.m_nonInheritedData.m_originalDisplay)
         return true;
 
     if (m_nonInheritedData.m_effectiveDisplay >= FIRST_TABLE_DISPLAY && m_nonInheritedData.m_effectiveDisplay <= LAST_TABLE_DISPLAY) {
         if (m_inheritedData.m_borderCollapse != other.m_inheritedData.m_borderCollapse
             || m_inheritedData.m_emptyCells != other.m_inheritedData.m_emptyCells
             || m_inheritedData.m_captionSide != other.m_inheritedData.m_captionSide
             || m_nonInheritedData.m_tableLayout != other.m_nonInheritedData.m_tableLayout)
             return true;
 
@@ skipping 1328 matching lines @@
         if (value < 0)
             fvalue -= 0.5f;
         else
             fvalue += 0.5f;
     }
 
     return roundForImpreciseConversion<int>(fvalue / zoomFactor);
 }
 
 } // namespace blink