Bug 1277756 part.4 Rename TextRangeType::NS_TEXTRANGE_RAWINPUT to TextRangeType::eRawClause r=smaug

MozReview-Commit-ID: KLC1VPiYTdz

--HG--
extra : rebase_source : 3f750e526bb04b26ed66d2c0fada14e7d5b43d73

dom/plugins/base/nsPluginInstanceOwner.cpp

@@ -886,7 +886,7 @@ nsPluginInstanceOwner::GetCompositionString(uint32_t aType,
       for (TextRange& range : *ranges) {
         uint8_t type = ATTR_INPUT;
         switch(range.mRangeType) {
-          case TextRangeType::NS_TEXTRANGE_RAWINPUT:
+          case TextRangeType::eRawClause:
             type = ATTR_INPUT;
             break;
           case TextRangeType::NS_TEXTRANGE_SELECTEDRAWTEXT:

editor/libeditor/IMETextTxn.cpp

@@ -138,7 +138,7 @@ static SelectionType
 ToSelectionType(TextRangeType aTextRangeType)
 {
   switch (aTextRangeType) {
-    case TextRangeType::NS_TEXTRANGE_RAWINPUT:
+    case TextRangeType::eRawClause:
       return nsISelectionController::SELECTION_IME_RAWINPUT;
     case TextRangeType::NS_TEXTRANGE_SELECTEDRAWTEXT:
       return nsISelectionController::SELECTION_IME_SELECTEDRAWTEXT;

editor/libeditor/nsEditor.cpp

@@ -2422,7 +2422,7 @@ nsEditor::InsertTextIntoTextNodeImpl(const nsAString& aStringToInsert,
     for (uint32_t i = 0; i < (ranges ? ranges->Length() : 0); ++i) {
       const TextRange& textRange = ranges->ElementAt(i);
       if (!textRange.Length() ||
-          textRange.mRangeType != TextRangeType::NS_TEXTRANGE_RAWINPUT) {
+          textRange.mRangeType != TextRangeType::eRawClause) {
         continue;
       }
       if (!mPhonetic) {

widget/TextEventDispatcher.cpp

@@ -624,7 +624,7 @@ TextEventDispatcher::PendingComposition::AppendClause(
   }
 
   switch (aTextRangeType) {
-    case TextRangeType::NS_TEXTRANGE_RAWINPUT:
+    case TextRangeType::eRawClause:
     case TextRangeType::NS_TEXTRANGE_SELECTEDRAWTEXT:
     case TextRangeType::NS_TEXTRANGE_CONVERTEDTEXT:
     case TextRangeType::NS_TEXTRANGE_SELECTEDCONVERTEDTEXT: {
@@ -669,7 +669,7 @@ TextEventDispatcher::PendingComposition::Set(const nsAString& aString,
   if (!aRanges || aRanges->IsEmpty()) {
     // Create dummy range if aString isn't empty.
     if (!aString.IsEmpty()) {
-      rv = AppendClause(str.Length(), TextRangeType::NS_TEXTRANGE_RAWINPUT);
+      rv = AppendClause(str.Length(), TextRangeType::eRawClause);
       if (NS_WARN_IF(NS_FAILED(rv))) {
         return rv;
       }

widget/TextEventDispatcher.h

@@ -152,7 +152,7 @@ public:
    * the pending composition string.
    *
    * @param aLength         Length of the clause.
-   * @param aTextRangeType  One of NS_TEXTRANGE_RAWINPUT,
+   * @param aTextRangeType  One of TextRangeType::eRawClause,
    *                        NS_TEXTRANGE_SELECTEDRAWTEXT,
    *                        NS_TEXTRANGE_CONVERTEDTEXT or
    *                        NS_TEXTRANGE_SELECTEDCONVERTEDTEXT.

widget/TextRange.h

@@ -132,8 +132,7 @@ enum class TextRangeType : RawTextRangeType
 {
   eUninitialized = 0x00,
   eCaret = 0x01,
-  NS_TEXTRANGE_RAWINPUT =
+  eRawClause = nsITextInputProcessor::ATTR_RAW_CLAUSE,
-    nsITextInputProcessor::ATTR_RAW_CLAUSE,
   NS_TEXTRANGE_SELECTEDRAWTEXT =
     nsITextInputProcessor::ATTR_SELECTED_RAW_CLAUSE,
   NS_TEXTRANGE_CONVERTEDTEXT =

widget/WidgetEventImpl.cpp

@@ -63,7 +63,7 @@ IsValidRawTextRangeValue(RawTextRangeType aRawTextRangeType)
   switch (static_cast<TextRangeType>(aRawTextRangeType)) {
     case TextRangeType::eUninitialized:
     case TextRangeType::eCaret:
-    case TextRangeType::NS_TEXTRANGE_RAWINPUT:
+    case TextRangeType::eRawClause:
     case TextRangeType::NS_TEXTRANGE_SELECTEDRAWTEXT:
     case TextRangeType::NS_TEXTRANGE_CONVERTEDTEXT:
     case TextRangeType::NS_TEXTRANGE_SELECTEDCONVERTEDTEXT:
@@ -94,8 +94,8 @@ ToChar(TextRangeType aTextRangeType)
       return "TextRangeType::eUninitialized";
     case TextRangeType::eCaret:
       return "TextRangeType::eCaret";
-    case TextRangeType::NS_TEXTRANGE_RAWINPUT:
+    case TextRangeType::eRawClause:
-      return "NS_TEXTRANGE_RAWINPUT";
+      return "TextRangeType::eRawClause";
     case TextRangeType::NS_TEXTRANGE_SELECTEDRAWTEXT:
       return "NS_TEXTRANGE_SELECTEDRAWTEXT";
     case TextRangeType::NS_TEXTRANGE_CONVERTEDTEXT:

widget/android/nsWindow.cpp

@@ -3147,7 +3147,7 @@ nsWindow::GeckoViewSupport::OnImeReplaceText(int32_t aStart, int32_t aEnd,
             TextRange range;
             range.mStartOffset = 0;
             range.mEndOffset = event.mData.Length();
-            range.mRangeType = TextRangeType::NS_TEXTRANGE_RAWINPUT;
+            range.mRangeType = TextRangeType::eRawClause;
             event.mRanges = new TextRangeArray();
             event.mRanges->AppendElement(range);
         }

widget/cocoa/TextInputHandler.mm

@@ -2740,7 +2740,7 @@ IMEInputHandler::ConvertToTextRangeType(uint32_t aUnderlineStyle,
   if (aSelectedRange.length == 0) {
     switch (aUnderlineStyle) {
       case NSUnderlineStyleSingle:
-        return TextRangeType::NS_TEXTRANGE_RAWINPUT;
+        return TextRangeType::eRawClause;
       case NSUnderlineStyleThick:
         return TextRangeType::NS_TEXTRANGE_SELECTEDRAWTEXT;
       default:

widget/gtk/IMContextWrapper.cpp

@@ -1830,7 +1830,7 @@ IMContextWrapper::SetTextRange(PangoAttrIterator* aPangoAttrIter,
      *   3: If only attrForground is specified, we assumed the clause is
      *      NS_TEXTRANGE_SELECTEDRAWTEXT.
      *   4: If neither attrUnderline nor attrForeground is specified, we assumed
-     *      the clause is NS_TEXTRANGE_RAWINPUT.
+     *      the clause is TextRangeType::eRawClause.
      *
      * However, this rules are odd since there can be two or more selected
      * clauses.  Additionally, our old rules caused that IME developers/users
@@ -1852,7 +1852,7 @@ IMContextWrapper::SetTextRange(PangoAttrIterator* aPangoAttrIter,
     if (!utf8ClauseStart &&
         utf8ClauseEnd == static_cast<gint>(strlen(aUTF8CompositionString)) &&
         aTextRange.mEndOffset == aUTF16CaretOffset) {
-        aTextRange.mRangeType = TextRangeType::NS_TEXTRANGE_RAWINPUT;
+        aTextRange.mRangeType = TextRangeType::eRawClause;
     }
     // Typically, the caret is set at the start of the selected clause.
     // So, if the caret is in the clause, we can assume that the clause is

widget/windows/IMMHandler.cpp

@@ -1896,7 +1896,7 @@ PlatformToNSAttr(uint8_t aAttr)
     case ATTR_INPUT_ERROR:
     // case ATTR_FIXEDCONVERTED:
     case ATTR_INPUT:
-      return TextRangeType::NS_TEXTRANGE_RAWINPUT;
+      return TextRangeType::eRawClause;
     case ATTR_CONVERTED:
       return TextRangeType::NS_TEXTRANGE_CONVERTEDTEXT;
     case ATTR_TARGET_NOTCONVERTED:

widget/windows/TSFTextStore.cpp

@@ -2056,7 +2056,7 @@ GetGeckoSelectionValue(TF_DISPLAYATTRIBUTE& aDisplayAttr)
     case TF_ATTR_TARGET_NOTCONVERTED:
       return TextRangeType::NS_TEXTRANGE_SELECTEDRAWTEXT;
     default:
-      return TextRangeType::NS_TEXTRANGE_RAWINPUT;
+      return TextRangeType::eRawClause;
   }
 }
 
@@ -2428,7 +2428,7 @@ TSFTextStore::RecordCompositionUpdateAction()
   // we always pass in at least one range to eCompositionChange
   newRange.mStartOffset = 0;
   newRange.mEndOffset = action->mData.Length();
-  newRange.mRangeType = TextRangeType::NS_TEXTRANGE_RAWINPUT;
+  newRange.mRangeType = TextRangeType::eRawClause;
   action->mRanges->AppendElement(newRange);
 
   RefPtr<ITfRange> range;
@@ -2473,7 +2473,7 @@ TSFTextStore::RecordCompositionUpdateAction()
     TF_DISPLAYATTRIBUTE attr;
     hr = GetDisplayAttribute(attrPropetry, range, &attr);
     if (FAILED(hr)) {
-      newRange.mRangeType = TextRangeType::NS_TEXTRANGE_RAWINPUT;
+      newRange.mRangeType = TextRangeType::eRawClause;
     } else {
       newRange.mRangeType = GetGeckoSelectionValue(attr);
       if (GetColor(attr.crText, newRange.mRangeStyle.mForegroundColor)) {