summaryrefslogtreecommitdiff
path: root/Source/WebCore/html/HTMLKeygenElement.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-05-07 11:21:11 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2012-05-07 11:21:11 +0200
commit2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (patch)
tree988e8c5b116dd0466244ae2fe5af8ee9be926d76 /Source/WebCore/html/HTMLKeygenElement.cpp
parentdd91e772430dc294e3bf478c119ef8d43c0a3358 (diff)
downloadqtwebkit-2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47.tar.gz
Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)
Diffstat (limited to 'Source/WebCore/html/HTMLKeygenElement.cpp')
-rw-r--r--Source/WebCore/html/HTMLKeygenElement.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebCore/html/HTMLKeygenElement.cpp b/Source/WebCore/html/HTMLKeygenElement.cpp
index 80534419e..b1099f197 100644
--- a/Source/WebCore/html/HTMLKeygenElement.cpp
+++ b/Source/WebCore/html/HTMLKeygenElement.cpp
@@ -27,13 +27,13 @@
#include "Attribute.h"
#include "Document.h"
+#include "ElementShadow.h"
#include "FormDataList.h"
#include "HTMLNames.h"
#include "HTMLSelectElement.h"
#include "HTMLOptionElement.h"
#include "SSLKeyGenerator.h"
#include "ShadowRoot.h"
-#include "ShadowTree.h"
#include "Text.h"
#include <wtf/StdLibExtras.h>
@@ -81,7 +81,7 @@ inline HTMLKeygenElement::HTMLKeygenElement(const QualifiedName& tagName, Docume
RefPtr<HTMLSelectElement> select = KeygenSelectElement::create(document);
ExceptionCode ec = 0;
for (size_t i = 0; i < keys.size(); ++i) {
- RefPtr<HTMLOptionElement> option = HTMLOptionElement::create(document, this->form());
+ RefPtr<HTMLOptionElement> option = HTMLOptionElement::create(document);
select->appendChild(option, ec);
option->appendChild(Text::create(document, keys[i]), ec);
}
@@ -132,8 +132,8 @@ void HTMLKeygenElement::reset()
HTMLSelectElement* HTMLKeygenElement::shadowSelect() const
{
ASSERT(hasShadowRoot());
- ShadowRoot* shadow = shadowTree()->oldestShadowRoot();
- return shadow ? toHTMLSelectElement(shadow->firstChild()) : 0;
+ ShadowRoot* root = this->shadow()->oldestShadowRoot();
+ return root ? toHTMLSelectElement(root->firstChild()) : 0;
}
} // namespace