From 65f03d4f644ce73618e5f4f50dd694b26f55ae12 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Fri, 13 May 2011 16:23:25 +0100 Subject: Merge WebKit at r75993: Initial merge by git. Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3 --- Source/WebCore/wml/WMLInputElement.cpp | 10 +++++----- Source/WebCore/wml/WMLSelectElement.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'Source/WebCore/wml') diff --git a/Source/WebCore/wml/WMLInputElement.cpp b/Source/WebCore/wml/WMLInputElement.cpp index 2d7310a..687a387 100644 --- a/Source/WebCore/wml/WMLInputElement.cpp +++ b/Source/WebCore/wml/WMLInputElement.cpp @@ -142,7 +142,7 @@ String WMLInputElement::value() const return value; } -void WMLInputElement::setValue(const String& value, bool sendChangeEvent) +void WMLInputElement::setValue(const String& value, bool) { setFormControlValueMatchesRenderer(false); m_data.setValue(constrainValue(value)); @@ -161,7 +161,7 @@ void WMLInputElement::setValue(const String& value, bool sendChangeEvent) InputElement::notifyFormStateChanged(this); } -void WMLInputElement::setValueForUser(const String& value) +void WMLInputElement::setValueForUser(const String&) { /* InputElement class defines pure virtual function 'setValueForUser', which will be useful only in HTMLInputElement. Do nothing in 'WMLInputElement'. @@ -374,7 +374,7 @@ void WMLInputElement::initialize() if (!hasAttribute(WMLNames::emptyokAttr)) { if (m_formatMask.isEmpty() || // check if the format codes is just "*f" - (m_formatMask.length() == 2 && m_formatMask[0] == '*' && formatCodes().find(m_formatMask[1]) != -1)) + (m_formatMask.length() == 2 && m_formatMask[0] == '*' && formatCodes().find(m_formatMask[1]) != notFound)) m_isEmptyOk = true; } } @@ -389,11 +389,11 @@ String WMLInputElement::validateInputMask(const String& inputMask) for (unsigned i = 0; i < maskLength; ++i) { formatCode = inputMask[i]; - if (formatCodes().find(formatCode) == -1) { + if (formatCodes().find(formatCode) == notFound) { if (formatCode == '*' || (WTF::isASCIIDigit(formatCode) && formatCode != '0')) { // validate codes which ends with '*f' or 'nf' formatCode = inputMask[++i]; - if ((i + 1 != maskLength) || formatCodes().find(formatCode) == -1) { + if ((i + 1 != maskLength) || formatCodes().find(formatCode) == notFound) { isValid = false; break; } diff --git a/Source/WebCore/wml/WMLSelectElement.cpp b/Source/WebCore/wml/WMLSelectElement.cpp index 78749b3..a00edab 100644 --- a/Source/WebCore/wml/WMLSelectElement.cpp +++ b/Source/WebCore/wml/WMLSelectElement.cpp @@ -552,7 +552,7 @@ String WMLSelectElement::ivalue() const return parseValueSubstitutingVariableReferences(getAttribute(ivalueAttr)); } -void WMLSelectElement::listBoxSelectItem(int listIndex, bool allowMultiplySelections, bool shift, bool fireOnChangeNow) +void WMLSelectElement::listBoxSelectItem(int, bool, bool, bool) { /* Dummy implementation as listBoxSelectItem is pure virtual in SelectElement class */ } -- cgit v1.1