Rename enums/functions that collide in chromium style in core/layout/.

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,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 153 matching lines @@
 
     InlineBox* nextLeafChild() const;
     InlineBox* prevLeafChild() const;
 
     // Helper functions for editing and hit-testing code.
     // FIXME: These two functions should be moved to RenderedPosition once the code to convert between
     // Position and inline box, offset pair is moved to RenderedPosition.
     InlineBox* nextLeafChildIgnoringLineBreak() const;
     InlineBox* prevLeafChildIgnoringLineBreak() const;
 
-    LineLayoutItem lineLayoutItem() const { return LineLayoutItem(&m_layoutObject); }
+    LineLayoutItem getLineLayoutItem() const { return LineLayoutItem(&m_layoutObject); }

[danakj, 2016/02/26 21:02:42]

Did you know that this method is shadowed by subclasses, but isn't virtual?
Kinda shady!

I wasn't sure get is the right prefix here since it's constructing a
LineLayoutItem, but it's wrapping a member so it kinda is an accessor, just a
diff view of it.

[pdr., 2016/02/26 21:08:20]

I'd like to defer to Elliott (or eae) on this one. There's a large line layout
refactor going on and I'm not sure what they would like to do.

[eae, 2016/02/26 23:28:41]

That's pretty shady, I seem to recall it being for performance reasons to
minimize the cost of going through the API. We should probably add an ASSERT to
ensure the right version is called though.
get feels wrong but lineLayoutItemForLayoutObject is a bit of mouthful and
create feels even more wrong given that it's a wrapper.

What would it collide with that triggers the rename?

[danakj, 2016/02/26 23:30:04]

The return type.

LineLayoutItem LineLayoutItem();  // ambiguous name

 
     InlineFlowBox* parent() const
     {
         ASSERT(!m_hasBadParent);
         return m_parent;
     }
     void setParent(InlineFlowBox* par) { m_parent = par; }
 
     const RootInlineBox& root() const;
     RootInlineBox& root();
@@ skipping 64 matching lines @@
     int caretLeftmostOffset() const { return isLeftToRightDirection() ? caretMinOffset() : caretMaxOffset(); }
     int caretRightmostOffset() const { return isLeftToRightDirection() ? caretMaxOffset() : caretMinOffset(); }
 
     virtual void clearTruncation() { }
 
     bool isDirty() const { return m_bitfields.dirty(); }
     virtual void markDirty() { m_bitfields.setDirty(true); }
 
     virtual void dirtyLineBoxes();
 
-    virtual SelectionState selectionState() const;
+    virtual SelectionState getSelectionState() const;
 
     virtual bool canAccommodateEllipsis(bool ltr, int blockEdge, int ellipsisWidth) const;
     // visibleLeftEdge, visibleRightEdge are in the parent's coordinate system.
     virtual LayoutUnit placeEllipsisBox(bool ltr, LayoutUnit visibleLeftEdge, LayoutUnit visibleRightEdge, LayoutUnit ellipsisWidth, LayoutUnit &truncatedWidth, bool&);
 
 #if ENABLE(ASSERT)
     void setHasBadParent();
 #endif
 
     int expansion() const { return m_bitfields.expansion(); }
 
-    bool visibleToHitTestRequest(const HitTestRequest& request) const { return lineLayoutItem().visibleToHitTestRequest(request); }
+    bool visibleToHitTestRequest(const HitTestRequest& request) const { return getLineLayoutItem().visibleToHitTestRequest(request); }
 
     // Anonymous inline: https://drafts.csswg.org/css2/visuren.html#anonymous
-    bool isAnonymousInline() const { return lineLayoutItem().isText() && lineLayoutItem().parent() && lineLayoutItem().parent().isBox(); }
-    EVerticalAlign verticalAlign() const { return isAnonymousInline() ? ComputedStyle::initialVerticalAlign() : lineLayoutItem().style(m_bitfields.firstLine())->verticalAlign(); }
+    bool isAnonymousInline() const { return getLineLayoutItem().isText() && getLineLayoutItem().parent() && getLineLayoutItem().parent().isBox(); }
+    EVerticalAlign verticalAlign() const { return isAnonymousInline() ? ComputedStyle::initialVerticalAlign() : getLineLayoutItem().style(m_bitfields.firstLine())->verticalAlign(); }
 
     // Use with caution! The type is not checked!
     LineLayoutBoxModel boxModelObject() const
     {
-        if (!lineLayoutItem().isText())
+        if (!getLineLayoutItem().isText())
             return LineLayoutBoxModel(toLayoutBoxModelObject(&m_layoutObject));
         return LineLayoutBoxModel(nullptr);
     }
 
     LayoutPoint locationIncludingFlipping() const;
 
     // Converts from a rect in the logical space of the InlineBox to one in the physical space
     // of the containing block. The logical space of an InlineBox may be transposed for vertical text and
     // flipped for right-to-left text.
     void logicalRectToPhysicalRect(LayoutRect&) const;
@@ skipping 163 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