Rename enums/functions that collide in chromium style.

third_party/WebKit/Source/core/editing/VisibleSelection.h

 /*
  * Copyright (C) 2004 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 61 matching lines @@
     explicit VisibleSelectionTemplate(const VisiblePositionTemplate<Strategy>&, bool isDirectional = false);
     VisibleSelectionTemplate(const VisiblePositionTemplate<Strategy>&, const VisiblePositionTemplate<Strategy>&, bool isDirectional = false);
 
     explicit VisibleSelectionTemplate(const PositionWithAffinityTemplate<Strategy>&, bool isDirectional = false);
 
     VisibleSelectionTemplate(const VisibleSelectionTemplate&);
     VisibleSelectionTemplate& operator=(const VisibleSelectionTemplate&);
 
     static VisibleSelectionTemplate selectionFromContentsOfNode(Node*);
 
-    SelectionType selectionType() const { return m_selectionType; }
+    SelectionType getSelectionType() const { return m_selectionType; }
 
     void setAffinity(TextAffinity affinity) { m_affinity = affinity; }
     TextAffinity affinity() const { return m_affinity; }
 
     void setBase(const PositionTemplate<Strategy>&);
     void setBase(const VisiblePositionTemplate<Strategy>&);
     void setExtent(const PositionTemplate<Strategy>&);
     void setExtent(const VisiblePositionTemplate<Strategy>&);
 
     PositionTemplate<Strategy> base() const { return m_base; }
     PositionTemplate<Strategy> extent() const { return m_extent; }
     PositionTemplate<Strategy> start() const { return m_start; }
     PositionTemplate<Strategy> end() const { return m_end; }
 
     VisiblePositionTemplate<Strategy> visibleStart() const { return createVisiblePosition(m_start, isRange() ? TextAffinity::Downstream : affinity()); }
     VisiblePositionTemplate<Strategy> visibleEnd() const { return createVisiblePosition(m_end, isRange() ? TextAffinity::Upstream : affinity()); }
     VisiblePositionTemplate<Strategy> visibleBase() const { return createVisiblePosition(m_base, isRange() ? (isBaseFirst() ? TextAffinity::Upstream : TextAffinity::Downstream) : affinity()); }
     VisiblePositionTemplate<Strategy> visibleExtent() const { return createVisiblePosition(m_extent, isRange() ? (isBaseFirst() ? TextAffinity::Downstream : TextAffinity::Upstream) : affinity()); }
 
     bool operator==(const VisibleSelectionTemplate&) const;
     bool operator!=(const VisibleSelectionTemplate& other) const { return !operator==(other); }
 
-    bool isNone() const { return selectionType() == NoSelection; }
-    bool isCaret() const { return selectionType() == CaretSelection; }
-    bool isRange() const { return selectionType() == RangeSelection; }
-    bool isCaretOrRange() const { return selectionType() != NoSelection; }
+    bool isNone() const { return getSelectionType() == NoSelection; }
+    bool isCaret() const { return getSelectionType() == CaretSelection; }
+    bool isRange() const { return getSelectionType() == RangeSelection; }
+    bool isCaretOrRange() const { return getSelectionType() != NoSelection; }
     bool isNonOrphanedRange() const { return isRange() && !start().isOrphan() && !end().isOrphan(); }
     bool isNonOrphanedCaretOrRange() const { return isCaretOrRange() && !start().isOrphan() && !end().isOrphan(); }
 
     bool isBaseFirst() const { return m_baseIsFirst; }
     bool isDirectional() const { return m_isDirectional; }
     void setIsDirectional(bool isDirectional) { m_isDirectional = isDirectional; }
 
     void appendTrailingWhitespace();
 
     bool expandUsingGranularity(TextGranularity);
@@ skipping 108 matching lines @@
 
 #ifndef NDEBUG
 // Outside the WebCore namespace for ease of invocation from gdb.
 void showTree(const blink::VisibleSelection&);
 void showTree(const blink::VisibleSelection*);
 void showTree(const blink::VisibleSelectionInFlatTree&);
 void showTree(const blink::VisibleSelectionInFlatTree*);
 #endif
 
 #endif // VisibleSelection_h