Blink rename follow-up: Rename remaining |m_...| field names in LayoutObject.

third_party/WebKit/Source/core/layout/line/InlineBox.h

 /*
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011 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 389 matching lines @@
 
   bool DirOverride() const { return bitfields_.DirOverride(); }
   void SetDirOverride(bool dir_override) {
     bitfields_.SetDirOverride(dir_override);
   }
 
   // Set all LineLayoutItems in the inline box subtree should do full paint
   // invalidation.
   void SetShouldDoFullPaintInvalidationRecursively();
 
-#define ADD_BOOLEAN_BITFIELD(name, Name) \
- private:                                \
-  unsigned m_##name : 1;                 \
-                                         \
- public:                                 \
-  bool name() const { return m_##name; } \
-  void Set##Name(bool name) { m_##name = name; }
+#define ADD_BOOLEAN_BITFIELD(field_name_, MethodNameBase) \
+ private:                                                 \
+  unsigned field_name_ : 1;                               \
+                                                          \
+ public:                                                  \
+  bool MethodNameBase() const { return field_name_; }     \
+  void Set##MethodNameBase(bool new_value) { field_name_ = new_value; }
 
   class InlineBoxBitfields {
     DISALLOW_NEW();
 
    public:
     InlineBoxBitfields(bool first_line = false,
                        bool constructed = false,
                        bool dirty = false,
                        bool extracted = false,
                        bool is_horizontal = true)
-        : m_FirstLine(first_line),
-          m_Constructed(constructed),
+        : first_line_(first_line),
+          constructed_(constructed),
           bidi_embedding_level_(0),
-          m_Dirty(dirty),
-          m_Extracted(extracted),
-          m_HasVirtualLogicalHeight(false),
-          m_IsHorizontal(is_horizontal),
-          m_EndsWithBreak(false),
-          m_HasSelectedChildrenOrCanHaveLeadingExpansion(false),
-          m_KnownToHaveNoOverflow(true),
-          m_HasEllipsisBoxOrHyphen(false),
-          m_DirOverride(false),
-          m_IsText(false),
+          dirty_(dirty),
+          extracted_(extracted),
+          has_virtual_logical_height_(false),
+          is_horizontal_(is_horizontal),
+          ends_with_break_(false),
+          has_selected_children_or_can_have_leading_expansion_(false),
+          known_to_have_no_overflow_(true),
+          has_ellipsis_box_or_hyphen_(false),
+          dir_override_(false),
+          is_text_(false),
           expansion_(0) {}
 
     // Some of these bits are actually for subclasses and moved here to compact
     // the structures.
     // for this class
-    ADD_BOOLEAN_BITFIELD(FirstLine, FirstLine);
-    ADD_BOOLEAN_BITFIELD(Constructed, Constructed);
+    ADD_BOOLEAN_BITFIELD(first_line_, FirstLine);
+    ADD_BOOLEAN_BITFIELD(constructed_, Constructed);
 
    private:
     // The maximium bidi level is 62:
     // http://unicode.org/reports/tr9/#Explicit_Levels_and_Directions
     unsigned bidi_embedding_level_ : 6;
 
    public:
     unsigned char BidiEmbeddingLevel() const { return bidi_embedding_level_; }
     void SetBidiEmbeddingLevel(unsigned char bidi_embedding_level) {
       bidi_embedding_level_ = bidi_embedding_level;
     }
 
-    ADD_BOOLEAN_BITFIELD(Dirty, Dirty);
-    ADD_BOOLEAN_BITFIELD(Extracted, Extracted);
-    ADD_BOOLEAN_BITFIELD(HasVirtualLogicalHeight, HasVirtualLogicalHeight);
-    ADD_BOOLEAN_BITFIELD(IsHorizontal, IsHorizontal);
+    ADD_BOOLEAN_BITFIELD(dirty_, Dirty);
+    ADD_BOOLEAN_BITFIELD(extracted_, Extracted);
+    ADD_BOOLEAN_BITFIELD(has_virtual_logical_height_, HasVirtualLogicalHeight);
+    ADD_BOOLEAN_BITFIELD(is_horizontal_, IsHorizontal);
     // for RootInlineBox
-    ADD_BOOLEAN_BITFIELD(EndsWithBreak,
+    ADD_BOOLEAN_BITFIELD(ends_with_break_,
                          EndsWithBreak);  // Whether the line ends with a <br>.
     // shared between RootInlineBox and InlineTextBox
-    ADD_BOOLEAN_BITFIELD(HasSelectedChildrenOrCanHaveLeadingExpansion,
+    ADD_BOOLEAN_BITFIELD(has_selected_children_or_can_have_leading_expansion_,
                          HasSelectedChildrenOrCanHaveLeadingExpansion);
 
     // This boolean will never be set if there is potential for overflow, but it
     // will be eagerly cleared in the opposite case. As such, it's a
     // conservative tracking of the absence of overflow.
     //
-    // For whether we have overflow, callers should use m_overflow on
+    // For whether we have overflow, callers should use |overflow_| on
     // InlineFlowBox.
-    ADD_BOOLEAN_BITFIELD(KnownToHaveNoOverflow, KnownToHaveNoOverflow);
-    ADD_BOOLEAN_BITFIELD(HasEllipsisBoxOrHyphen, HasEllipsisBoxOrHyphen);
+    ADD_BOOLEAN_BITFIELD(known_to_have_no_overflow_, KnownToHaveNoOverflow);
+    ADD_BOOLEAN_BITFIELD(has_ellipsis_box_or_hyphen_, HasEllipsisBoxOrHyphen);
     // for InlineTextBox
-    ADD_BOOLEAN_BITFIELD(DirOverride, DirOverride);
+    ADD_BOOLEAN_BITFIELD(dir_override_, DirOverride);
     // Whether or not this object represents text with a non-zero height.
     // Includes non-image list markers, text boxes.
-    ADD_BOOLEAN_BITFIELD(IsText, IsText);
+    ADD_BOOLEAN_BITFIELD(is_text_, IsText);
 
    private:
     unsigned expansion_ : 12;  // for justified text
 
    public:
     signed Expansion() const { return expansion_; }
     void SetExpansion(signed expansion) { expansion_ = expansion; }
   };
 #undef ADD_BOOLEAN_BITFIELD
 
@@ skipping 73 matching lines @@
 
 }  // namespace blink
 
 #ifndef NDEBUG
 // Outside the WebCore namespace for ease of invocation from gdb.
 void showTree(const blink::InlineBox*);
 void showLineTree(const blink::InlineBox*);
 #endif
 
 #endif  // InlineBox_h