Index: Source/web/WebFrameImpl.cpp |
diff --git a/Source/web/WebFrameImpl.cpp b/Source/web/WebFrameImpl.cpp |
index 93c0a0e7c0f4708cc34a5e43f2a97d4e5ce57c16..2ae40bb7766ff0b090d9d1f7b47ef51771632352 100644 |
--- a/Source/web/WebFrameImpl.cpp |
+++ b/Source/web/WebFrameImpl.cpp |
@@ -132,6 +132,7 @@ |
#include "core/frame/FrameView.h" |
#include "core/html/HTMLCollection.h" |
#include "core/html/HTMLFormElement.h" |
+#include "core/html/HTMLFrameElementBase.h" |
#include "core/html/HTMLFrameOwnerElement.h" |
#include "core/html/HTMLHeadElement.h" |
#include "core/html/HTMLInputElement.h" |
@@ -2226,7 +2227,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() || (!isHTMLIFrameElement(*element) && !isHTMLFrameElement(*element))) |
+ if (!isHTMLFrameElementBase(element) || !element->isFrameOwnerElement()) |
tkent
2014/03/17 22:30:25
Ditto.
Inactive
2014/03/17 23:36:59
Done.
|
return 0; |
return fromFrame(toHTMLFrameOwnerElement(element)->contentFrame()); |
} |