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/wml/WMLCardElement.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/wml/WMLCardElement.cpp')
| -rw-r--r-- | WebCore/wml/WMLCardElement.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/wml/WMLCardElement.cpp b/WebCore/wml/WMLCardElement.cpp index 45752cd..539dcd3 100644 --- a/WebCore/wml/WMLCardElement.cpp +++ b/WebCore/wml/WMLCardElement.cpp @@ -23,15 +23,15 @@ #if ENABLE(WML) #include "WMLCardElement.h" +#include "Attribute.h" #include "Frame.h" #include "FrameLoader.h" #include "HTMLNames.h" -#include "MappedAttribute.h" #include "NodeList.h" #include "Page.h" #include "RenderStyle.h" -#include "WMLDocument.h" #include "WMLDoElement.h" +#include "WMLDocument.h" #include "WMLInputElement.h" #include "WMLIntrinsicEventHandler.h" #include "WMLNames.h" @@ -209,7 +209,7 @@ void WMLCardElement::handleDeckLevelTaskOverridesIfNeeded() (*it)->setActive(!cardDoElementNames.contains((*it)->name())); } -void WMLCardElement::parseMappedAttribute(MappedAttribute* attr) +void WMLCardElement::parseMappedAttribute(Attribute* attr) { WMLIntrinsicEventType eventType = WMLIntrinsicEventUnknown; |