--- a/dom/base/nsISelectionController.idl
+++ b/dom/base/nsISelectionController.idl
@@ -286,17 +286,17 @@ enum class SelectionType : RawSelectionT
 {
   eInvalid = -1,
   eNone = nsISelectionController::SELECTION_NONE,
   eNormal = nsISelectionController::SELECTION_NORMAL,
   eSpellCheck = nsISelectionController::SELECTION_SPELLCHECK,
   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,
   SELECTION_FIND = nsISelectionController::SELECTION_FIND,
   SELECTION_URLSECONDARY = nsISelectionController::SELECTION_URLSECONDARY,
   SELECTION_URLSTRIKEOUT = nsISelectionController::SELECTION_URLSTRIKEOUT,
 };
 

--- a/editor/libeditor/nsEditor.cpp
+++ b/editor/libeditor/nsEditor.cpp
@@ -5144,17 +5144,17 @@ nsEditor::GetIMESelectionStartOffsetIn(n
   NS_ENSURE_SUCCESS(rv, -1);
   NS_ENSURE_TRUE(selectionController, -1);
 
   int32_t minOffset = INT32_MAX;
   static const SelectionType kIMESelectionTypes[] = {
     SelectionType::eIMERawClause,
     SelectionType::eIMESelectedRawClause,
     SelectionType::eIMEConvertedClause,
-    SelectionType::SELECTION_IME_SELECTEDCONVERTEDTEXT
+    SelectionType::eIMESelectedClause
   };
   for (auto selectionType : kIMESelectionTypes) {
     RefPtr<Selection> selection = GetSelection(selectionType);
     if (!selection) {
       continue;
     }
     for (uint32_t i = 0; i < selection->RangeCount(); i++) {
       RefPtr<nsRange> range = selection->GetRangeAt(i);

--- a/layout/generic/nsSelection.cpp
+++ b/layout/generic/nsSelection.cpp
@@ -122,17 +122,17 @@ ToChar(SelectionType aSelectionType)
     case SelectionType::eSpellCheck:
       return "SelectionType::eSpellCheck";
     case SelectionType::eIMERawClause:
       return "SelectionType::eIMERawClause";
     case SelectionType::eIMESelectedRawClause:
       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";
     case SelectionType::SELECTION_FIND:
       return "SelectionType::eFind";
     case SelectionType::SELECTION_URLSECONDARY:
       return "SelectionType::eURLSecondary";
     case SelectionType::SELECTION_URLSTRIKEOUT:
@@ -147,17 +147,17 @@ IsValidSelectionType(RawSelectionType aR
 {
   switch (static_cast<SelectionType>(aRawSelectionType)) {
     case SelectionType::eNone:
     case SelectionType::eNormal:
     case SelectionType::eSpellCheck:
     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:
     case SelectionType::SELECTION_URLSTRIKEOUT:
       return true;
     default:
       return false;
   }
@@ -356,17 +356,17 @@ GetIndexFromSelectionType(SelectionType 
     case SelectionType::eSpellCheck:
       return 1;
     case SelectionType::eIMERawClause:
       return 2;
     case SelectionType::eIMESelectedRawClause:
       return 3;
     case SelectionType::eIMEConvertedClause:
       return 4;
-    case SelectionType::SELECTION_IME_SELECTEDCONVERTEDTEXT:
+    case SelectionType::eIMESelectedClause:
       return 5;
     case SelectionType::SELECTION_ACCESSIBILITY:
       return 6;
     case SelectionType::SELECTION_FIND:
       return 7;
     case SelectionType::SELECTION_URLSECONDARY:
       return 8;
     case SelectionType::SELECTION_URLSTRIKEOUT:
@@ -381,17 +381,17 @@ static SelectionType
 GetSelectionTypeFromIndex(int8_t aIndex)
 {
   static const SelectionType kSelectionTypes[] = {
     SelectionType::eNormal,
     SelectionType::eSpellCheck,
     SelectionType::eIMERawClause,
     SelectionType::eIMESelectedRawClause,
     SelectionType::eIMEConvertedClause,
-    SelectionType::SELECTION_IME_SELECTEDCONVERTEDTEXT,
+    SelectionType::eIMESelectedClause,
     SelectionType::SELECTION_ACCESSIBILITY,
     SelectionType::SELECTION_FIND,
     SelectionType::SELECTION_URLSECONDARY,
     SelectionType::SELECTION_URLSTRIKEOUT
   };
   if (NS_WARN_IF(aIndex < 0) ||
       NS_WARN_IF(static_cast<size_t>(aIndex) >= ArrayLength(kSelectionTypes))) {
     return SelectionType::eNormal;

--- a/layout/generic/nsTextFrame.cpp
+++ b/layout/generic/nsTextFrame.cpp
@@ -345,17 +345,17 @@ public:
   {
     switch (aSelectionType) {
       case SelectionType::eIMERawClause:
         return eIndexRawInput;
       case SelectionType::eIMESelectedRawClause:
         return eIndexSelRawText;
       case SelectionType::eIMEConvertedClause:
         return eIndexConvText;
-      case SelectionType::SELECTION_IME_SELECTEDCONVERTEDTEXT:
+      case SelectionType::eIMESelectedClause:
         return eIndexSelConvText;
       case SelectionType::eSpellCheck:
         return eIndexSpellChecker;
       default:
         NS_WARNING("non-IME selection type");
         return eIndexRawInput;
     }
   }
@@ -5428,17 +5428,17 @@ nsTextFrame::ComputeSelectionUnderlineHe
                nsPresContext* aPresContext,
                const gfxFont::Metrics& aFontMetrics,
                SelectionType aSelectionType)
 {
   switch (aSelectionType) {
     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
       // metrics.  It should be constant pixels value which is decided from the
       // default font size.  Note that if the actual font size is smaller than
       // the default font size, we should use the actual font size because the
       // computed value from the default font size can be too thick for the
       // current font size.
@@ -5539,17 +5539,17 @@ nsTextFrame::DrawSelectionDecorations(gf
     aTextPaintStyle.GetSelectionUnderlineForPaint(index, &params.color,
                                                   &relativeSize, &params.style);
 
 
   switch (aSelectionType) {
     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
       // where are the boundaries of the selections.
       //
       //  X: underline
       //
       //     IME selection #1        IME selection #2      IME selection #3
@@ -5644,17 +5644,17 @@ nsTextFrame::GetSelectionTextColors(Sele
       return true;
     case SelectionType::SELECTION_URLSECONDARY:
       aTextPaintStyle.GetURLSecondaryColor(aForeground);
       *aBackground = NS_RGBA(0,0,0,0);
       return true;
     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()) {
           *aForeground = aTextPaintStyle.GetTextColor();
           *aBackground = NS_RGBA(0,0,0,0);
           return false;
         }
         if (aRangeStyle.IsForegroundColorDefined()) {

--- a/widget/WidgetEventImpl.cpp
+++ b/widget/WidgetEventImpl.cpp
@@ -113,17 +113,17 @@ ToSelectionType(TextRangeType aTextRange
   switch (aTextRangeType) {
     case TextRangeType::eRawClause:
       return SelectionType::eIMERawClause;
     case TextRangeType::eSelectedRawClause:
       return SelectionType::eIMESelectedRawClause;
     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;
   }
 }
 
 /******************************************************************************
  * As*Event() implementation