Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1380)

Unified Diff: Source/web/TextFinder.cpp

Issue 200723002: Use new is*Element() helper functions more in web/ code (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Use same assertion as in operator->() Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/web/ContextMenuClientImpl.cpp ('k') | Source/web/WebFormControlElement.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/TextFinder.cpp
diff --git a/Source/web/TextFinder.cpp b/Source/web/TextFinder.cpp
index 2cfc3dd6c4eea3d03d51c515f1ae9b2d35b6ae89..a82113dc6a13561085255fe25f63bd083b32fe3b 100644
--- a/Source/web/TextFinder.cpp
+++ b/Source/web/TextFinder.cpp
@@ -2223,7 +2223,7 @@ WebFrameImpl* WebFrameImpl::fromFrame(LocalFrame* frame)
WebFrameImpl* WebFrameImpl::fromFrameOwnerElement(Element* element)
{
// FIXME: Why do we check specifically for <iframe> and <frame> here? Why can't we get the WebFrameImpl from an <object> element, for example.
- if (!element || !element->isFrameOwnerElement() || (!element->hasTagName(HTMLNames::iframeTag) && !element->hasTagName(HTMLNames::frameTag)))
+ if (!element || !element->isFrameOwnerElement() || (!isHTMLIFrameElement(*element) && !isHTMLFrameElement(*element)))
return 0;
return fromFrame(toHTMLFrameOwnerElement(element)->contentFrame());
}
@@ -2261,7 +2261,8 @@ void WebFrameImpl::setFindEndstateFocusAndSelection()
Node* node = m_activeMatch->firstNode();
if (node && node->isInShadowTree()) {
Node* host = node->deprecatedShadowAncestorNode();
- if (host->hasTagName(HTMLNames::inputTag) || host->hasTagName(HTMLNames::textareaTag))
+ ASSERT(host);
+ if (isHTMLInputElement(*host) || isHTMLTextAreaElement(*host))
node = host;
}
for (; node; node = node->parentNode()) {
« no previous file with comments | « Source/web/ContextMenuClientImpl.cpp ('k') | Source/web/WebFormControlElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698