diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-09 12:15:52 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-09 12:16:06 +0100 |
| commit | de4f791e30be4e4239b381c11745ffa4d87ddb8b (patch) | |
| tree | 885e3a5d6670828b454cf676b4d42f78e28b1f0e /Source/WebKit/chromium/src | |
| parent | b022df48697d40cdabdeafb2c29bb14fe489b6fe (diff) | |
| download | qtwebkit-de4f791e30be4e4239b381c11745ffa4d87ddb8b.tar.gz | |
Imported WebKit commit e2c32e2f53e02d388e70b9db88b91d8d9d28fc84 (http://svn.webkit.org/repository/webkit/trunk@133952)
Revert back to an older snapshot that should build on ARM
Diffstat (limited to 'Source/WebKit/chromium/src')
| -rw-r--r-- | Source/WebKit/chromium/src/WebElement.cpp | 7 | ||||
| -rw-r--r-- | Source/WebKit/chromium/src/WebPagePopupImpl.cpp | 1 |
2 files changed, 1 insertions, 7 deletions
diff --git a/Source/WebKit/chromium/src/WebElement.cpp b/Source/WebKit/chromium/src/WebElement.cpp index 96cf9791d..49fff0a07 100644 --- a/Source/WebKit/chromium/src/WebElement.cpp +++ b/Source/WebKit/chromium/src/WebElement.cpp @@ -66,13 +66,8 @@ bool WebElement::hasTagName(const WebString& tagName) const bool WebElement::hasHTMLTagName(const WebString& tagName) const { - // How to create class nodeName localName - // createElement('input') HTMLInputElement INPUT input - // createElement('INPUT') HTMLInputElement INPUT input - // createElementNS(xhtmlNS, 'input') HTMLInputElement INPUT input - // createElementNS(xhtmlNS, 'INPUT') HTMLUnknownElement INPUT INPUT const Element* element = constUnwrap<Element>(); - return HTMLNames::xhtmlNamespaceURI == element->namespaceURI() && element->localName() == String(tagName).lower(); + return HTMLNames::xhtmlNamespaceURI == element->namespaceURI() && equalIgnoringCase(element->tagName(), String(tagName)); } bool WebElement::hasAttribute(const WebString& attrName) const diff --git a/Source/WebKit/chromium/src/WebPagePopupImpl.cpp b/Source/WebKit/chromium/src/WebPagePopupImpl.cpp index d10022a51..01cacda2a 100644 --- a/Source/WebKit/chromium/src/WebPagePopupImpl.cpp +++ b/Source/WebKit/chromium/src/WebPagePopupImpl.cpp @@ -304,7 +304,6 @@ void WebPagePopupImpl::setFocus(bool enable) void WebPagePopupImpl::close() { - m_closing = true; if (m_page && m_page->mainFrame()) m_page->mainFrame()->loader()->frameDetached(); m_page.clear(); |