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

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 bitfields_[4];
   } base_;
 
   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
 // 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>(),
       box_(o.box_),
       visual_(o.visual_),
       background_(o.background_),
       surround_(o.surround_),
       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) {
   // If the pseudoStyles have changed, ensure layoutObject triggers setStyle.
   if (!old_style.HasAnyPublicPseudoStyles() &&
       !new_style.HasAnyPublicPseudoStyles())
     return kNoChange;
   for (PseudoId pseudo_id = kFirstPublicPseudoId;
        pseudo_id < kFirstInternalPseudoId;
        pseudo_id = static_cast<PseudoId>(pseudo_id + 1)) {
@@ skipping 182 matching lines @@
   rare_non_inherited_data_ = other.rare_non_inherited_data_;
 
   // The flags are copied one-by-one because they contain
   // 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());
-  SetHasRemUnitsInternal(other.HasRemUnits());
+  m_nonInheritedData.m_hasRemUnits = other.HasRemUnits();
 
   // Correctly set during selector matching:
   // m_styleType
   // m_pseudoBits
 
   // Set correctly while computing style for children:
   // m_explicitInheritance
 
   // unique() styles are not cacheable.
   DCHECK(!other.Unique());
@@ skipping 2142 matching lines @@
     if (value < 0)
       fvalue -= 0.5f;
     else
       fvalue += 0.5f;
   }
 
   return RoundForImpreciseConversion<int>(fvalue / zoom_factor);
 }
 
 }  // namespace blink