зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1278014 part.7 Rename SelectionType::SELECTION_IME_RAWINPUT to SelectionType::eIMERawClause r=smaug
MozReview-Commit-ID: BRe10Lyx5mt --HG-- extra : rebase_source : e57239239fe8029040ce49faff9e37c5ad0b8305
This commit is contained in:
Родитель
a1636168ba
Коммит
569677d2f1
|
@ -288,7 +288,7 @@ enum class SelectionType : RawSelectionType
|
|||
eNone = nsISelectionController::SELECTION_NONE,
|
||||
eNormal = nsISelectionController::SELECTION_NORMAL,
|
||||
eSpellCheck = nsISelectionController::SELECTION_SPELLCHECK,
|
||||
SELECTION_IME_RAWINPUT = nsISelectionController::SELECTION_IME_RAWINPUT,
|
||||
eIMERawClause = nsISelectionController::SELECTION_IME_RAWINPUT,
|
||||
SELECTION_IME_SELECTEDRAWTEXT =
|
||||
nsISelectionController::SELECTION_IME_SELECTEDRAWTEXT,
|
||||
SELECTION_IME_CONVERTEDTEXT =
|
||||
|
|
|
@ -5146,7 +5146,7 @@ nsEditor::GetIMESelectionStartOffsetIn(nsINode* aTextNode)
|
|||
|
||||
int32_t minOffset = INT32_MAX;
|
||||
static const SelectionType kIMESelectionTypes[] = {
|
||||
SelectionType::SELECTION_IME_RAWINPUT,
|
||||
SelectionType::eIMERawClause,
|
||||
SelectionType::SELECTION_IME_SELECTEDRAWTEXT,
|
||||
SelectionType::SELECTION_IME_CONVERTEDTEXT,
|
||||
SelectionType::SELECTION_IME_SELECTEDCONVERTEDTEXT
|
||||
|
|
|
@ -121,7 +121,7 @@ ToChar(SelectionType aSelectionType)
|
|||
return "SelectionType::eNormal";
|
||||
case SelectionType::eSpellCheck:
|
||||
return "SelectionType::eSpellCheck";
|
||||
case SelectionType::SELECTION_IME_RAWINPUT:
|
||||
case SelectionType::eIMERawClause:
|
||||
return "SelectionType::eIMERawClause";
|
||||
case SelectionType::SELECTION_IME_SELECTEDRAWTEXT:
|
||||
return "SelectionType::eIMESelectedRawClause";
|
||||
|
@ -149,7 +149,7 @@ IsValidSelectionType(RawSelectionType aRawSelectionType)
|
|||
case SelectionType::eNone:
|
||||
case SelectionType::eNormal:
|
||||
case SelectionType::eSpellCheck:
|
||||
case SelectionType::SELECTION_IME_RAWINPUT:
|
||||
case SelectionType::eIMERawClause:
|
||||
case SelectionType::SELECTION_IME_SELECTEDRAWTEXT:
|
||||
case SelectionType::SELECTION_IME_CONVERTEDTEXT:
|
||||
case SelectionType::SELECTION_IME_SELECTEDCONVERTEDTEXT:
|
||||
|
@ -355,7 +355,7 @@ GetIndexFromSelectionType(SelectionType aSelectionType)
|
|||
return 0;
|
||||
case SelectionType::eSpellCheck:
|
||||
return 1;
|
||||
case SelectionType::SELECTION_IME_RAWINPUT:
|
||||
case SelectionType::eIMERawClause:
|
||||
return 2;
|
||||
case SelectionType::SELECTION_IME_SELECTEDRAWTEXT:
|
||||
return 3;
|
||||
|
@ -383,7 +383,7 @@ GetSelectionTypeFromIndex(int8_t aIndex)
|
|||
static const SelectionType kSelectionTypes[] = {
|
||||
SelectionType::eNormal,
|
||||
SelectionType::eSpellCheck,
|
||||
SelectionType::SELECTION_IME_RAWINPUT,
|
||||
SelectionType::eIMERawClause,
|
||||
SelectionType::SELECTION_IME_SELECTEDRAWTEXT,
|
||||
SelectionType::SELECTION_IME_CONVERTEDTEXT,
|
||||
SelectionType::SELECTION_IME_SELECTEDCONVERTEDTEXT,
|
||||
|
|
|
@ -344,7 +344,7 @@ public:
|
|||
SelectionType aSelectionType)
|
||||
{
|
||||
switch (aSelectionType) {
|
||||
case SelectionType::SELECTION_IME_RAWINPUT:
|
||||
case SelectionType::eIMERawClause:
|
||||
return eIndexRawInput;
|
||||
case SelectionType::SELECTION_IME_SELECTEDRAWTEXT:
|
||||
return eIndexSelRawText;
|
||||
|
@ -5430,7 +5430,7 @@ nsTextFrame::ComputeSelectionUnderlineHeight(
|
|||
SelectionType aSelectionType)
|
||||
{
|
||||
switch (aSelectionType) {
|
||||
case SelectionType::SELECTION_IME_RAWINPUT:
|
||||
case SelectionType::eIMERawClause:
|
||||
case SelectionType::SELECTION_IME_SELECTEDRAWTEXT:
|
||||
case SelectionType::SELECTION_IME_CONVERTEDTEXT:
|
||||
case SelectionType::SELECTION_IME_SELECTEDCONVERTEDTEXT:
|
||||
|
@ -5541,7 +5541,7 @@ nsTextFrame::DrawSelectionDecorations(gfxContext* aContext,
|
|||
|
||||
|
||||
switch (aSelectionType) {
|
||||
case SelectionType::SELECTION_IME_RAWINPUT:
|
||||
case SelectionType::eIMERawClause:
|
||||
case SelectionType::SELECTION_IME_SELECTEDRAWTEXT:
|
||||
case SelectionType::SELECTION_IME_CONVERTEDTEXT:
|
||||
case SelectionType::SELECTION_IME_SELECTEDCONVERTEDTEXT: {
|
||||
|
@ -5646,7 +5646,7 @@ nsTextFrame::GetSelectionTextColors(SelectionType aSelectionType,
|
|||
aTextPaintStyle.GetURLSecondaryColor(aForeground);
|
||||
*aBackground = NS_RGBA(0,0,0,0);
|
||||
return true;
|
||||
case SelectionType::SELECTION_IME_RAWINPUT:
|
||||
case SelectionType::eIMERawClause:
|
||||
case SelectionType::SELECTION_IME_SELECTEDRAWTEXT:
|
||||
case SelectionType::SELECTION_IME_CONVERTEDTEXT:
|
||||
case SelectionType::SELECTION_IME_SELECTEDCONVERTEDTEXT:
|
||||
|
|
|
@ -112,7 +112,7 @@ ToSelectionType(TextRangeType aTextRangeType)
|
|||
{
|
||||
switch (aTextRangeType) {
|
||||
case TextRangeType::eRawClause:
|
||||
return SelectionType::SELECTION_IME_RAWINPUT;
|
||||
return SelectionType::eIMERawClause;
|
||||
case TextRangeType::eSelectedRawClause:
|
||||
return SelectionType::SELECTION_IME_SELECTEDRAWTEXT;
|
||||
case TextRangeType::eConvertedClause:
|
||||
|
|
Загрузка…
Ссылка в новой задаче