diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-09 14:16:12 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-09 14:16:12 +0100 |
| commit | 03e12282df9aa1e1fb05a8b90f1cfc2e08764cec (patch) | |
| tree | 52599cd0ab782b1768e23ad176f7618f98333cb6 /Source/WebKit/qt/Api/qwebelement.cpp | |
| parent | cd44dc59cdfc39534aef4d417e9f3c412e3be139 (diff) | |
| download | qtwebkit-03e12282df9aa1e1fb05a8b90f1cfc2e08764cec.tar.gz | |
Imported WebKit commit e09a82039aa4273ab318b71122e92d8e5f233525 (http://svn.webkit.org/repository/webkit/trunk@107223)
Diffstat (limited to 'Source/WebKit/qt/Api/qwebelement.cpp')
| -rw-r--r-- | Source/WebKit/qt/Api/qwebelement.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Source/WebKit/qt/Api/qwebelement.cpp b/Source/WebKit/qt/Api/qwebelement.cpp index 771ad56fb..178c70e5b 100644 --- a/Source/WebKit/qt/Api/qwebelement.cpp +++ b/Source/WebKit/qt/Api/qwebelement.cpp @@ -22,7 +22,6 @@ #include "qwebelement_p.h" #include "CSSComputedStyleDeclaration.h" -#include "CSSMutableStyleDeclaration.h" #include "CSSParser.h" #include "CSSRule.h" #include "CSSRuleList.h" @@ -33,6 +32,7 @@ #include "FrameView.h" #include "GraphicsContext.h" #include "HTMLElement.h" +#include "StylePropertySet.h" #if USE(JSC) #include "Completion.h" #include "JSGlobalObject.h" @@ -503,12 +503,11 @@ QStringList QWebElement::attributeNames(const QString& namespaceUri) const return QStringList(); QStringList attributeNameList; - const NamedNodeMap* const attrs = m_element->updatedAttributes(); - if (attrs) { + if (m_element->hasAttributes()) { const String namespaceUriString(namespaceUri); // convert QString -> String once - const unsigned attrsCount = attrs->length(); + const unsigned attrsCount = m_element->attributeCount(); for (unsigned i = 0; i < attrsCount; ++i) { - const Attribute* const attribute = attrs->attributeItem(i); + const Attribute* const attribute = m_element->attributeItem(i); if (namespaceUriString == attribute->namespaceURI()) attributeNameList.append(attribute->localName()); } @@ -844,7 +843,7 @@ QString QWebElement::styleProperty(const QString &name, StyleResolveStrategy str if (!propID) return QString(); - CSSMutableStyleDeclaration* style = static_cast<StyledElement*>(m_element)->ensureInlineStyleDecl(); + StylePropertySet* style = static_cast<StyledElement*>(m_element)->ensureInlineStyleDecl(); if (strategy == InlineStyle) return style->getPropertyValue(propID); @@ -909,7 +908,7 @@ void QWebElement::setStyleProperty(const QString &name, const QString &value) return; int propID = cssPropertyID(name); - CSSMutableStyleDeclaration* style = static_cast<StyledElement*>(m_element)->ensureInlineStyleDecl(); + StylePropertySet* style = static_cast<StyledElement*>(m_element)->ensureInlineStyleDecl(); if (!propID || !style) return; |