Rename StyleRareNonInheritedData members.

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 542 matching lines @@
   // - 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))
     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 !=
-            other.rare_non_inherited_data_->line_clamp ||
-        rare_non_inherited_data_->text_overflow !=
-            other.rare_non_inherited_data_->text_overflow ||
+        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_ !=
+            other.rare_non_inherited_data_->line_clamp_ ||
+        rare_non_inherited_data_->text_overflow_ !=
+            other.rare_non_inherited_data_->text_overflow_ ||
         rare_non_inherited_data_->shape_margin_ !=
             other.rare_non_inherited_data_->shape_margin_ ||
         rare_non_inherited_data_->order_ !=
             other.rare_non_inherited_data_->order_ ||
         HasFilters() != other.HasFilters())
       return true;
 
     if (rare_non_inherited_data_->grid_.Get() !=
             other.rare_non_inherited_data_->grid_.Get() &&
         *rare_non_inherited_data_->grid_.Get() !=
@@ skipping 147 matching lines @@
 bool ComputedStyle::DiffNeedsPaintInvalidationObject(
     const ComputedStyle& other) const {
   if (ComputedStyleBase::DiffNeedsPaintInvalidationObject(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 ||
+    if (rare_non_inherited_data_->user_drag_ !=
+            other.rare_non_inherited_data_->user_drag_ ||
         rare_non_inherited_data_->object_fit_ !=
             other.rare_non_inherited_data_->object_fit_ ||
         rare_non_inherited_data_->object_position_ !=
             other.rare_non_inherited_data_->object_position_ ||
         !BoxShadowDataEquivalent(other) || !ShapeOutsideDataEquivalent(other) ||
         !ClipPathDataEquivalent(other) ||
         !rare_non_inherited_data_->outline_.VisuallyEqual(
             other.rare_non_inherited_data_->outline_) ||
         (VisitedLinkBorderLeftColor() != other.VisitedLinkBorderLeftColor() &&
          BorderLeftWidth()) ||
@@ skipping 85 matching lines @@
     if (HasTransform() != other.HasTransform() ||
         !TransformDataEquivalent(other) ||
         rare_non_inherited_data_->perspective_ !=
             other.rare_non_inherited_data_->perspective_ ||
         rare_non_inherited_data_->perspective_origin_ !=
             other.rare_non_inherited_data_->perspective_origin_)
       diff.SetTransformChanged();
   }
 
   if (rare_non_inherited_data_.Get() != other.rare_non_inherited_data_.Get()) {
-    if (rare_non_inherited_data_->opacity !=
-        other.rare_non_inherited_data_->opacity)
+    if (rare_non_inherited_data_->opacity_ !=
+        other.rare_non_inherited_data_->opacity_)
       diff.SetOpacityChanged();
   }
 
   if (rare_non_inherited_data_.Get() != other.rare_non_inherited_data_.Get()) {
     if ((rare_non_inherited_data_->filter_ !=
          other.rare_non_inherited_data_->filter_) ||
         !ReflectionDataEquivalent(other))
       diff.SetFilterChanged();
   }
 
@@ skipping 1477 matching lines @@
     if (value < 0)
       fvalue -= 0.5f;
     else
       fvalue += 0.5f;
   }
 
   return RoundForImpreciseConversion<int>(fvalue / zoom_factor);
 }
 
 }  // namespace blink