diff options
| author | Steve Block <steveblock@google.com> | 2010-05-26 10:11:43 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-27 11:14:42 +0100 |
| commit | e78cbe89e6f337f2f1fe40315be88f742b547151 (patch) | |
| tree | d778000b84a04f24bbad50c7fa66244365e960e9 /WebCore/dom/InputElement.cpp | |
| parent | 7b582e96e4e909ed7dba1e07153d20fbddaec3f7 (diff) | |
| download | external_webkit-e78cbe89e6f337f2f1fe40315be88f742b547151.zip external_webkit-e78cbe89e6f337f2f1fe40315be88f742b547151.tar.gz external_webkit-e78cbe89e6f337f2f1fe40315be88f742b547151.tar.bz2 | |
Merge WebKit at r60074: Initial merge by git
Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
Diffstat (limited to 'WebCore/dom/InputElement.cpp')
| -rw-r--r-- | WebCore/dom/InputElement.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/dom/InputElement.cpp b/WebCore/dom/InputElement.cpp index 3459906..079dd56 100644 --- a/WebCore/dom/InputElement.cpp +++ b/WebCore/dom/InputElement.cpp @@ -31,6 +31,7 @@ #include "CSSStyleSelector.h" #endif +#include "Attribute.h" #include "Chrome.h" #include "ChromeClient.h" #include "Document.h" @@ -39,7 +40,6 @@ #include "Frame.h" #include "HTMLInputElement.h" #include "HTMLNames.h" -#include "MappedAttribute.h" #include "Page.h" #include "RenderTextControlSingleLine.h" #include "SelectionController.h" @@ -219,7 +219,7 @@ void InputElement::handleBeforeTextInsertedEvent(InputElementData& data, InputEl textEvent->setText(sanitizeUserInputValue(inputElement, textEvent->text(), appendableLength)); } -void InputElement::parseSizeAttribute(InputElementData& data, Element* element, MappedAttribute* attribute) +void InputElement::parseSizeAttribute(InputElementData& data, Element* element, Attribute* attribute) { data.setSize(attribute->isNull() ? InputElement::s_defaultSize : attribute->value().toInt()); @@ -227,7 +227,7 @@ void InputElement::parseSizeAttribute(InputElementData& data, Element* element, renderer->setNeedsLayoutAndPrefWidthsRecalc(); } -void InputElement::parseMaxLengthAttribute(InputElementData& data, InputElement* inputElement, Element* element, MappedAttribute* attribute) +void InputElement::parseMaxLengthAttribute(InputElementData& data, InputElement* inputElement, Element* element, Attribute* attribute) { int maxLength = attribute->isNull() ? InputElement::s_maximumLength : attribute->value().toInt(); if (maxLength <= 0 || maxLength > InputElement::s_maximumLength) |