diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-11 09:43:24 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-11 09:43:24 +0200 |
| commit | 1b914638db989aaa98631a1c1e02c7b2d44805d8 (patch) | |
| tree | 87f4fd2c7b38db320079a5de8877890d2ca3c485 /Source/WebCore/html/HTMLKeygenElement.cpp | |
| parent | 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (diff) | |
| download | qtwebkit-1b914638db989aaa98631a1c1e02c7b2d44805d8.tar.gz | |
Imported WebKit commit 9a52e27980f47e8b0d8f8b7cc0fd7b5741bceb92 (http://svn.webkit.org/repository/webkit/trunk@116736)
New snapshot to include QDeclarative* -> QQml* build fixes
Diffstat (limited to 'Source/WebCore/html/HTMLKeygenElement.cpp')
| -rw-r--r-- | Source/WebCore/html/HTMLKeygenElement.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/WebCore/html/HTMLKeygenElement.cpp b/Source/WebCore/html/HTMLKeygenElement.cpp index b1099f197..db4d283fd 100644 --- a/Source/WebCore/html/HTMLKeygenElement.cpp +++ b/Source/WebCore/html/HTMLKeygenElement.cpp @@ -86,7 +86,7 @@ inline HTMLKeygenElement::HTMLKeygenElement(const QualifiedName& tagName, Docume option->appendChild(Text::create(document, keys[i]), ec); } - ASSERT(!hasShadowRoot()); + ASSERT(!shadow()); RefPtr<ShadowRoot> root = ShadowRoot::create(this, ShadowRoot::CreatingUserAgentShadowRoot); root->appendChild(select, ec); } @@ -131,7 +131,6 @@ void HTMLKeygenElement::reset() HTMLSelectElement* HTMLKeygenElement::shadowSelect() const { - ASSERT(hasShadowRoot()); ShadowRoot* root = this->shadow()->oldestShadowRoot(); return root ? toHTMLSelectElement(root->firstChild()) : 0; } |