Bug 1278014 part.10 Rename SelectionType::SELECTION_IME_SELECTEDCONVERTEDTEXT to SelectionType::eIMESelectedClause r=smaug

MozReview-Commit-ID: 8v3mqcYorOI

--HG--
extra : rebase_source : a6823273c161eabbfa9e49e689154e547c14a106

dom/base/nsISelectionController.idl

@@ -291,7 +291,7 @@ enum class SelectionType : RawSelectionType
   eIMERawClause = nsISelectionController::SELECTION_IME_RAWINPUT,
   eIMESelectedRawClause = nsISelectionController::SELECTION_IME_SELECTEDRAWTEXT,
   eIMEConvertedClause = nsISelectionController::SELECTION_IME_CONVERTEDTEXT,
-  SELECTION_IME_SELECTEDCONVERTEDTEXT =
+  eIMESelectedClause =
     nsISelectionController::SELECTION_IME_SELECTEDCONVERTEDTEXT,
   SELECTION_ACCESSIBILITY =
     nsISelectionController::SELECTION_ACCESSIBILITY,

editor/libeditor/nsEditor.cpp

@@ -5149,7 +5149,7 @@ nsEditor::GetIMESelectionStartOffsetIn(nsINode* aTextNode)
     SelectionType::eIMERawClause,
     SelectionType::eIMESelectedRawClause,
     SelectionType::eIMEConvertedClause,
-    SelectionType::SELECTION_IME_SELECTEDCONVERTEDTEXT
+    SelectionType::eIMESelectedClause
   };
   for (auto selectionType : kIMESelectionTypes) {
     RefPtr<Selection> selection = GetSelection(selectionType);

layout/generic/nsSelection.cpp

@@ -127,7 +127,7 @@ ToChar(SelectionType aSelectionType)
       return "SelectionType::eIMESelectedRawClause";
     case SelectionType::eIMEConvertedClause:
       return "SelectionType::eIMEConvertedClause";
-    case SelectionType::SELECTION_IME_SELECTEDCONVERTEDTEXT:
+    case SelectionType::eIMESelectedClause:
       return "SelectionType::eIMESelectedClause";
     case SelectionType::SELECTION_ACCESSIBILITY:
       return "SelectionType::eAccessibility";
@@ -152,7 +152,7 @@ IsValidSelectionType(RawSelectionType aRawSelectionType)
     case SelectionType::eIMERawClause:
     case SelectionType::eIMESelectedRawClause:
     case SelectionType::eIMEConvertedClause:
-    case SelectionType::SELECTION_IME_SELECTEDCONVERTEDTEXT:
+    case SelectionType::eIMESelectedClause:
     case SelectionType::SELECTION_ACCESSIBILITY:
     case SelectionType::SELECTION_FIND:
     case SelectionType::SELECTION_URLSECONDARY:
@@ -361,7 +361,7 @@ GetIndexFromSelectionType(SelectionType aSelectionType)
       return 3;
     case SelectionType::eIMEConvertedClause:
       return 4;
-    case SelectionType::SELECTION_IME_SELECTEDCONVERTEDTEXT:
+    case SelectionType::eIMESelectedClause:
       return 5;
     case SelectionType::SELECTION_ACCESSIBILITY:
       return 6;
@@ -386,7 +386,7 @@ GetSelectionTypeFromIndex(int8_t aIndex)
     SelectionType::eIMERawClause,
     SelectionType::eIMESelectedRawClause,
     SelectionType::eIMEConvertedClause,
-    SelectionType::SELECTION_IME_SELECTEDCONVERTEDTEXT,
+    SelectionType::eIMESelectedClause,
     SelectionType::SELECTION_ACCESSIBILITY,
     SelectionType::SELECTION_FIND,
     SelectionType::SELECTION_URLSECONDARY,

layout/generic/nsTextFrame.cpp

@@ -350,7 +350,7 @@ public:
         return eIndexSelRawText;
       case SelectionType::eIMEConvertedClause:
         return eIndexConvText;
-      case SelectionType::SELECTION_IME_SELECTEDCONVERTEDTEXT:
+      case SelectionType::eIMESelectedClause:
         return eIndexSelConvText;
       case SelectionType::eSpellCheck:
         return eIndexSpellChecker;
@@ -5433,7 +5433,7 @@ nsTextFrame::ComputeSelectionUnderlineHeight(
     case SelectionType::eIMERawClause:
     case SelectionType::eIMESelectedRawClause:
     case SelectionType::eIMEConvertedClause:
-    case SelectionType::SELECTION_IME_SELECTEDCONVERTEDTEXT:
+    case SelectionType::eIMESelectedClause:
       return aFontMetrics.underlineSize;
     case SelectionType::eSpellCheck: {
       // The thickness of the spellchecker underline shouldn't honor the font
@@ -5544,7 +5544,7 @@ nsTextFrame::DrawSelectionDecorations(gfxContext* aContext,
     case SelectionType::eIMERawClause:
     case SelectionType::eIMESelectedRawClause:
     case SelectionType::eIMEConvertedClause:
-    case SelectionType::SELECTION_IME_SELECTEDCONVERTEDTEXT: {
+    case SelectionType::eIMESelectedClause: {
       // IME decoration lines should not be drawn on the both ends, i.e., we
       // need to cut both edges of the decoration lines.  Because same style
       // IME selections can adjoin, but the users need to be able to know
@@ -5649,7 +5649,7 @@ nsTextFrame::GetSelectionTextColors(SelectionType aSelectionType,
     case SelectionType::eIMERawClause:
     case SelectionType::eIMESelectedRawClause:
     case SelectionType::eIMEConvertedClause:
-    case SelectionType::SELECTION_IME_SELECTEDCONVERTEDTEXT:
+    case SelectionType::eIMESelectedClause:
       if (aRangeStyle.IsDefined()) {
         if (!aRangeStyle.IsForegroundColorDefined() &&
             !aRangeStyle.IsBackgroundColorDefined()) {

widget/WidgetEventImpl.cpp

@@ -118,7 +118,7 @@ ToSelectionType(TextRangeType aTextRangeType)
     case TextRangeType::eConvertedClause:
       return SelectionType::eIMEConvertedClause;
     case TextRangeType::eSelectedClause:
-      return SelectionType::SELECTION_IME_SELECTEDCONVERTEDTEXT;
+      return SelectionType::eIMESelectedClause;
     default:
       MOZ_CRASH("TextRangeType is invalid");
       return SelectionType::eNormal;