summaryrefslogtreecommitdiff
path: root/Source/WebCore/html/HTMLParamElement.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-03-12 14:11:15 +0100
committerSimon Hausmann <simon.hausmann@nokia.com>2012-03-12 14:11:15 +0100
commitdd91e772430dc294e3bf478c119ef8d43c0a3358 (patch)
tree6f33ce4d5872a5691e0291eb45bf6ab373a5f567 /Source/WebCore/html/HTMLParamElement.cpp
parentad0d549d4cc13433f77c1ac8f0ab379c83d93f28 (diff)
downloadqtwebkit-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/HTMLParamElement.cpp')
-rw-r--r--Source/WebCore/html/HTMLParamElement.cpp36
1 files changed, 13 insertions, 23 deletions
diff --git a/Source/WebCore/html/HTMLParamElement.cpp b/Source/WebCore/html/HTMLParamElement.cpp
index c0f919951..39df4641e 100644
--- a/Source/WebCore/html/HTMLParamElement.cpp
+++ b/Source/WebCore/html/HTMLParamElement.cpp
@@ -42,37 +42,27 @@ PassRefPtr<HTMLParamElement> HTMLParamElement::create(const QualifiedName& tagNa
return adoptRef(new HTMLParamElement(tagName, document));
}
-bool HTMLParamElement::isURLParameter(const String& name)
+String HTMLParamElement::name() const
{
- return equalIgnoringCase(name, "data") || equalIgnoringCase(name, "movie") || equalIgnoringCase(name, "src");
+ if (hasName())
+ return getNameAttribute();
+ return document()->isHTMLDocument() ? emptyAtom : getIdAttribute();
}
-void HTMLParamElement::parseAttribute(Attribute* attr)
+String HTMLParamElement::value() const
{
- if (isIdAttributeName(attr->name())) {
- // Must call base class so that hasID bit gets set.
- HTMLElement::parseAttribute(attr);
- if (document()->isHTMLDocument())
- return;
- m_name = attr->value();
- } else if (attr->name() == nameAttr) {
- m_name = attr->value();
- } else if (attr->name() == valueAttr) {
- m_value = attr->value();
- } else
- HTMLElement::parseAttribute(attr);
+ return fastGetAttribute(valueAttr);
+}
+
+bool HTMLParamElement::isURLParameter(const String& name)
+{
+ return equalIgnoringCase(name, "data") || equalIgnoringCase(name, "movie") || equalIgnoringCase(name, "src");
}
bool HTMLParamElement::isURLAttribute(Attribute* attr) const
{
- if (attr->name() == valueAttr && hasAttributes()) {
- Attribute* nameAttribute = getAttributeItem(nameAttr);
- if (nameAttribute) {
- const AtomicString& value = nameAttribute->value();
- if (isURLParameter(value))
- return true;
- }
- }
+ if (attr->name() == valueAttr && isURLParameter(name()))
+ return true;
return HTMLElement::isURLAttribute(attr);
}