Rename enums/functions that collide in chromium style.

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

 /*
  * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  * 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
@@ skipping 538 matching lines @@
 bool Editor::shouldDeleteRange(const EphemeralRange& range) const
 {
     if (range.isCollapsed())
         return false;
 
     return canDeleteRange(range);
 }
 
 void Editor::notifyComponentsOnChangedSelection(const VisibleSelection& oldSelection, FrameSelection::SetSelectionOptions options)
 {
-    client().respondToChangedSelection(m_frame, frame().selection().selectionType());
+    client().respondToChangedSelection(m_frame, frame().selection().getSelectionType());
     setStartNewKillRingSequence(true);
 }
 
 void Editor::respondToChangedContents(const VisibleSelection& endingSelection)
 {
     if (frame().settings() && frame().settings()->accessibilityEnabled()) {
         Node* node = endingSelection.start().anchorNode();
         if (AXObjectCache* cache = frame().document()->existingAXObjectCache())
             cache->handleEditableTextContentChanged(node);
     }
@@ skipping 22 matching lines @@
     return target;
 }
 
 Element* Editor::findEventTargetFromSelection() const
 {
     return findEventTargetFrom(frame().selection().selection());
 }
 
 void Editor::applyStyle(StylePropertySet* style, EditAction editingAction)
 {
-    switch (frame().selection().selectionType()) {
+    switch (frame().selection().getSelectionType()) {
     case NoSelection:
         // do nothing
         break;
     case CaretSelection:
         computeAndSetTypingStyle(style, editingAction);
         break;
     case RangeSelection:
         if (style) {
             ASSERT(frame().document());
             ApplyStyleCommand::create(*frame().document(), EditingStyle::create(style).get(), editingAction)->apply();
@@ skipping 499 matching lines @@
     frame().selection().setSelection(newSelection, options);
 
     // Some editing operations change the selection visually without affecting its position within the DOM.
     // For example when you press return in the following (the caret is marked by ^):
     // <div contentEditable="true"><div>^Hello</div></div>
     // WebCore inserts <div><br></div> *before* the current block, which correctly moves the paragraph down but which doesn't
     // change the caret's DOM position (["hello", 0]). In these situations the above FrameSelection::setSelection call
     // does not call EditorClient::respondToChangedSelection(), which, on the Mac, sends selection change notifications and
     // starts a new kill ring sequence, but we want to do these things (matches AppKit).
     if (selectionDidNotChangeDOMPosition)
-        client().respondToChangedSelection(m_frame, frame().selection().selectionType());
+        client().respondToChangedSelection(m_frame, frame().selection().getSelectionType());
 }
 
 IntRect Editor::firstRectForRange(const EphemeralRange& range) const
 {
     LayoutUnit extraWidthToEndOfLine;
     ASSERT(range.isNotNull());
 
     IntRect startCaretRect = RenderedPosition(createVisiblePosition(range.startPosition()).deepEquivalent(), TextAffinity::Downstream).absoluteRect(&extraWidthToEndOfLine);
     if (startCaretRect.isEmpty())
         return IntRect();
@@ skipping 245 matching lines @@
 }
 
 DEFINE_TRACE(Editor)
 {
     visitor->trace(m_frame);
     visitor->trace(m_lastEditCommand);
     visitor->trace(m_mark);
 }
 
 } // namespace blink