DO NOT LAND!! Revert of Generate ComputedStyle::hasViewportUnits and hasRemUnits.

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 60 matching lines @@
 // Since different compilers/architectures pack ComputedStyle differently,
 // re-create the same structure for an accurate size comparison.
 struct SameSizeAsComputedStyle : public RefCounted<SameSizeAsComputedStyle> {
   struct ComputedStyleBase {
     unsigned m_bitfields[4];
   } m_base;
 
   void* dataRefs[7];
   void* ownPtrs[1];
   void* dataRefSvgStyle;
+
+  struct NonInheritedData {
+    unsigned m_bitfields[1];
+  } m_nonInheritedData;
 };
 
 // If this assert fails, it means that size of ComputedStyle has changed. Please
 // check that you really *do* what to increase the size of ComputedStyle, then
 // update the SameSizeAsComputedStyle struct to match the updated storage of
 // ComputedStyle.
 ASSERT_SIZE(ComputedStyle, SameSizeAsComputedStyle);
 
 PassRefPtr<ComputedStyle> ComputedStyle::create() {
   return adoptRef(new ComputedStyle(initialStyle()));
@@ skipping 46 matching lines @@
 ALWAYS_INLINE ComputedStyle::ComputedStyle(const ComputedStyle& o)
     : ComputedStyleBase(o),
       RefCounted<ComputedStyle>(),
       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),
-      m_svgStyle(o.m_svgStyle) {}
+      m_svgStyle(o.m_svgStyle),
+      m_nonInheritedData(o.m_nonInheritedData) {}
 
 static StyleRecalcChange diffPseudoStyles(const ComputedStyle& oldStyle,
                                           const ComputedStyle& newStyle) {
   // If the pseudoStyles have changed, ensure layoutObject triggers setStyle.
   if (!oldStyle.hasAnyPublicPseudoStyles() &&
       !newStyle.hasAnyPublicPseudoStyles())
     return NoChange;
   for (PseudoId pseudoId = FirstPublicPseudoId;
        pseudoId < FirstInternalPseudoId;
        pseudoId = static_cast<PseudoId>(pseudoId + 1)) {
@@ skipping 172 matching lines @@
 }
 
 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 they contain
+  // 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.
-
-  // These are not generated in ComputedStyleBase
-  setOriginalDisplay(other.originalDisplay());
-  setVerticalAlign(other.verticalAlign());
-  setHasViewportUnits(other.hasViewportUnits());
-  m_hasRemUnits = other.hasRemUnits();
+  setOriginalDisplay(
+      other.originalDisplay());  // Not generated in ComputedStyleBase.
+  setVerticalAlign(
+      other.verticalAlign());  // Not generated in ComputedStyleBase
+  m_nonInheritedData.m_hasViewportUnits =
+      other.m_nonInheritedData.m_hasViewportUnits;
+  m_nonInheritedData.m_hasRemUnits = other.m_nonInheritedData.m_hasRemUnits;
 
   // Correctly set during selector matching:
-  // m_styleType
-  // m_pseudoBits
+  // m_nonInheritedData.m_styleType
+  // m_nonInheritedData.m_pseudoBits
 
   // Set correctly while computing style for children:
-  // m_explicitInheritance
+  // m_nonInheritedData.m_explicitInheritance
 
   // unique() styles are not cacheable.
   DCHECK(!other.unique());
 
   // styles with non inherited properties that reference variables are not
   // cacheable.
   DCHECK(!other.hasVariableReferenceFromNonInheritedProperty());
 
   // The following flags are set during matching before we decide that we get a
   // match in the MatchedPropertiesCache which in turn calls this method. The
   // reason why we don't copy these flags is that they're already correctly set
   // and that they may differ between elements which have the same set of
   // matched properties. For instance, given the rule:
   //
   // :-webkit-any(:hover, :focus) { background-color: green }"
   //
   // A hovered element, and a focused element may use the same cached matched
   // properties here, but the affectedBy flags will be set differently based on
   // the matching order of the :-webkit-any components.
   //
-  // m_emptyState
-  // m_affectedByFocus
-  // m_affectedByHover
-  // m_affectedByActive
-  // m_affectedByDrag
-  // m_isLink
+  // m_nonInheritedData.m_emptyState
+  // m_nonInheritedData.m_affectedByFocus
+  // m_nonInheritedData.m_affectedByHover
+  // m_nonInheritedData.m_affectedByActive
+  // m_nonInheritedData.m_affectedByDrag
+  // m_nonInheritedData.m_isLink
 
   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 2098 matching lines @@
     if (value < 0)
       fvalue -= 0.5f;
     else
       fvalue += 0.5f;
   }
 
   return roundForImpreciseConversion<int>(fvalue / zoomFactor);
 }
 
 }  // namespace blink