Index: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp |
diff --git a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp |
index 7428894fcc501ea218c3a879b21f3205e2023bef..932bf11b21faaf11e7298c2918cee8f92adb9db0 100644 |
--- a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp |
+++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp |
@@ -1823,10 +1823,9 @@ WebLocalFrameImpl* WebLocalFrameImpl::fromFrame(LocalFrame& frame) |
WebLocalFrameImpl* WebLocalFrameImpl::fromFrameOwnerElement(Element* element) |
{ |
- // FIXME: Why do we check specifically for <iframe> and <frame> here? Why can't we get the WebLocalFrameImpl from an <object> element, for example. |
- if (!isHTMLFrameElementBase(element)) |
+ if (!element->isFrameOwnerElement()) |
return 0; |
- return fromFrame(toLocalFrame(toHTMLFrameElementBase(element)->contentFrame())); |
+ return fromFrame(toLocalFrame(toHTMLFrameOwnerElement(element)->contentFrame())); |
} |
WebViewImpl* WebLocalFrameImpl::viewImpl() const |