Rename StyleRareNonInheritedData members.

third_party/WebKit/Source/core/style/ComputedStyle.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 1016 matching lines @@
   void SetIsolation(EIsolation v) {
     rare_non_inherited_data_.Access()->isolation_ = v;
   }
 
   // -webkit-margin-before-collapse (aka -webkit-margin-top-collapse)
   static EMarginCollapse InitialMarginBeforeCollapse() {
     return kMarginCollapseCollapse;
   }
   EMarginCollapse MarginAfterCollapse() const {
     return static_cast<EMarginCollapse>(
-        rare_non_inherited_data_->margin_after_collapse);
+        rare_non_inherited_data_->margin_after_collapse_);
   }
   void SetMarginBeforeCollapse(EMarginCollapse c) {
-    SET_VAR(rare_non_inherited_data_, margin_before_collapse, c);
+    SET_VAR(rare_non_inherited_data_, margin_before_collapse_, c);
   }
 
   // -webkit-margin-after-collapse (aka -webkit-margin-bottom-collapse)
   static EMarginCollapse InitialMarginAfterCollapse() {
     return kMarginCollapseCollapse;
   }
   EMarginCollapse MarginBeforeCollapse() const {
     return static_cast<EMarginCollapse>(
-        rare_non_inherited_data_->margin_before_collapse);
+        rare_non_inherited_data_->margin_before_collapse_);
   }
   void SetMarginAfterCollapse(EMarginCollapse c) {
-    SET_VAR(rare_non_inherited_data_, margin_after_collapse, c);
+    SET_VAR(rare_non_inherited_data_, margin_after_collapse_, c);
   }
 
   // mix-blend-mode
   static WebBlendMode InitialBlendMode() { return kWebBlendModeNormal; }
   WebBlendMode BlendMode() const {
     return static_cast<WebBlendMode>(
         rare_non_inherited_data_->effective_blend_mode_);
   }
   void SetBlendMode(WebBlendMode v) {
     rare_non_inherited_data_.Access()->effective_blend_mode_ = v;
@@ skipping 67 matching lines @@
   const StyleOffsetRotation& OffsetRotate() const {
     return rare_non_inherited_data_->transform_->motion_.rotation_;
   }
   void SetOffsetRotate(const StyleOffsetRotation& offset_rotate) {
     SET_NESTED_VAR(rare_non_inherited_data_, transform_, motion_.rotation_,
                    offset_rotate);
   }
 
   // opacity (aka -webkit-opacity)
   static float InitialOpacity() { return 1.0f; }
-  float Opacity() const { return rare_non_inherited_data_->opacity; }
+  float Opacity() const { return rare_non_inherited_data_->opacity_; }
   void SetOpacity(float f) {
     float v = clampTo<float>(f, 0, 1);
-    SET_VAR(rare_non_inherited_data_, opacity, v);
+    SET_VAR(rare_non_inherited_data_, opacity_, v);
   }
 
   // order (aka -webkit-order)
   static int InitialOrder() { return 0; }
   int Order() const { return rare_non_inherited_data_->order_; }
   // We restrict the smallest value to int min + 2 because we use int min and
   // int min + 1 as special values in a hash set.
   void SetOrder(int o) {
     SET_VAR(rare_non_inherited_data_, order_,
             max(std::numeric_limits<int>::min() + 2, o));
@@ skipping 105 matching lines @@
   void SetTransformOrigin(const TransformOrigin& o) {
     SET_NESTED_VAR(rare_non_inherited_data_, transform_, origin_, o);
   }
 
   // transform-style (aka -webkit-transform-style)
   static ETransformStyle3D InitialTransformStyle3D() {
     return kTransformStyle3DFlat;
   }
   ETransformStyle3D TransformStyle3D() const {
     return static_cast<ETransformStyle3D>(
-        rare_non_inherited_data_->transform_style3d_);
+        rare_non_inherited_data_->transform_style_3d_);
   }
   void SetTransformStyle3D(ETransformStyle3D b) {
-    SET_VAR(rare_non_inherited_data_, transform_style3d_, b);
+    SET_VAR(rare_non_inherited_data_, transform_style_3d_, b);
   }
 
   // -webkit-transform-origin-x
   static Length InitialTransformOriginX() { return Length(50.0, kPercent); }
   const Length& TransformOriginX() const { return GetTransformOrigin().X(); }
   void SetTransformOriginX(const Length& v) {
     SetTransformOrigin(
         TransformOrigin(v, TransformOriginY(), TransformOriginZ()));
   }
 
@@ skipping 211 matching lines @@
         rare_inherited_data_->text_decoration_skip_);
   }
   void SetTextDecorationSkip(TextDecorationSkip v) {
     SET_VAR(rare_inherited_data_, text_decoration_skip_,
             static_cast<unsigned>(v));
   }
 
   // text-overflow
   static TextOverflow InitialTextOverflow() { return kTextOverflowClip; }
   TextOverflow GetTextOverflow() const {
-    return static_cast<TextOverflow>(rare_non_inherited_data_->text_overflow);
+    return static_cast<TextOverflow>(rare_non_inherited_data_->text_overflow_);
   }
   void SetTextOverflow(TextOverflow overflow) {
-    SET_VAR(rare_non_inherited_data_, text_overflow, overflow);
+    SET_VAR(rare_non_inherited_data_, text_overflow_, overflow);
   }
 
   // touch-action
   static TouchAction InitialTouchAction() {
     return TouchAction::kTouchActionAuto;
   }
   TouchAction GetTouchAction() const {
     return static_cast<TouchAction>(rare_non_inherited_data_->touch_action_);
   }
   void SetTouchAction(TouchAction t) {
@@ skipping 243 matching lines @@
         rare_inherited_data_->text_emphasis_position_);
   }
   void SetTextEmphasisPosition(TextEmphasisPosition position) {
     SET_VAR(rare_inherited_data_, text_emphasis_position_,
             static_cast<unsigned>(position));
   }
 
   // -webkit-line-clamp
   static LineClampValue InitialLineClamp() { return LineClampValue(); }
   const LineClampValue& LineClamp() const {
-    return rare_non_inherited_data_->line_clamp;
+    return rare_non_inherited_data_->line_clamp_;
   }
   void SetLineClamp(LineClampValue c) {
-    SET_VAR(rare_non_inherited_data_, line_clamp, c);
+    SET_VAR(rare_non_inherited_data_, line_clamp_, c);
   }
 
   // -webkit-ruby-position
   static RubyPosition InitialRubyPosition() { return RubyPosition::kBefore; }
   RubyPosition GetRubyPosition() const {
     return static_cast<RubyPosition>(rare_inherited_data_->ruby_position_);
   }
   void SetRubyPosition(RubyPosition position) {
     SET_VAR(rare_inherited_data_, ruby_position_,
             static_cast<unsigned>(position));
   }
 
   // -webkit-text-fill-color
   void SetTextFillColor(const StyleColor& color) {
     SET_VAR(rare_inherited_data_, text_fill_color_, color.Resolve(Color()));
     SET_VAR(rare_inherited_data_, text_fill_color_is_current_color_,
             color.IsCurrentColor());
   }
 
   // -webkit-text-stroke-color
   void SetTextStrokeColor(const StyleColor& color) {
     SET_VAR(rare_inherited_data_, text_stroke_color_, color.Resolve(Color()));
     SET_VAR(rare_inherited_data_, text_stroke_color_is_current_color_,
             color.IsCurrentColor());
   }
 
   // -webkit-user-drag
   static EUserDrag InitialUserDrag() { return DRAG_AUTO; }
   EUserDrag UserDrag() const {
-    return static_cast<EUserDrag>(rare_non_inherited_data_->user_drag);
+    return static_cast<EUserDrag>(rare_non_inherited_data_->user_drag_);
   }
   void SetUserDrag(EUserDrag d) {
-    SET_VAR(rare_non_inherited_data_, user_drag, d);
+    SET_VAR(rare_non_inherited_data_, user_drag_, d);
   }
 
   // -webkit-user-modify
   static EUserModify InitialUserModify() { return EUserModify::kReadOnly; }
   EUserModify UserModify() const {
     return static_cast<EUserModify>(rare_inherited_data_->user_modify_);
   }
   void SetUserModify(EUserModify u) {
     SET_VAR(rare_inherited_data_, user_modify_, static_cast<unsigned>(u));
   }
@@ skipping 1865 matching lines @@
       PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId)));
 }
 
 inline bool ComputedStyle::HasPseudoElementStyle() const {
   return PseudoBitsInternal() & kElementPseudoIdMask;
 }
 
 }  // namespace blink
 
 #endif  // ComputedStyle_h