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

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

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 182 matching lines @@
 
   // inherited attributes
   DataRef<StyleRareInheritedData> m_rareInheritedData;
   DataRef<StyleInheritedData> m_styleInheritedData;
 
   // list of associated pseudo styles
   std::unique_ptr<PseudoStyleCache> m_cachedPseudoStyles;
 
   DataRef<SVGComputedStyle> m_svgStyle;
 
+  // !START SYNC!: Keep this in sync with the copy constructor in
+  // ComputedStyle.cpp.
+
+  // don't inherit
+  struct NonInheritedData {
+    NonInheritedData() : m_hasViewportUnits(false), m_hasRemUnits(false) {}
+
+    // Compare computed styles, differences in inherited bits or other flags
+    // should not cause an inequality.
+    bool operator==(const NonInheritedData& other) const {
+      // Generated properties are compared in ComputedStyleBase
+      return true;
+      // Differences in the following fields do not cause inequality:
+      // hasViewportUnits
+      // styleType
+      // pseudoBits
+      // explicitInheritance
+      // unique
+      // emptyState
+      // affectedByFocus
+      // affectedByHover
+      // affectedByActive
+      // affectedByDrag
+      // isLink
+      // isInherited flags
+    }
+
+    bool operator!=(const NonInheritedData& other) const {
+      return !(*this == other);
+    }
+
+    // These are set if we used viewport or rem units when resolving a length.
+    unsigned m_hasViewportUnits : 1;
+    unsigned m_hasRemUnits : 1;
+
+    // If you add more style bits here, you will also need to update
+    // ComputedStyle::copyNonInheritedFromCached() 68 bits
+  } m_nonInheritedData;
+
+  // !END SYNC!
+
  private:
   // TODO(sashab): Move these private members to the bottom of ComputedStyle.
   ALWAYS_INLINE ComputedStyle();
   ALWAYS_INLINE ComputedStyle(const ComputedStyle&);
 
   static PassRefPtr<ComputedStyle> createInitialStyle();
   // TODO(shend): Remove this. Initial style should not be mutable.
   static inline ComputedStyle& mutableInitialStyle() {
     LEAK_SANITIZER_DISABLED_SCOPE;
     DEFINE_STATIC_REF(ComputedStyle, s_initialStyle,
@@ skipping 2082 matching lines @@
   }
   CSSTransitionData& accessTransitions();
 
   // Callback selectors.
   const Vector<String>& callbackSelectors() const {
     return m_rareNonInheritedData->m_callbackSelectors;
   }
   void addCallbackSelector(const String& selector);
 
   // Non-property flags.
+  bool hasViewportUnits() const {
+    return m_nonInheritedData.m_hasViewportUnits;
+  }
+  // TODO(shend): This function should take no arguments.
+  void setHasViewportUnits(bool hasViewportUnits) {
+    m_nonInheritedData.m_hasViewportUnits = hasViewportUnits;
+  }
+
+  bool hasRemUnits() const { return m_nonInheritedData.m_hasRemUnits; }
+  void setHasRemUnits() { m_nonInheritedData.m_hasRemUnits = true; }
+
   bool emptyState() const { return m_emptyState; }
   void setEmptyState(bool b) {
     setUnique();
     m_emptyState = b;
   }
 
   bool hasInlineTransform() const {
     return m_rareNonInheritedData->m_hasInlineTransform;
   }
   void setHasInlineTransform(bool b) {
@@ skipping 1374 matching lines @@
   m_pseudoBits |= 1 << (pseudo - FirstPublicPseudoId);
 }
 
 inline bool ComputedStyle::hasPseudoElementStyle() const {
   return m_pseudoBits & ElementPseudoIdMask;
 }
 
 }  // namespace blink
 
 #endif  // ComputedStyle_h