diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-30 11:37:48 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-30 11:38:52 +0200 |
| commit | 89e2486a48b739f8d771d69ede5a6a1b244a10fc (patch) | |
| tree | 503b1a7812cf97d93704c32437eb5f62dc1a1ff9 /Source/WebCore/html/HTMLObjectElement.cpp | |
| parent | 625f028249cb37c55bbbd153f3902afd0b0756d9 (diff) | |
| download | qtwebkit-89e2486a48b739f8d771d69ede5a6a1b244a10fc.tar.gz | |
Imported WebKit commit 0282df8ca7c11d8c8a66ea18543695c69f545a27 (http://svn.webkit.org/repository/webkit/trunk@124002)
New snapshot with prospective Mountain Lion build fix
Diffstat (limited to 'Source/WebCore/html/HTMLObjectElement.cpp')
| -rw-r--r-- | Source/WebCore/html/HTMLObjectElement.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Source/WebCore/html/HTMLObjectElement.cpp b/Source/WebCore/html/HTMLObjectElement.cpp index 8c5b817a2..5715d2382 100644 --- a/Source/WebCore/html/HTMLObjectElement.cpp +++ b/Source/WebCore/html/HTMLObjectElement.cpp @@ -26,6 +26,8 @@ #include "Attribute.h" #include "CSSValueKeywords.h" +#include "Chrome.h" +#include "ChromeClient.h" #include "EventNames.h" #include "ExceptionCode.h" #include "FormDataList.h" @@ -192,11 +194,11 @@ void HTMLObjectElement::parametersForPlugin(Vector<String>& paramNames, Vector<S // Turn the attributes of the <object> element into arrays, but don't override <param> values. if (hasAttributes()) { for (unsigned i = 0; i < attributeCount(); ++i) { - Attribute* it = attributeItem(i); - const AtomicString& name = it->name().localName(); + const Attribute* attribute = attributeItem(i); + const AtomicString& name = attribute->name().localName(); if (!uniqueParamNames.contains(name.impl())) { paramNames.append(name.string()); - paramValues.append(it->value().string()); + paramValues.append(attribute->value().string()); } } } @@ -392,9 +394,8 @@ static bool isRecognizedTagName(const QualifiedName& tagName) { DEFINE_STATIC_LOCAL(HashSet<AtomicStringImpl*>, tagList, ()); if (tagList.isEmpty()) { - size_t tagCount = 0; - QualifiedName** tags = HTMLNames::getHTMLTags(&tagCount); - for (size_t i = 0; i < tagCount; i++) { + QualifiedName** tags = HTMLNames::getHTMLTags(); + for (size_t i = 0; i < HTMLNames::HTMLTagsCount; i++) { if (*tags[i] == bgsoundTag || *tags[i] == commandTag || *tags[i] == detailsTag |