Rename RareInheritedData::variables and RareNonInheritedData::variables.

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

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. 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.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 75 matching lines @@
       page_size_(),
       shape_margin_(ComputedStyle::InitialShapeMargin()),
       text_decoration_color_(StyleColor::CurrentColor()),
       visited_link_text_decoration_color_(StyleColor::CurrentColor()),
       visited_link_background_color_(ComputedStyle::InitialBackgroundColor()),
       visited_link_outline_color_(StyleColor::CurrentColor()),
       visited_link_border_left_color_(StyleColor::CurrentColor()),
       visited_link_border_right_color_(StyleColor::CurrentColor()),
       visited_link_border_top_color_(StyleColor::CurrentColor()),
       visited_link_border_bottom_color_(StyleColor::CurrentColor()),
-      variables_(ComputedStyle::InitialNonInheritedVariables()),
+      non_inherited_variables_(ComputedStyle::InitialNonInheritedVariables()),
       align_content_(ComputedStyle::InitialContentAlignment()),
       align_items_(ComputedStyle::InitialDefaultAlignment()),
       align_self_(ComputedStyle::InitialSelfAlignment()),
       justify_content_(ComputedStyle::InitialContentAlignment()),
       justify_items_(ComputedStyle::InitialSelfAlignment()),
       justify_self_(ComputedStyle::InitialSelfAlignment()),
       page_size_type_(static_cast<unsigned>(PageSizeType::kAuto)),
       transform_style_3d_(ComputedStyle::InitialTransformStyle3D()),
       backface_visibility_(ComputedStyle::InitialBackfaceVisibility()),
       user_drag_(ComputedStyle::InitialUserDrag()),
@@ skipping 65 matching lines @@
           o.visited_link_text_decoration_color_),
       visited_link_background_color_(o.visited_link_background_color_),
       visited_link_outline_color_(o.visited_link_outline_color_),
       visited_link_border_left_color_(o.visited_link_border_left_color_),
       visited_link_border_right_color_(o.visited_link_border_right_color_),
       visited_link_border_top_color_(o.visited_link_border_top_color_),
       visited_link_border_bottom_color_(o.visited_link_border_bottom_color_),
       callback_selectors_(o.callback_selectors_),
       paint_images_(o.paint_images_ ? new PaintImages(*o.paint_images_)
                                     : nullptr),
-      variables_(o.variables_ ? o.variables_->Clone() : nullptr),
+      non_inherited_variables_(o.non_inherited_variables_
+                                   ? o.non_inherited_variables_->Clone()
+                                   : nullptr),
       align_content_(o.align_content_),
       align_items_(o.align_items_),
       align_self_(o.align_self_),
       justify_content_(o.justify_content_),
       justify_items_(o.justify_items_),
       justify_self_(o.justify_self_),
       page_size_type_(o.page_size_type_),
       transform_style_3d_(o.transform_style_3d_),
       backface_visibility_(o.backface_visibility_),
       user_drag_(o.user_drag_),
@@ skipping 62 matching lines @@
              o.visited_link_text_decoration_color_ &&
          visited_link_background_color_ == o.visited_link_background_color_ &&
          visited_link_outline_color_ == o.visited_link_outline_color_ &&
          visited_link_border_left_color_ == o.visited_link_border_left_color_ &&
          visited_link_border_right_color_ ==
              o.visited_link_border_right_color_ &&
          visited_link_border_top_color_ == o.visited_link_border_top_color_ &&
          visited_link_border_bottom_color_ ==
              o.visited_link_border_bottom_color_ &&
          callback_selectors_ == o.callback_selectors_ &&
-         DataEquivalent(variables_, o.variables_) &&
+         DataEquivalent(non_inherited_variables_, o.non_inherited_variables_) &&
          align_content_ == o.align_content_ && align_items_ == o.align_items_ &&
          align_self_ == o.align_self_ &&
          justify_content_ == o.justify_content_ &&
          justify_items_ == o.justify_items_ &&
          justify_self_ == o.justify_self_ &&
          page_size_type_ == o.page_size_type_ &&
          transform_style_3d_ == o.transform_style_3d_ &&
          backface_visibility_ == o.backface_visibility_ &&
          user_drag_ == o.user_drag_ && text_overflow_ == o.text_overflow_ &&
          margin_before_collapse_ == o.margin_before_collapse_ &&
@@ skipping 15 matching lines @@
          requires_accelerated_compositing_for_external_reasons_ ==
              o.requires_accelerated_compositing_for_external_reasons_ &&
          has_inline_transform_ == o.has_inline_transform_ &&
          resize_ == o.resize_ &&
          has_compositor_proxy_ == o.has_compositor_proxy_ &&
          has_author_background_ == o.has_author_background_ &&
          has_author_border_ == o.has_author_border_;
 }
 
 }  // namespace blink