corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1681240 - Make TextControlState::SetValueFlags an enum class r=saschanaz

Browse Source 
Using integer as a bit field may cause simple mistake and may not be easy
to read, and we have `EnumSet` class which can treat an `enum class` as
a bit flags so that we should make it an `enum class` and use it with the
`EnumSet` class.

Differential Revision: https://phabricator.services.mozilla.com/D99172
This commit is contained in:
Masayuki Nakano
2020-12-09 23:34:28 +00:00
parent 29715b8fd2
commit fbba4fb0ed
9 changed files with 198 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
dom/html/HTMLInputElement.cpp
View File

@@ -1092,8 +1092,13 @@ nsresult HTMLInputElement::Clone(dom::NodeInfo* aNodeInfo,
nsAutoString value;
GetNonFileValueInternal(value);
// SetValueInternal handles setting the VALUE_CHANGED bit for us
rv = it->SetValueInternal(value, TextControlState::eSetValue_Notify);
NS_ENSURE_SUCCESS(rv, rv);
if (NS_WARN_IF(NS_FAILED(
rv = it->SetValueInternal(
value,
{ValueSetterOption::
UpdateOverlayTextVisibilityAndInvalidateFrame})))) {
return rv;
}
}
break;
case VALUE_MODE_FILENAME:
@@ -1610,9 +1615,9 @@ void HTMLInputElement::SetValue(const nsAString& aValue, CallerType aCallerType,
// get the unsanitized value?
nsresult rv = SetValueInternal(
aValue, SanitizesOnValueGetter() ? nullptr : &currentValue,
TextControlState::eSetValue_ByContent |
TextControlState::eSetValue_Notify |
TextControlState::eSetValue_MoveCursorToEndIfValueChanged);
{ValueSetterOption::ByContentAPI,
ValueSetterOption::UpdateOverlayTextVisibilityAndInvalidateFrame,
ValueSetterOption::MoveCursorToEndIfValueChanged});
if (NS_FAILED(rv)) {
aRv.Throw(rv);
return;
@@ -1624,9 +1629,9 @@ void HTMLInputElement::SetValue(const nsAString& aValue, CallerType aCallerType,
} else {
nsresult rv = SetValueInternal(
aValue,
TextControlState::eSetValue_ByContent |
TextControlState::eSetValue_Notify |
TextControlState::eSetValue_MoveCursorToEndIfValueChanged);
{ValueSetterOption::ByContentAPI,
ValueSetterOption::UpdateOverlayTextVisibilityAndInvalidateFrame,
ValueSetterOption::MoveCursorToEndIfValueChanged});
if (NS_FAILED(rv)) {
aRv.Throw(rv);
return;
@@ -2240,9 +2245,9 @@ void HTMLInputElement::SetUserInput(const nsAString& aValue,
GetValueMode() == VALUE_MODE_VALUE && IsSingleLineTextControl(false);
nsresult rv = SetValueInternal(
aValue, TextControlState::eSetValue_BySetUserInput |
TextControlState::eSetValue_Notify |
TextControlState::eSetValue_MoveCursorToEndIfValueChanged);
aValue, {ValueSetterOption::BySetUserInputAPI,
ValueSetterOption::UpdateOverlayTextVisibilityAndInvalidateFrame,
ValueSetterOption::MoveCursorToEndIfValueChanged});
NS_ENSURE_SUCCESS_VOID(rv);
if (!isInputEventDispatchedByTextControlState) {
@@ -2633,9 +2638,9 @@ void HTMLInputElement::UpdateFileList() {
}
}
nsresult HTMLInputElement::SetValueInternal(const nsAString& aValue,
const nsAString* aOldValue,
uint32_t aFlags) {
nsresult HTMLInputElement::SetValueInternal(
const nsAString& aValue, const nsAString* aOldValue,
const ValueSetterOptions& aOptions) {
MOZ_ASSERT(GetValueMode() != VALUE_MODE_FILENAME,
"Don't call SetValueInternal for file inputs");
@@ -2647,9 +2652,7 @@ nsresult HTMLInputElement::SetValueInternal(const nsAString& aValue,
// TODO(emilio): Rather than doing this maybe add an attribute instead and
// read it only on chrome docs or something? That'd allow front-end code to
// move away from xul without weird side-effects.
if (mParent && mParent->IsXULElement()) {
aFlags |= TextControlState::eSetValue_PreserveHistory;
}
const bool forcePreserveUndoHistory = mParent && mParent->IsXULElement();
switch (GetValueMode()) {
case VALUE_MODE_VALUE: {
@@ -2663,29 +2666,33 @@ nsresult HTMLInputElement::SetValueInternal(const nsAString& aValue,
}
// else DoneCreatingElement calls us again once mDoneCreating is true
bool setValueChanged = !!(aFlags & TextControlState::eSetValue_Notify);
const bool setValueChanged = aOptions.contains(
ValueSetterOption::UpdateOverlayTextVisibilityAndInvalidateFrame);
if (setValueChanged) {
SetValueChanged(true);
}
if (IsSingleLineTextControl(false)) {
// Note that if aFlags includes
// TextControlState::eSetValue_BySetUserInput, "input" event is
// automatically dispatched by TextControlState::SetValue().
// If you'd change condition of calling this method, you need to
// maintain SetUserInput() too.
// FYI: After calling SetValue(), the input type might have been
// Note that if aOptions includes
// ValueSetterOption::BySetUserInputAPI, "input" event is automatically
// dispatched by TextControlState::SetValue(). If you'd change condition
// of calling this method, you need to maintain SetUserInput() too. FYI:
// After calling SetValue(), the input type might have been
// modified so that mInputData may not store TextControlState.
if (!mInputData.mState->SetValue(value, aOldValue, aFlags)) {
if (!mInputData.mState->SetValue(
value, aOldValue,
forcePreserveUndoHistory
? aOptions + ValueSetterOption::PreserveUndoHistory
: aOptions)) {
return NS_ERROR_OUT_OF_MEMORY;
}
// If the caller won't dispatch "input" event via
// nsContentUtils::DispatchInputEvent(), we need to modify
// validationMessage value here.
//
// FIXME(emilio): eSetValue_Internal is not supposed to change state,
// but maybe we could run this too?
if (aFlags & TextControlState::eSetValue_ByContent) {
// FIXME(emilio): ValueSetterOption::ByInternalAPI is not supposed to
// change state, but maybe we could run this too?
if (aOptions.contains(ValueSetterOption::ByContentAPI)) {
MaybeUpdateAllValidityStates(!mDoneCreating);
}
} else {
@@ -2700,7 +2707,7 @@ nsresult HTMLInputElement::SetValueInternal(const nsAString& aValue,
frame->UpdateForValueChange();
}
} else if (CreatesDateTimeWidget() &&
!(aFlags & TextControlState::eSetValue_BySetUserInput)) {
!aOptions.contains(ValueSetterOption::BySetUserInputAPI)) {
if (Element* dateTimeBoxElement = GetDateTimeBoxElement()) {
AsyncEventDispatcher* dispatcher = new AsyncEventDispatcher(
dateTimeBoxElement, u"MozDateTimeValueChanged"_ns,
@@ -3376,8 +3383,10 @@ void HTMLInputElement::CancelRangeThumbDrag(bool aIsForUserEvent) {
mInputType->ConvertNumberToString(mRangeThumbDragStartValue, val);
// TODO: What should we do if SetValueInternal fails? (The allocation
// is small, so we should be fine here.)
SetValueInternal(val, TextControlState::eSetValue_BySetUserInput |
TextControlState::eSetValue_Notify);
SetValueInternal(
val,
{ValueSetterOption::BySetUserInputAPI,
ValueSetterOption::UpdateOverlayTextVisibilityAndInvalidateFrame});
nsRangeFrame* frame = do_QueryFrame(GetPrimaryFrame());
if (frame) {
frame->UpdateForValueChange();
@@ -3397,8 +3406,9 @@ void HTMLInputElement::SetValueOfRangeForUserEvent(Decimal aValue) {
mInputType->ConvertNumberToString(aValue, val);
// TODO: What should we do if SetValueInternal fails? (The allocation
// is small, so we should be fine here.)
SetValueInternal(val, TextControlState::eSetValue_BySetUserInput |
TextControlState::eSetValue_Notify);
SetValueInternal(
val, {ValueSetterOption::BySetUserInputAPI,
ValueSetterOption::UpdateOverlayTextVisibilityAndInvalidateFrame});
nsRangeFrame* frame = do_QueryFrame(GetPrimaryFrame());
if (frame) {
frame->UpdateForValueChange();
@@ -3488,8 +3498,10 @@ void HTMLInputElement::StepNumberControlForUserEvent(int32_t aDirection) {
mInputType->ConvertNumberToString(newValue, newVal);
// TODO: What should we do if SetValueInternal fails? (The allocation
// is small, so we should be fine here.)
SetValueInternal(newVal, TextControlState::eSetValue_BySetUserInput |
TextControlState::eSetValue_Notify);
SetValueInternal(
newVal,
{ValueSetterOption::BySetUserInputAPI,
ValueSetterOption::UpdateOverlayTextVisibilityAndInvalidateFrame});
}
static bool SelectTextFieldOnFocus() {
@@ -4293,23 +4305,24 @@ void HTMLInputElement::UnbindFromTree(bool aNullParent) {
namespace {
class TypeChangeSelectionRangeFlagDeterminer {
public:
using ValueSetterOption = TextControlState::ValueSetterOption;
using ValueSetterOptions = TextControlState::ValueSetterOptions;
// @param aOldType InputElementTypes
// @param aNewType InputElementTypes
TypeChangeSelectionRangeFlagDeterminer(uint8_t aOldType, uint8_t aNewType)
: mOldType(aOldType), mNewType(aNewType) {}
// @return TextControlState::SetValueFlags
uint32_t GetFlag() const {
// @return TextControlState::ValueSetterOptions
ValueSetterOptions GetValueSetterOptions() const {
const bool previouslySelectable = DoesSetRangeTextApply(mOldType);
const bool nowSelectable = DoesSetRangeTextApply(mNewType);
const bool moveCursorToBeginAndSetDirectionForward =
!previouslySelectable && nowSelectable;
const uint32_t flag =
moveCursorToBeginAndSetDirectionForward
? TextControlState::
eSetValue_MoveCursorToBeginSetSelectionDirectionForward
: 0;
return flag;
if (moveCursorToBeginAndSetDirectionForward) {
return {ValueSetterOption::MoveCursorToBeginSetSelectionDirectionForward};
}
return {};
}
private:
@@ -4414,13 +4427,13 @@ void HTMLInputElement::HandleTypeChange(uint8_t aNewType, bool aNotify) {
const TypeChangeSelectionRangeFlagDeterminer flagDeterminer(oldType,
mType);
const uint32_t selectionRangeFlag = flagDeterminer.GetFlag();
ValueSetterOptions options(flagDeterminer.GetValueSetterOptions());
options += ValueSetterOption::ByInternalAPI;
// TODO: What should we do if SetValueInternal fails? (The allocation
// may potentially be big, but most likely we've failed to allocate
// before the type change.)
SetValueInternal(
value, TextControlState::eSetValue_Internal | selectionRangeFlag);
SetValueInternal(value, options);
}
break;
case VALUE_MODE_FILENAME:
@@ -5441,8 +5454,10 @@ void HTMLInputElement::GetValueFromSetRangeText(nsAString& aValue) {
}
nsresult HTMLInputElement::SetValueFromSetRangeText(const nsAString& aValue) {
return SetValueInternal(aValue, TextControlState::eSetValue_ByContent |
TextControlState::eSetValue_Notify);
return SetValueInternal(
aValue,
{ValueSetterOption::ByContentAPI,
ValueSetterOption::UpdateOverlayTextVisibilityAndInvalidateFrame});
}
Nullable<uint32_t> HTMLInputElement::GetSelectionStart(ErrorResult& aRv) {
@@ -5573,7 +5588,7 @@ nsresult HTMLInputElement::SetDefaultValueAsValue() {
// SetValueInternal is going to sanitize the value.
// TODO(mbrodesser): sanitizing will only happen if `mDoneCreating` is true.
return SetValueInternal(resetVal, TextControlState::eSetValue_Internal);
return SetValueInternal(resetVal, ValueSetterOption::ByInternalAPI);
}
void HTMLInputElement::SetDirectionFromValue(bool aNotify) {
@@ -5853,7 +5868,7 @@ void HTMLInputElement::DoneCreatingElement() {
// TODO: What should we do if SetValueInternal fails? (The allocation
// may potentially be big, but most likely we've failed to allocate
// before the type change.)
SetValueInternal(aValue, TextControlState::eSetValue_Internal);
SetValueInternal(aValue, ValueSetterOption::ByInternalAPI);
if (IsDateOrTime(mType)) {
// mFocusedValue has to be set here, so that `FireChangeEventIfNeeded` can
@@ -6031,8 +6046,9 @@ bool HTMLInputElement::RestoreState(PresState* aState) {
// TODO: What should we do if SetValueInternal fails? (The allocation
// may potentially be big, but most likely we've failed to allocate
// before the type change.)
SetValueInternal(inputState.get_TextContentData().value(),
TextControlState::eSetValue_Notify);
SetValueInternal(
inputState.get_TextContentData().value(),
ValueSetterOption::UpdateOverlayTextVisibilityAndInvalidateFrame);
if (inputState.get_TextContentData().lastValueChangeWasInteractive()) {
mLastValueChangeWasInteractive = true;
UpdateState(true);