From e78cbe89e6f337f2f1fe40315be88f742b547151 Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Wed, 26 May 2010 10:11:43 +0100
Subject: Merge WebKit at r60074: Initial merge by git

Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
---
 WebCore/html/HTMLOptionElement.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'WebCore/html/HTMLOptionElement.h')

diff --git a/WebCore/html/HTMLOptionElement.h b/WebCore/html/HTMLOptionElement.h
index 4255f25..4692119 100644
--- a/WebCore/html/HTMLOptionElement.h
+++ b/WebCore/html/HTMLOptionElement.h
@@ -29,9 +29,9 @@
 
 namespace WebCore {
 
-class HTMLSelectElement;
+class Attribute;
 class HTMLFormElement;
-class MappedAttribute;
+class HTMLSelectElement;
 
 class HTMLOptionElement : public HTMLFormControlElement, public OptionElement {
     friend class HTMLSelectElement;
@@ -59,7 +59,7 @@ public:
     void setText(const String&, ExceptionCode&);
 
     int index() const;
-    virtual void parseMappedAttribute(MappedAttribute*);
+    virtual void parseMappedAttribute(Attribute*);
 
     virtual String value() const;
     void setValue(const String&);
-- 
cgit v1.1