diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-01-11 10:03:25 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-01-11 10:03:25 +0100 |
| commit | d11f84f5b5cdc0d92a08af01b13472fdd5f9acb9 (patch) | |
| tree | b318cf594dc1da2fa48224005945c9157f35bb41 /Source/WebCore/html/HTMLObjectElement.cpp | |
| parent | 6300a96eca9f152b379f1bcf3d9efdc5572d989a (diff) | |
| download | qtwebkit-d11f84f5b5cdc0d92a08af01b13472fdd5f9acb9.tar.gz | |
Imported WebKit commit 75bb2fc5882d2e1b3d5572c2961507996cbca5e3 (http://svn.webkit.org/repository/webkit/trunk@104681)
Diffstat (limited to 'Source/WebCore/html/HTMLObjectElement.cpp')
| -rw-r--r-- | Source/WebCore/html/HTMLObjectElement.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Source/WebCore/html/HTMLObjectElement.cpp b/Source/WebCore/html/HTMLObjectElement.cpp index e9bc36c24..3f9f77fb2 100644 --- a/Source/WebCore/html/HTMLObjectElement.cpp +++ b/Source/WebCore/html/HTMLObjectElement.cpp @@ -55,21 +55,15 @@ using namespace HTMLNames; inline HTMLObjectElement::HTMLObjectElement(const QualifiedName& tagName, Document* document, HTMLFormElement* form, bool createdByParser) : HTMLPlugInImageElement(tagName, document, createdByParser, ShouldNotPreferPlugInsForImages) - , FormAssociatedElement(form) , m_docNamedItem(true) , m_useFallbackContent(false) { ASSERT(hasTagName(objectTag)); - if (!this->form()) - setForm(findFormAncestor()); - if (this->form()) - this->form()->registerFormElement(this); + setForm(form ? form : findFormAncestor()); } inline HTMLObjectElement::~HTMLObjectElement() { - if (form()) - form()->removeFormElement(this); } PassRefPtr<HTMLObjectElement> HTMLObjectElement::create(const QualifiedName& tagName, Document* document, HTMLFormElement* form, bool createdByParser) |