| Index: Source/core/html/HTMLInputElement.cpp
|
| diff --git a/Source/core/html/HTMLInputElement.cpp b/Source/core/html/HTMLInputElement.cpp
|
| index 227a24a89c46a55ec995ca9b291820265aa578e7..3c0ac3822c05859cea95485009eed4a0bc2efd0b 100644
|
| --- a/Source/core/html/HTMLInputElement.cpp
|
| +++ b/Source/core/html/HTMLInputElement.cpp
|
| @@ -298,14 +298,14 @@ Decimal HTMLInputElement::findClosestTickMarkValue(const Decimal& value)
|
| return m_inputType->findClosestTickMarkValue(value);
|
| }
|
|
|
| -void HTMLInputElement::stepUp(int n, ExceptionState& es)
|
| +void HTMLInputElement::stepUp(int n, ExceptionState& exceptionState)
|
| {
|
| - m_inputType->stepUp(n, es);
|
| + m_inputType->stepUp(n, exceptionState);
|
| }
|
|
|
| -void HTMLInputElement::stepDown(int n, ExceptionState& es)
|
| +void HTMLInputElement::stepDown(int n, ExceptionState& exceptionState)
|
| {
|
| - m_inputType->stepUp(-n, es);
|
| + m_inputType->stepUp(-n, exceptionState);
|
| }
|
|
|
| void HTMLInputElement::blur()
|
| @@ -515,73 +515,73 @@ bool HTMLInputElement::canHaveSelection() const
|
| return isTextField();
|
| }
|
|
|
| -int HTMLInputElement::selectionStartForBinding(ExceptionState& es) const
|
| +int HTMLInputElement::selectionStartForBinding(ExceptionState& exceptionState) const
|
| {
|
| if (!canHaveSelection()) {
|
| - es.throwUninformativeAndGenericDOMException(InvalidStateError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(InvalidStateError);
|
| return 0;
|
| }
|
| return HTMLTextFormControlElement::selectionStart();
|
| }
|
|
|
| -int HTMLInputElement::selectionEndForBinding(ExceptionState& es) const
|
| +int HTMLInputElement::selectionEndForBinding(ExceptionState& exceptionState) const
|
| {
|
| if (!canHaveSelection()) {
|
| - es.throwUninformativeAndGenericDOMException(InvalidStateError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(InvalidStateError);
|
| return 0;
|
| }
|
| return HTMLTextFormControlElement::selectionEnd();
|
| }
|
|
|
| -String HTMLInputElement::selectionDirectionForBinding(ExceptionState& es) const
|
| +String HTMLInputElement::selectionDirectionForBinding(ExceptionState& exceptionState) const
|
| {
|
| if (!canHaveSelection()) {
|
| - es.throwUninformativeAndGenericDOMException(InvalidStateError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(InvalidStateError);
|
| return String();
|
| }
|
| return HTMLTextFormControlElement::selectionDirection();
|
| }
|
|
|
| -void HTMLInputElement::setSelectionStartForBinding(int start, ExceptionState& es)
|
| +void HTMLInputElement::setSelectionStartForBinding(int start, ExceptionState& exceptionState)
|
| {
|
| if (!canHaveSelection()) {
|
| - es.throwUninformativeAndGenericDOMException(InvalidStateError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(InvalidStateError);
|
| return;
|
| }
|
| HTMLTextFormControlElement::setSelectionStart(start);
|
| }
|
|
|
| -void HTMLInputElement::setSelectionEndForBinding(int end, ExceptionState& es)
|
| +void HTMLInputElement::setSelectionEndForBinding(int end, ExceptionState& exceptionState)
|
| {
|
| if (!canHaveSelection()) {
|
| - es.throwUninformativeAndGenericDOMException(InvalidStateError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(InvalidStateError);
|
| return;
|
| }
|
| HTMLTextFormControlElement::setSelectionEnd(end);
|
| }
|
|
|
| -void HTMLInputElement::setSelectionDirectionForBinding(const String& direction, ExceptionState& es)
|
| +void HTMLInputElement::setSelectionDirectionForBinding(const String& direction, ExceptionState& exceptionState)
|
| {
|
| if (!canHaveSelection()) {
|
| - es.throwUninformativeAndGenericDOMException(InvalidStateError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(InvalidStateError);
|
| return;
|
| }
|
| HTMLTextFormControlElement::setSelectionDirection(direction);
|
| }
|
|
|
| -void HTMLInputElement::setSelectionRangeForBinding(int start, int end, ExceptionState& es)
|
| +void HTMLInputElement::setSelectionRangeForBinding(int start, int end, ExceptionState& exceptionState)
|
| {
|
| if (!canHaveSelection()) {
|
| - es.throwUninformativeAndGenericDOMException(InvalidStateError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(InvalidStateError);
|
| return;
|
| }
|
| HTMLTextFormControlElement::setSelectionRange(start, end);
|
| }
|
|
|
| -void HTMLInputElement::setSelectionRangeForBinding(int start, int end, const String& direction, ExceptionState& es)
|
| +void HTMLInputElement::setSelectionRangeForBinding(int start, int end, const String& direction, ExceptionState& exceptionState)
|
| {
|
| if (!canHaveSelection()) {
|
| - es.throwUninformativeAndGenericDOMException(InvalidStateError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(InvalidStateError);
|
| return;
|
| }
|
| HTMLTextFormControlElement::setSelectionRange(start, end, direction);
|
| @@ -994,10 +994,10 @@ void HTMLInputElement::setEditingValue(const String& value)
|
| dispatchInputEvent();
|
| }
|
|
|
| -void HTMLInputElement::setValue(const String& value, ExceptionState& es, TextFieldEventBehavior eventBehavior)
|
| +void HTMLInputElement::setValue(const String& value, ExceptionState& exceptionState, TextFieldEventBehavior eventBehavior)
|
| {
|
| if (isFileUpload() && !value.isEmpty()) {
|
| - es.throwUninformativeAndGenericDOMException(InvalidStateError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(InvalidStateError);
|
| return;
|
| }
|
| setValue(value, eventBehavior);
|
| @@ -1040,9 +1040,9 @@ double HTMLInputElement::valueAsDate() const
|
| return m_inputType->valueAsDate();
|
| }
|
|
|
| -void HTMLInputElement::setValueAsDate(double value, ExceptionState& es)
|
| +void HTMLInputElement::setValueAsDate(double value, ExceptionState& exceptionState)
|
| {
|
| - m_inputType->setValueAsDate(value, es);
|
| + m_inputType->setValueAsDate(value, exceptionState);
|
| }
|
|
|
| double HTMLInputElement::valueAsNumber() const
|
| @@ -1050,13 +1050,13 @@ double HTMLInputElement::valueAsNumber() const
|
| return m_inputType->valueAsDouble();
|
| }
|
|
|
| -void HTMLInputElement::setValueAsNumber(double newValue, ExceptionState& es, TextFieldEventBehavior eventBehavior)
|
| +void HTMLInputElement::setValueAsNumber(double newValue, ExceptionState& exceptionState, TextFieldEventBehavior eventBehavior)
|
| {
|
| if (!std::isfinite(newValue)) {
|
| - es.throwUninformativeAndGenericDOMException(NotSupportedError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(NotSupportedError);
|
| return;
|
| }
|
| - m_inputType->setValueAsDouble(newValue, eventBehavior, es);
|
| + m_inputType->setValueAsDouble(newValue, eventBehavior, exceptionState);
|
| }
|
|
|
| void HTMLInputElement::setValueFromRenderer(const String& value)
|
| @@ -1285,10 +1285,10 @@ int HTMLInputElement::maxLength() const
|
| return m_maxLength;
|
| }
|
|
|
| -void HTMLInputElement::setMaxLength(int maxLength, ExceptionState& es)
|
| +void HTMLInputElement::setMaxLength(int maxLength, ExceptionState& exceptionState)
|
| {
|
| if (maxLength < 0)
|
| - es.throwUninformativeAndGenericDOMException(IndexSizeError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(IndexSizeError);
|
| else
|
| setAttribute(maxlengthAttr, String::number(maxLength));
|
| }
|
| @@ -1303,10 +1303,10 @@ void HTMLInputElement::setSize(unsigned size)
|
| setAttribute(sizeAttr, String::number(size));
|
| }
|
|
|
| -void HTMLInputElement::setSize(unsigned size, ExceptionState& es)
|
| +void HTMLInputElement::setSize(unsigned size, ExceptionState& exceptionState)
|
| {
|
| if (!size)
|
| - es.throwUninformativeAndGenericDOMException(IndexSizeError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(IndexSizeError);
|
| else
|
| setSize(size);
|
| }
|
| @@ -1786,24 +1786,24 @@ void ListAttributeTargetObserver::idTargetChanged()
|
| m_element->listAttributeTargetChanged();
|
| }
|
|
|
| -void HTMLInputElement::setRangeText(const String& replacement, ExceptionState& es)
|
| +void HTMLInputElement::setRangeText(const String& replacement, ExceptionState& exceptionState)
|
| {
|
| if (!m_inputType->supportsSelectionAPI()) {
|
| - es.throwUninformativeAndGenericDOMException(InvalidStateError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(InvalidStateError);
|
| return;
|
| }
|
|
|
| - HTMLTextFormControlElement::setRangeText(replacement, es);
|
| + HTMLTextFormControlElement::setRangeText(replacement, exceptionState);
|
| }
|
|
|
| -void HTMLInputElement::setRangeText(const String& replacement, unsigned start, unsigned end, const String& selectionMode, ExceptionState& es)
|
| +void HTMLInputElement::setRangeText(const String& replacement, unsigned start, unsigned end, const String& selectionMode, ExceptionState& exceptionState)
|
| {
|
| if (!m_inputType->supportsSelectionAPI()) {
|
| - es.throwUninformativeAndGenericDOMException(InvalidStateError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(InvalidStateError);
|
| return;
|
| }
|
|
|
| - HTMLTextFormControlElement::setRangeText(replacement, start, end, selectionMode, es);
|
| + HTMLTextFormControlElement::setRangeText(replacement, start, end, selectionMode, exceptionState);
|
| }
|
|
|
| bool HTMLInputElement::setupDateTimeChooserParameters(DateTimeChooserParameters& parameters)
|
|
|