diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
| commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
| tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebCore/html/parser/HTMLElementStack.cpp | |
| parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
| download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 | |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebCore/html/parser/HTMLElementStack.cpp')
| -rw-r--r-- | WebCore/html/parser/HTMLElementStack.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/WebCore/html/parser/HTMLElementStack.cpp b/WebCore/html/parser/HTMLElementStack.cpp index 123778d..6b96291 100644 --- a/WebCore/html/parser/HTMLElementStack.cpp +++ b/WebCore/html/parser/HTMLElementStack.cpp @@ -113,6 +113,12 @@ inline bool isButtonScopeMarker(Element* element) || element->hasTagName(buttonTag); } +inline bool isSelectScopeMarker(Element* element) +{ + return !element->hasTagName(optgroupTag) + && !element->hasTagName(optionTag); +} + } HTMLElementStack::ElementRecord::ElementRecord(PassRefPtr<Element> element, PassOwnPtr<ElementRecord> next) @@ -486,6 +492,17 @@ bool HTMLElementStack::inButtonScope(const QualifiedName& tagName) const return inButtonScope(tagName.localName()); } +bool HTMLElementStack::inSelectScope(const AtomicString& targetTag) const +{ + return inScopeCommon<isSelectScopeMarker>(m_top.get(), targetTag); +} + +bool HTMLElementStack::inSelectScope(const QualifiedName& tagName) const +{ + // FIXME: Is localName() right for non-html elements? + return inSelectScope(tagName.localName()); +} + Element* HTMLElementStack::htmlElement() const { ASSERT(m_htmlElement); |