Remove template parameter on 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 63 matching lines @@
   struct ComputedStyleBase {
     void* data_refs[6];
     unsigned bitfields_[4];
   } base_;
 
   void* data_refs[1];
   void* own_ptrs[1];
   void* data_ref_svg_style;
 };
 
-// If this fails, the packing algorithm in make_computed_style_base.py has
-// failed to produce the optimal packed size. To fix, update the algorithm to
-// ensure that the buckets are placed so that each takes up at most 1 word.
-ASSERT_SIZE(ComputedStyleBase<ComputedStyle>, SameSizeAsComputedStyleBase);
-
 // 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);
 
 RefPtr<ComputedStyle> ComputedStyle::Create() {
   return AdoptRef(new ComputedStyle(InitialStyle()));
 }
 
@@ skipping 430 matching lines @@
   // Animations don't need to be checked either. We always set the new style on
   // the layoutObject, so we will get a chance to fire off the resulting
   // transition properly.
 
   return diff;
 }
 
 bool ComputedStyle::ScrollAnchorDisablingPropertyChanged(
     const ComputedStyle& other,
     const StyleDifference& diff) const {
-  if (ComputedStyleBase::ScrollAnchorDisablingPropertyChanged(other))
+  if (ComputedStyleBase::ScrollAnchorDisablingPropertyChanged(*this, other))
     return true;
 
   if (diff.TransformChanged())
     return true;
 
   return false;
 }
 
 bool ComputedStyle::DiffNeedsFullLayoutAndPaintInvalidation(
     const ComputedStyle& other) const {
   // FIXME: Not all cases in this method need both full layout and paint
   // invalidation.
   // Should move cases into DiffNeedsFullLayout() if
   // - don't need paint invalidation at all;
   // - or the layoutObject knows how to exactly invalidate paints caused by the
   //   layout change instead of forced full paint invalidation.
 
-  if (ComputedStyleBase::DiffNeedsFullLayoutAndPaintInvalidation(other))
+  if (ComputedStyleBase::DiffNeedsFullLayoutAndPaintInvalidation(*this, other))
     return true;
 
   if (rare_non_inherited_data_.Get() != other.rare_non_inherited_data_.Get()) {
     if (rare_non_inherited_data_->appearance_ !=
             other.rare_non_inherited_data_->appearance_ ||
         rare_non_inherited_data_->margin_before_collapse_ !=
             other.rare_non_inherited_data_->margin_before_collapse_ ||
         rare_non_inherited_data_->margin_after_collapse_ !=
             other.rare_non_inherited_data_->margin_after_collapse_ ||
         rare_non_inherited_data_->line_clamp_ !=
@@ skipping 59 matching lines @@
       // selfNeedsSimplifiedLayout bit in order to not get confused and taint
       // every line).  In addition we need to solve the floating object issue
       // when layers come and go. Right now a full layout is necessary to keep
       // floating object lists sane.
       return true;
     }
   }
 
   if (IsDisplayTableType(Display())) {
     if (ComputedStyleBase::
-            DiffNeedsFullLayoutAndPaintInvalidationDisplayTableType(other))
+            DiffNeedsFullLayoutAndPaintInvalidationDisplayTableType(*this,
+                                                                    other))
       return true;
 
     // In the collapsing border model, 'hidden' suppresses other borders, while
     // 'none' does not, so these style differences can be width differences.
     if ((BorderCollapse() == EBorderCollapse::kCollapse) &&
         ((BorderTopStyle() == EBorderStyle::kHidden &&
           other.BorderTopStyle() == EBorderStyle::kNone) ||
          (BorderTopStyle() == EBorderStyle::kNone &&
           other.BorderTopStyle() == EBorderStyle::kHidden) ||
          (BorderBottomStyle() == EBorderStyle::kHidden &&
           other.BorderBottomStyle() == EBorderStyle::kNone) ||
          (BorderBottomStyle() == EBorderStyle::kNone &&
           other.BorderBottomStyle() == EBorderStyle::kHidden) ||
          (BorderLeftStyle() == EBorderStyle::kHidden &&
           other.BorderLeftStyle() == EBorderStyle::kNone) ||
          (BorderLeftStyle() == EBorderStyle::kNone &&
           other.BorderLeftStyle() == EBorderStyle::kHidden) ||
          (BorderRightStyle() == EBorderStyle::kHidden &&
           other.BorderRightStyle() == EBorderStyle::kNone) ||
          (BorderRightStyle() == EBorderStyle::kNone &&
           other.BorderRightStyle() == EBorderStyle::kHidden)))
       return true;
   } else if (Display() == EDisplay::kListItem) {
     if (ComputedStyleBase::
-            DiffNeedsFullLayoutAndPaintInvalidationDisplayListItem(other))
+            DiffNeedsFullLayoutAndPaintInvalidationDisplayListItem(*this,
+                                                                   other))
       return true;
   }
 
   if ((Visibility() == EVisibility::kCollapse) !=
       (other.Visibility() == EVisibility::kCollapse))
     return true;
 
   // Movement of non-static-positioned object is special cased in
   // ComputedStyle::VisualInvalidationDiff().
 
   return false;
 }
 
 bool ComputedStyle::DiffNeedsFullLayout(const ComputedStyle& other) const {
-  if (ComputedStyleBase::DiffNeedsFullLayout(other))
+  if (ComputedStyleBase::DiffNeedsFullLayout(*this, other))
     return true;
 
   if (box_data_.Get() != other.box_data_.Get()) {
     if (box_data_->vertical_align_length_ !=
         other.box_data_->vertical_align_length_)
       return true;
   }
 
   if (VerticalAlign() != other.VerticalAlign() ||
       GetPosition() != other.GetPosition())
@@ skipping 34 matching lines @@
         rare_non_inherited_data_->mask_box_image_ !=
             other.rare_non_inherited_data_->mask_box_image_)
       return true;
   }
 
   return false;
 }
 
 bool ComputedStyle::DiffNeedsPaintInvalidationObject(
     const ComputedStyle& other) const {
-  if (ComputedStyleBase::DiffNeedsPaintInvalidationObject(other))
+  if (ComputedStyleBase::DiffNeedsPaintInvalidationObject(*this, other))
     return true;
 
   if (!BorderVisuallyEqual(other) || !RadiiEqual(other) ||
       *background_data_ != *other.background_data_)
     return true;
 
   if (rare_non_inherited_data_.Get() != other.rare_non_inherited_data_.Get()) {
     if (rare_non_inherited_data_->user_drag_ !=
             other.rare_non_inherited_data_->user_drag_ ||
         rare_non_inherited_data_->object_fit_ !=
@@ skipping 63 matching lines @@
   }
 
   return false;
 }
 
 // This doesn't include conditions needing layout or overflow recomputation
 // which implies visual rect update.
 bool ComputedStyle::DiffNeedsVisualRectUpdate(
     const ComputedStyle& other) const {
   // Visual rect is empty if visibility is hidden.
-  if (ComputedStyleBase::DiffNeedsVisualRectUpdate(other))
+  if (ComputedStyleBase::DiffNeedsVisualRectUpdate(*this, other))
     return true;
 
   // Need to update visual rect of the resizer.
   if (Resize() != other.Resize())
     return true;
 
   return false;
 }
 
 void ComputedStyle::UpdatePropertySpecificDifferences(
@@ skipping 55 matching lines @@
         (rare_non_inherited_data_.Get() !=
              other.rare_non_inherited_data_.Get() &&
          (rare_non_inherited_data_->text_decoration_style_ !=
               other.rare_non_inherited_data_->text_decoration_style_ ||
           rare_non_inherited_data_->text_decoration_color_ !=
               other.rare_non_inherited_data_->text_decoration_color_ ||
           rare_non_inherited_data_->visited_link_text_decoration_color_ !=
               other.rare_non_inherited_data_
                   ->visited_link_text_decoration_color_)) ||
         ComputedStyleBase::
-            UpdatePropertySpecificDifferencesTextDecorationOrColor(other)) {
+            UpdatePropertySpecificDifferencesTextDecorationOrColor(*this,
+                                                                   other)) {
       diff.SetTextDecorationOrColorChanged();
     }
   }
 
   bool has_clip = HasOutOfFlowPosition() && !visual_data_->has_auto_clip_;
   bool other_has_clip =
       other.HasOutOfFlowPosition() && !other.visual_data_->has_auto_clip_;
   if (has_clip != other_has_clip ||
       (has_clip && visual_data_->clip_ != other.visual_data_->clip_))
     diff.SetCSSClipChanged();
@@ skipping 1450 matching lines @@
     if (value < 0)
       fvalue -= 0.5f;
     else
       fvalue += 0.5f;
   }
 
   return RoundForImpreciseConversion<int>(fvalue / zoom_factor);
 }
 
 }  // namespace blink