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

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

Index: third_party/WebKit/Source/core/style/ComputedStyle.cpp
diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.cpp b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
index 109f612f5bc12845416066515750cfcf795dd3bd..d0e663dd63c5531058738c27d866826c7561a9cc 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
@@ -78,6 +78,10 @@ struct SameSizeAsComputedStyle : public RefCounted<SameSizeAsComputedStyle> {
   void* data_refs[7];
   void* own_ptrs[1];
   void* data_ref_svg_style;
+
+  struct NonInheritedData {
+    unsigned m_bitfields[1];
+  } m_nonInheritedData;
 };
 
 // If this assert fails, it means that size of ComputedStyle has changed. Please
@@ -144,7 +148,8 @@ ALWAYS_INLINE ComputedStyle::ComputedStyle(const ComputedStyle& o)
       rare_non_inherited_data_(o.rare_non_inherited_data_),
       rare_inherited_data_(o.rare_inherited_data_),
       style_inherited_data_(o.style_inherited_data_),
-      svg_style_(o.svg_style_) {}
+      svg_style_(o.svg_style_),
+      m_nonInheritedData(o.m_nonInheritedData) {}
 
 static StyleRecalcChange DiffPseudoStyles(const ComputedStyle& old_style,
                                           const ComputedStyle& new_style) {
@@ -347,7 +352,7 @@ void ComputedStyle::CopyNonInheritedFromCached(const ComputedStyle& other) {
   SetOriginalDisplay(other.OriginalDisplay());
   SetVerticalAlign(other.VerticalAlign());
   SetHasViewportUnits(other.HasViewportUnits());
-  SetHasRemUnitsInternal(other.HasRemUnits());
+  m_nonInheritedData.m_hasRemUnits = other.HasRemUnits();
 
   // Correctly set during selector matching:
   // m_styleType