DO NOT LAND. Revert of https://codereview.chromium.org/2797963002

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> rare_inherited_data_;
   DataRef<StyleInheritedData> style_inherited_data_;
 
   // list of associated pseudo styles
   std::unique_ptr<PseudoStyleCache> cached_pseudo_styles_;
 
   DataRef<SVGComputedStyle> svg_style_;
 
+  // !START SYNC!: Keep this in sync with the copy constructor in
+  // ComputedStyle.cpp.
+
+  // don't inherit
+  struct NonInheritedData {
+    NonInheritedData() : m_hasRemUnits(false), m_hasViewportUnits(false) {}
+
+    // These are set if we used viewport or rem units when resolving a length.
+    unsigned m_hasRemUnits : 1;
+    unsigned m_hasViewportUnits : 1;
+  } 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, initial_style,
@@ skipping 2085 matching lines @@
   }
   CSSTransitionData& AccessTransitions();
 
   // Callback selectors.
   const Vector<String>& CallbackSelectors() const {
     return rare_non_inherited_data_->callback_selectors_;
   }
   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 = static_cast<unsigned>(true);
+  }
+
   bool EmptyState() const { return EmptyStateInternal(); }
   void SetEmptyState(bool b) {
     SetUnique();
     SetEmptyStateInternal(b);
   }
 
   bool HasInlineTransform() const {
     return rare_non_inherited_data_->has_inline_transform_;
   }
   void SetHasInlineTransform(bool b) {
@@ skipping 1423 matching lines @@
       PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId)));
 }
 
 inline bool ComputedStyle::HasPseudoElementStyle() const {
   return PseudoBitsInternal() & kElementPseudoIdMask;
 }
 
 }  // namespace blink
 
 #endif  // ComputedStyle_h