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/html/HTMLEmbedElement.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/html/HTMLEmbedElement.cpp')
| -rw-r--r-- | WebCore/html/HTMLEmbedElement.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/html/HTMLEmbedElement.cpp b/WebCore/html/HTMLEmbedElement.cpp index eba980c..3f700ef 100644 --- a/WebCore/html/HTMLEmbedElement.cpp +++ b/WebCore/html/HTMLEmbedElement.cpp @@ -24,6 +24,7 @@ #include "config.h" #include "HTMLEmbedElement.h" +#include "Attribute.h" #include "CSSHelper.h" #include "CSSPropertyNames.h" #include "Frame.h" @@ -31,7 +32,6 @@ #include "HTMLImageLoader.h" #include "HTMLNames.h" #include "HTMLObjectElement.h" -#include "MappedAttribute.h" #include "RenderEmbeddedObject.h" #include "RenderImage.h" #include "RenderWidget.h" @@ -83,7 +83,7 @@ bool HTMLEmbedElement::mapToEntry(const QualifiedName& attrName, MappedAttribute return HTMLPlugInElement::mapToEntry(attrName, result); } -void HTMLEmbedElement::parseMappedAttribute(MappedAttribute* attr) +void HTMLEmbedElement::parseMappedAttribute(Attribute* attr) { const AtomicString& value = attr->value(); |