зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1278014 part.14 Rename SelectionType::SELECTION_URLSTRIKEOUT to SelectionType::eURLStrikeout r=smaug
MozReview-Commit-ID: 7AqeDbHxGE2 --HG-- extra : rebase_source : 2dada2c98e1186aa7f5699b8d11033eae50ba2c6
This commit is contained in:
Родитель
a0eb51f54d
Коммит
9fdc31aea3
|
@ -296,7 +296,7 @@ enum class SelectionType : RawSelectionType
|
|||
eAccessibility = nsISelectionController::SELECTION_ACCESSIBILITY,
|
||||
eFind = nsISelectionController::SELECTION_FIND,
|
||||
eURLSecondary = nsISelectionController::SELECTION_URLSECONDARY,
|
||||
SELECTION_URLSTRIKEOUT = nsISelectionController::SELECTION_URLSTRIKEOUT,
|
||||
eURLStrikeout = nsISelectionController::SELECTION_URLSTRIKEOUT,
|
||||
};
|
||||
|
||||
// Using anonymous enum to define constants because these constants may be
|
||||
|
|
|
@ -3381,7 +3381,7 @@ nsFrame::HandlePress(nsPresContext* aPresContext,
|
|||
if (curDetail->mSelectionType != SelectionType::eSpellCheck &&
|
||||
curDetail->mSelectionType != SelectionType::eFind &&
|
||||
curDetail->mSelectionType != SelectionType::eURLSecondary &&
|
||||
curDetail->mSelectionType != SelectionType::SELECTION_URLSTRIKEOUT &&
|
||||
curDetail->mSelectionType != SelectionType::eURLStrikeout &&
|
||||
curDetail->mStart <= offsets.StartOffset() &&
|
||||
offsets.EndOffset() <= curDetail->mEnd)
|
||||
{
|
||||
|
|
|
@ -135,7 +135,7 @@ ToChar(SelectionType aSelectionType)
|
|||
return "SelectionType::eFind";
|
||||
case SelectionType::eURLSecondary:
|
||||
return "SelectionType::eURLSecondary";
|
||||
case SelectionType::SELECTION_URLSTRIKEOUT:
|
||||
case SelectionType::eURLStrikeout:
|
||||
return "SelectionType::eURLStrikeout";
|
||||
default:
|
||||
return "Invalid SelectionType";
|
||||
|
@ -156,7 +156,7 @@ IsValidSelectionType(RawSelectionType aRawSelectionType)
|
|||
case SelectionType::eAccessibility:
|
||||
case SelectionType::eFind:
|
||||
case SelectionType::eURLSecondary:
|
||||
case SelectionType::SELECTION_URLSTRIKEOUT:
|
||||
case SelectionType::eURLStrikeout:
|
||||
return true;
|
||||
default:
|
||||
return false;
|
||||
|
@ -369,7 +369,7 @@ GetIndexFromSelectionType(SelectionType aSelectionType)
|
|||
return 7;
|
||||
case SelectionType::eURLSecondary:
|
||||
return 8;
|
||||
case SelectionType::SELECTION_URLSTRIKEOUT:
|
||||
case SelectionType::eURLStrikeout:
|
||||
return 9;
|
||||
default:
|
||||
return -1;
|
||||
|
@ -390,7 +390,7 @@ GetSelectionTypeFromIndex(int8_t aIndex)
|
|||
SelectionType::eAccessibility,
|
||||
SelectionType::eFind,
|
||||
SelectionType::eURLSecondary,
|
||||
SelectionType::SELECTION_URLSTRIKEOUT
|
||||
SelectionType::eURLStrikeout
|
||||
};
|
||||
if (NS_WARN_IF(aIndex < 0) ||
|
||||
NS_WARN_IF(static_cast<size_t>(aIndex) >= ArrayLength(kSelectionTypes))) {
|
||||
|
|
|
@ -5604,7 +5604,7 @@ nsTextFrame::DrawSelectionDecorations(gfxContext* aContext,
|
|||
if (!weDefineSelectionUnderline)
|
||||
return;
|
||||
break;
|
||||
case SelectionType::SELECTION_URLSTRIKEOUT: {
|
||||
case SelectionType::eURLStrikeout: {
|
||||
nscoord inflationMinFontSize =
|
||||
nsLayoutUtils::InflationMinFontSizeFor(this);
|
||||
float inflation =
|
||||
|
|
Загрузка…
Ссылка в новой задаче