Rename enums/functions that collide in chromium style.

third_party/WebKit/Source/core/editing/FrameSelection.cpp

Index: third_party/WebKit/Source/core/editing/FrameSelection.cpp
diff --git a/third_party/WebKit/Source/core/editing/FrameSelection.cpp b/third_party/WebKit/Source/core/editing/FrameSelection.cpp
index fd90957a58fd8df90dcd66039ffb75dd0e540789..ad6c4552944e9130eb5c243f86175069f535f339 100644
--- a/third_party/WebKit/Source/core/editing/FrameSelection.cpp
+++ b/third_party/WebKit/Source/core/editing/FrameSelection.cpp
@@ -709,7 +709,7 @@ void FrameSelection::invalidateCaretRect()
     if (!m_caretBlinkTimer.isActive()
         && newNode == m_previousCaretNode
         && newRect == m_previousCaretRect
-        && caretVisibility() == m_previousCaretVisibility)
+        && getCaretVisibility() == m_previousCaretVisibility)
         return;
 
     LayoutView* view = m_frame->document()->layoutView();
@@ -719,7 +719,7 @@ void FrameSelection::invalidateCaretRect()
         invalidateLocalCaretRect(newNode, newRect);
     m_previousCaretNode = newNode;
     m_previousCaretRect = newRect;
-    m_previousCaretVisibility = caretVisibility();
+    m_previousCaretVisibility = getCaretVisibility();
 }
 
 void FrameSelection::paintCaret(GraphicsContext& context, const LayoutPoint& paintOffset)
@@ -1016,7 +1016,7 @@ void FrameSelection::updateAppearance()
 
 void FrameSelection::setCaretVisibility(CaretVisibility visibility)
 {
-    if (caretVisibility() == visibility)
+    if (getCaretVisibility() == visibility)
         return;
 
     CaretBase::setCaretVisibility(visibility);
@@ -1211,7 +1211,7 @@ void FrameSelection::revealSelection(const ScrollAlignment& alignment, RevealExt
 {
     LayoutRect rect;
 
-    switch (selectionType()) {
+    switch (getSelectionType()) {
     case NoSelection:
         return;
     case CaretSelection: