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

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

Index: third_party/WebKit/Source/core/layout/line/InlineBox.h
diff --git a/third_party/WebKit/Source/core/layout/line/InlineBox.h b/third_party/WebKit/Source/core/layout/line/InlineBox.h
index 3743ecb06a9a19f6657e50ec1e1c4f8dc647173c..5790feeabf38ad63d79a2260db7dd2f811992f46 100644
--- a/third_party/WebKit/Source/core/layout/line/InlineBox.h
+++ b/third_party/WebKit/Source/core/layout/line/InlineBox.h
@@ -171,7 +171,7 @@ public:
     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
     {
@@ -256,7 +256,7 @@ public:
 
     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.
@@ -268,16 +268,16 @@ public:
 
     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);
     }