diff options
| author | Steve Block <steveblock@google.com> | 2010-08-27 11:02:25 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-09-02 17:17:20 +0100 |
| commit | e8b154fd68f9b33be40a3590e58347f353835f5c (patch) | |
| tree | 0733ce26384183245aaa5656af26c653636fe6c1 /WebCore/html/HTMLFormControlElement.cpp | |
| parent | da56157816334089526a7a115a85fd85a6e9a1dc (diff) | |
| download | external_webkit-e8b154fd68f9b33be40a3590e58347f353835f5c.zip external_webkit-e8b154fd68f9b33be40a3590e58347f353835f5c.tar.gz external_webkit-e8b154fd68f9b33be40a3590e58347f353835f5c.tar.bz2 | |
Merge WebKit at r66079 : Initial merge by git
Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
Diffstat (limited to 'WebCore/html/HTMLFormControlElement.cpp')
| -rw-r--r-- | WebCore/html/HTMLFormControlElement.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/WebCore/html/HTMLFormControlElement.cpp b/WebCore/html/HTMLFormControlElement.cpp index ae1ac62..2080d91 100644 --- a/WebCore/html/HTMLFormControlElement.cpp +++ b/WebCore/html/HTMLFormControlElement.cpp @@ -39,7 +39,6 @@ #include "HTMLFormElement.h" #include "HTMLInputElement.h" #include "HTMLNames.h" -#include "LegacyHTMLTreeBuilder.h" #include "LabelsNodeList.h" #include "Page.h" #include "RenderBox.h" @@ -173,11 +172,7 @@ void HTMLFormControlElement::removedFromTree(bool deep) { // If the form and element are both in the same tree, preserve the connection to the form. // Otherwise, null out our form and remove ourselves from the form's list of elements. - LegacyHTMLTreeBuilder* treeBuilder = 0; - if (DocumentParser* parser = document()->parser()) - treeBuilder = parser->htmlTreeBuilder(); - - if (m_form && !(treeBuilder && treeBuilder->isHandlingResidualStyleAcrossBlocks()) && findRoot(this) != findRoot(m_form)) { + if (m_form && findRoot(this) != findRoot(m_form)) { m_form->removeFormElement(this); m_form = 0; } |