summaryrefslogtreecommitdiffstats
path: root/WebCore/html/HTMLFormControlElement.h
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-05-26 10:11:43 +0100
committerSteve Block <steveblock@google.com>2010-05-27 11:14:42 +0100
commite78cbe89e6f337f2f1fe40315be88f742b547151 (patch)
treed778000b84a04f24bbad50c7fa66244365e960e9 /WebCore/html/HTMLFormControlElement.h
parent7b582e96e4e909ed7dba1e07153d20fbddaec3f7 (diff)
downloadexternal_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/html/HTMLFormControlElement.h')
-rw-r--r--WebCore/html/HTMLFormControlElement.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/html/HTMLFormControlElement.h b/WebCore/html/HTMLFormControlElement.h
index 5c13d24..befa67b 100644
--- a/WebCore/html/HTMLFormControlElement.h
+++ b/WebCore/html/HTMLFormControlElement.h
@@ -51,7 +51,7 @@ public:
virtual bool isTextFormControl() const { return false; }
virtual bool isEnabledFormControl() const { return !disabled(); }
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
virtual void attach();
virtual void insertedIntoTree(bool deep);
virtual void removedFromTree(bool deep);
@@ -189,7 +189,7 @@ protected:
void updatePlaceholderVisibility(bool);
virtual int cachedSelectionStart() const = 0;
virtual int cachedSelectionEnd() const = 0;
- virtual void parseMappedAttribute(MappedAttribute*);
+ virtual void parseMappedAttribute(Attribute*);
private:
// A subclass should return true if placeholder processing is needed.