Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 13:55:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1278014 part.9 Rename SelectionType::SELECTION_IME_CONVERTEDTEXT to SelectionType::eIMEConvertedClause r=smaug

Browse Source 
MozReview-Commit-ID: 5UNqhB2ZEcZ

--HG--
extra : rebase_source : 74d41ddf5496bdc50306bf916251df4f8d65a65b
This commit is contained in:
Masayuki Nakano 2016-06-09 19:14:17 +09:00
parent ff86f10a4c
commit aa3d2a6ce9
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dom/base/nsISelectionController.idl
View File

@ -290,8 +290,7 @@ enum class SelectionType : RawSelectionType
eSpellCheck = nsISelectionController::SELECTION_SPELLCHECK,
eIMERawClause = nsISelectionController::SELECTION_IME_RAWINPUT,
eIMESelectedRawClause = nsISelectionController::SELECTION_IME_SELECTEDRAWTEXT,
SELECTION_IME_CONVERTEDTEXT =
nsISelectionController::SELECTION_IME_CONVERTEDTEXT,
eIMEConvertedClause = nsISelectionController::SELECTION_IME_CONVERTEDTEXT,
SELECTION_IME_SELECTEDCONVERTEDTEXT =
nsISelectionController::SELECTION_IME_SELECTEDCONVERTEDTEXT,
SELECTION_ACCESSIBILITY =

2
editor/libeditor/nsEditor.cpp
View File

@ -5148,7 +5148,7 @@ nsEditor::GetIMESelectionStartOffsetIn(nsINode* aTextNode)
static const SelectionType kIMESelectionTypes[] = {
SelectionType::eIMERawClause,
SelectionType::eIMESelectedRawClause,
SelectionType::SELECTION_IME_CONVERTEDTEXT,
SelectionType::eIMEConvertedClause,
SelectionType::SELECTION_IME_SELECTEDCONVERTEDTEXT
};
for (auto selectionType : kIMESelectionTypes) {

8
layout/generic/nsSelection.cpp
View File

@ -125,7 +125,7 @@ ToChar(SelectionType aSelectionType)
return "SelectionType::eIMERawClause";
case SelectionType::eIMESelectedRawClause:
return "SelectionType::eIMESelectedRawClause";
case SelectionType::SELECTION_IME_CONVERTEDTEXT:
case SelectionType::eIMEConvertedClause:
return "SelectionType::eIMEConvertedClause";
case SelectionType::SELECTION_IME_SELECTEDCONVERTEDTEXT:
return "SelectionType::eIMESelectedClause";
@ -151,7 +151,7 @@ IsValidSelectionType(RawSelectionType aRawSelectionType)
case SelectionType::eSpellCheck:
case SelectionType::eIMERawClause:
case SelectionType::eIMESelectedRawClause:
case SelectionType::SELECTION_IME_CONVERTEDTEXT:
case SelectionType::eIMEConvertedClause:
case SelectionType::SELECTION_IME_SELECTEDCONVERTEDTEXT:
case SelectionType::SELECTION_ACCESSIBILITY:
case SelectionType::SELECTION_FIND:
@ -359,7 +359,7 @@ GetIndexFromSelectionType(SelectionType aSelectionType)
return 2;
case SelectionType::eIMESelectedRawClause:
return 3;
case SelectionType::SELECTION_IME_CONVERTEDTEXT:
case SelectionType::eIMEConvertedClause:
return 4;
case SelectionType::SELECTION_IME_SELECTEDCONVERTEDTEXT:
return 5;
@ -385,7 +385,7 @@ GetSelectionTypeFromIndex(int8_t aIndex)
SelectionType::eSpellCheck,
SelectionType::eIMERawClause,
SelectionType::eIMESelectedRawClause,
SelectionType::SELECTION_IME_CONVERTEDTEXT,
SelectionType::eIMEConvertedClause,
SelectionType::SELECTION_IME_SELECTEDCONVERTEDTEXT,
SelectionType::SELECTION_ACCESSIBILITY,
SelectionType::SELECTION_FIND,

8
layout/generic/nsTextFrame.cpp
View File

@ -348,7 +348,7 @@ public:
return eIndexRawInput;
case SelectionType::eIMESelectedRawClause:
return eIndexSelRawText;
case SelectionType::SELECTION_IME_CONVERTEDTEXT:
case SelectionType::eIMEConvertedClause:
return eIndexConvText;
case SelectionType::SELECTION_IME_SELECTEDCONVERTEDTEXT:
return eIndexSelConvText;
@ -5432,7 +5432,7 @@ nsTextFrame::ComputeSelectionUnderlineHeight(
switch (aSelectionType) {
case SelectionType::eIMERawClause:
case SelectionType::eIMESelectedRawClause:
case SelectionType::SELECTION_IME_CONVERTEDTEXT:
case SelectionType::eIMEConvertedClause:
case SelectionType::SELECTION_IME_SELECTEDCONVERTEDTEXT:
return aFontMetrics.underlineSize;
case SelectionType::eSpellCheck: {
@ -5543,7 +5543,7 @@ nsTextFrame::DrawSelectionDecorations(gfxContext* aContext,
switch (aSelectionType) {
case SelectionType::eIMERawClause:
case SelectionType::eIMESelectedRawClause:
case SelectionType::SELECTION_IME_CONVERTEDTEXT:
case SelectionType::eIMEConvertedClause:
case SelectionType::SELECTION_IME_SELECTEDCONVERTEDTEXT: {
// 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
@ -5648,7 +5648,7 @@ nsTextFrame::GetSelectionTextColors(SelectionType aSelectionType,
return true;
case SelectionType::eIMERawClause:
case SelectionType::eIMESelectedRawClause:
case SelectionType::SELECTION_IME_CONVERTEDTEXT:
case SelectionType::eIMEConvertedClause:
case SelectionType::SELECTION_IME_SELECTEDCONVERTEDTEXT:
if (aRangeStyle.IsDefined()) {
if (!aRangeStyle.IsForegroundColorDefined() &&

2
widget/WidgetEventImpl.cpp
View File

@ -116,7 +116,7 @@ ToSelectionType(TextRangeType aTextRangeType)
case TextRangeType::eSelectedRawClause:
return SelectionType::eIMESelectedRawClause;
case TextRangeType::eConvertedClause:
return SelectionType::SELECTION_IME_CONVERTEDTEXT;
return SelectionType::eIMEConvertedClause;
case TextRangeType::eSelectedClause:
return SelectionType::SELECTION_IME_SELECTEDCONVERTEDTEXT;
default: