Generate StyleRareNonInheritedData in ComputedStyleBase.

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 54 matching lines @@
   RGBA32 color_;
   unsigned bitfield_;
 };
 
 ASSERT_SIZE(BorderValue, SameSizeAsBorderValue);
 
 // Since different compilers/architectures pack ComputedStyle differently,
 // re-create the same structure for an accurate size comparison.
 struct SameSizeAsComputedStyle : public RefCounted<SameSizeAsComputedStyle> {
   struct ComputedStyleBase {
-    void* data_refs[6];
+    void* data_refs[7];
     unsigned bitfields_[4];
   } base_;
 
-  void* data_refs[1];
   void* own_ptrs[1];
   void* data_ref_svg_style;
 };
 
 // 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);
 
@@ skipping 25 matching lines @@
   new_style->SetDisplay(display);
   return new_style;
 }
 
 RefPtr<ComputedStyle> ComputedStyle::Clone(const ComputedStyle& other) {
   return AdoptRef(new ComputedStyle(other));
 }
 
 ALWAYS_INLINE ComputedStyle::ComputedStyle()
     : ComputedStyleBase(), RefCounted<ComputedStyle>() {
-  rare_non_inherited_data_.Init();
+  // TODO(shend): Generate these.
   rare_non_inherited_data_.Access()->deprecated_flexible_box_data_.Init();
   rare_non_inherited_data_.Access()->flexible_box_data_.Init();
   rare_non_inherited_data_.Access()->multi_col_data_.Init();
   rare_non_inherited_data_.Access()->transform_data_.Init();
   rare_non_inherited_data_.Access()->will_change_data_.Init();
   rare_non_inherited_data_.Access()->grid_data_.Init();
   rare_non_inherited_data_.Access()->grid_item_data_.Init();
   rare_non_inherited_data_.Access()->scroll_snap_data_.Init();
   svg_style_.Init();
 }
 
 ALWAYS_INLINE ComputedStyle::ComputedStyle(const ComputedStyle& o)
     : ComputedStyleBase(o),
       RefCounted<ComputedStyle>(),
-      rare_non_inherited_data_(o.rare_non_inherited_data_),
       svg_style_(o.svg_style_) {}
 
 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;
@@ skipping 159 matching lines @@
     // Even if surrounding content is user-editable, shadow DOM should act as a
     // single unit, and not necessarily be editable
     SetUserModify(current_user_modify);
   }
 }
 
 void ComputedStyle::CopyNonInheritedFromCached(const ComputedStyle& other) {
   DCHECK(MatchedPropertiesCache::IsStyleCacheable(other));
 
   ComputedStyleBase::CopyNonInheritedFromCached(other);
-  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.
 
   // Correctly set during selector matching:
   // m_styleType
   // m_pseudoBits
 
   // Set correctly while computing style for children:
@@ skipping 104 matching lines @@
          svg_style_->InheritedEqual(*other.svg_style_);
 }
 
 bool ComputedStyle::LoadingCustomFontsEqual(const ComputedStyle& other) const {
   return GetFont().LoadingCustomFonts() == other.GetFont().LoadingCustomFonts();
 }
 
 bool ComputedStyle::NonInheritedEqual(const ComputedStyle& other) const {
   // compare everything except the pseudoStyle pointer
   return ComputedStyleBase::NonInheritedEqual(other) &&
-         rare_non_inherited_data_ == other.rare_non_inherited_data_ &&
          svg_style_->NonInheritedEqual(*other.svg_style_);
 }
 
 bool ComputedStyle::InheritedDataShared(const ComputedStyle& other) const {
   // This is a fast check that only looks if the data structures are shared.
   return ComputedStyleBase::InheritedDataShared(other) &&
          svg_style_.Get() == other.svg_style_.Get();
 }
 
 static bool DependenceOnContentHeightHasChanged(const ComputedStyle& a,
@@ skipping 1923 matching lines @@
     if (value < 0)
       fvalue -= 0.5f;
     else
       fvalue += 0.5f;
   }
 
   return RoundForImpreciseConversion<int>(fvalue / zoom_factor);
 }
 
 }  // namespace blink