Rename StyleRareNonInheritedData members.

third_party/WebKit/Source/core/style/StyleRareNonInheritedData.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 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
  * License as published by the Free Software Foundation; either
@@ skipping 68 matching lines @@
   PassRefPtr<StyleRareNonInheritedData> Copy() const {
     return AdoptRef(new StyleRareNonInheritedData(*this));
   }
   ~StyleRareNonInheritedData();
 
   bool operator==(const StyleRareNonInheritedData&) const;
   bool operator!=(const StyleRareNonInheritedData& o) const {
     return !(*this == o);
   }
 
-  float opacity;  // Whether or not we're transparent.
+  float opacity_;  // Whether or not we're transparent.
 
   float perspective_;
   float shape_image_threshold_;
 
   int order_;
 
   LengthPoint perspective_origin_;
   LengthPoint object_position_;
 
-  LineClampValue line_clamp;  // An Apple extension.
+  LineClampValue line_clamp_;           // An Apple extension.
   unsigned draggable_region_mode_ : 2;  // DraggableRegionMode
 
   DataRef<StyleDeprecatedFlexibleBoxData>
       deprecated_flexible_box_;  // Flexible box properties
   DataRef<StyleFlexibleBoxData> flexible_box_;
   DataRef<StyleMultiColData> multi_col_;  //  CSS3 multicol properties
   DataRef<StyleTransformData>
       transform_;  // Transform properties (rotate, scale, skew, etc.)
   DataRef<StyleWillChangeData> will_change_;  // CSS Will Change
 
@@ skipping 42 matching lines @@
   std::unique_ptr<StyleNonInheritedVariables> variables_;
 
   StyleContentAlignmentData align_content_;
   StyleSelfAlignmentData align_items_;
   StyleSelfAlignmentData align_self_;
   StyleContentAlignmentData justify_content_;
   StyleSelfAlignmentData justify_items_;
   StyleSelfAlignmentData justify_self_;
 
   unsigned page_size_type_ : 2;       // PageSizeType
-  unsigned transform_style3d_ : 1;    // ETransformStyle3D
+  unsigned transform_style_3d_ : 1;   // ETransformStyle3D
   unsigned backface_visibility_ : 1;  // EBackfaceVisibility
 
-  unsigned user_drag : 2;      // EUserDrag
-  unsigned text_overflow : 1;  // Whether or not lines that spill out should be
-                               // truncated with "..."
-  unsigned margin_before_collapse : 2;  // EMarginCollapse
-  unsigned margin_after_collapse : 2;   // EMarginCollapse
+  unsigned user_drag_ : 2;      // EUserDrag
+  unsigned text_overflow_ : 1;  // Whether or not lines that spill out should be
+                                // truncated with "..."
+  unsigned margin_before_collapse_ : 2;  // EMarginCollapse
+  unsigned margin_after_collapse_ : 2;   // EMarginCollapse
   unsigned appearance_ : 6;             // EAppearance
 
   unsigned text_decoration_style_ : 3;  // TextDecorationStyle
 
   unsigned has_current_opacity_animation_ : 1;
   unsigned has_current_transform_animation_ : 1;
   unsigned has_current_filter_animation_ : 1;
   unsigned has_current_backdrop_filter_animation_ : 1;
   unsigned running_opacity_animation_on_compositor_ : 1;
   unsigned running_transform_animation_on_compositor_ : 1;
@@ skipping 38 matching lines @@
   unsigned has_author_border_ : 1;  // Whether there is a author-defined border.
 
  private:
   StyleRareNonInheritedData();
   StyleRareNonInheritedData(const StyleRareNonInheritedData&);
 };
 
 }  // namespace blink
 
 #endif  // StyleRareNonInheritedData_h