Changeset 155598 in webkit for trunk/Source/WebCore/rendering/RenderIFrame.cpp

Timestamp:

Sep 12, 2013, 2:12:29 AM (12 years ago)

Author:

[email protected]

Message:

RenderWidget elements are always HTMLFrameOwnerElement subclasses.
<​https://webkit.org/b/121217>

Reviewed by Antti Koivisto.

Make RenderWidget constructor take HTMLFrameOwnerElement* and update subclasses
with even tighter types where possible.

Also added RenderWidget::frameOwnerElement() and deleted element().
Removed a handful of unnecessary type checks that were exposed by this.

File:

• trunk/Source/WebCore/rendering/RenderIFrame.cpp (modified) (3 diffs)

trunk/Source/WebCore/rendering/RenderIFrame.cpp

@@ -40 +40 @@
 using namespace HTMLNames;
     
-RenderIFrame::RenderIFrame(Element* element)
+RenderIFrame::RenderIFrame(HTMLIFrameElement* element)
     : RenderFrameBase(element)
 {
@@ -82 +82 @@
 bool RenderIFrame::isSeamless() const
 {
-    return element() && element()->hasTagName(iframeTag) && toHTMLIFrameElement(element())->shouldDisplaySeamlessly();
+    return frameOwnerElement() && frameOwnerElement()->hasTagName(iframeTag) && toHTMLIFrameElement(frameOwnerElement())->shouldDisplaySeamlessly();
 }
 
@@ -100 +100 @@
 bool RenderIFrame::flattenFrame() const
 {
-    if (!element() || !element()->hasTagName(iframeTag))
+    if (!frameOwnerElement() || !frameOwnerElement()->hasTagName(iframeTag))
         return false;
 
-    HTMLIFrameElement* iFrameElement = toHTMLIFrameElement(element());
+    HTMLIFrameElement* iFrameElement = toHTMLIFrameElement(frameOwnerElement());
     Frame* frame = iFrameElement->document().frame();