diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-03-12 14:11:15 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-03-12 14:11:15 +0100 |
commit | dd91e772430dc294e3bf478c119ef8d43c0a3358 (patch) | |
tree | 6f33ce4d5872a5691e0291eb45bf6ab373a5f567 /Source/WebCore/html/HTMLObjectElement.cpp | |
parent | ad0d549d4cc13433f77c1ac8f0ab379c83d93f28 (diff) | |
download | qtwebkit-dd91e772430dc294e3bf478c119ef8d43c0a3358.tar.gz |
Imported WebKit commit 3db4eb1820ac8fb03065d7ea73a4d9db1e8fea1a (http://svn.webkit.org/repository/webkit/trunk@110422)
This includes build fixes for the latest qtbase/qtdeclarative as well as the final QML2 API.
Diffstat (limited to 'Source/WebCore/html/HTMLObjectElement.cpp')
-rw-r--r-- | Source/WebCore/html/HTMLObjectElement.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebCore/html/HTMLObjectElement.cpp b/Source/WebCore/html/HTMLObjectElement.cpp index 406a3eb3e..635042fee 100644 --- a/Source/WebCore/html/HTMLObjectElement.cpp +++ b/Source/WebCore/html/HTMLObjectElement.cpp @@ -77,11 +77,11 @@ RenderWidget* HTMLObjectElement::renderWidgetForJSBindings() return renderPart(); // This will return 0 if the renderer is not a RenderPart. } -bool HTMLObjectElement::isPresentationAttribute(Attribute* attr) const +bool HTMLObjectElement::isPresentationAttribute(const QualifiedName& name) const { - if (attr->name() == borderAttr) + if (name == borderAttr) return true; - return HTMLPlugInImageElement::isPresentationAttribute(attr); + return HTMLPlugInImageElement::isPresentationAttribute(name); } void HTMLObjectElement::collectStyleForAttribute(Attribute* attr, StylePropertySet* style) |