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

Timestamp:

Sep 15, 2013, 5:52:58 AM (12 years ago)

Author:

[email protected]

Message:

CTTE: RenderWidgets are never anonymous.
<​https://webkit.org/b/121385>

Reviewed by Anders Carlsson.

Codify the following:

• RenderWidget always has an HTMLFrameOwnerElement.
• RenderEmbeddedObject always has an HTMLFrameOwnerElement.
• RenderSnapshottedPlugIn always has an HTMLPlugInImageElement.
• RenderFrame always has an HTMLFrameElement.
• RenderIFrame always has an HTMLIFrameElement.

None of these renderers are ever anonymous, so delete element() and provide
strongly typed reference getters instead.

File:

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

trunk/Source/WebCore/rendering/RenderIFrame.cpp

@@ -40 +40 @@
 using namespace HTMLNames;
     
-RenderIFrame::RenderIFrame(HTMLIFrameElement* element)
+RenderIFrame::RenderIFrame(HTMLIFrameElement& element)
     : RenderFrameBase(element)
 {
+}
+
+HTMLIFrameElement& RenderIFrame::iframeElement() const
+{
+    return toHTMLIFrameElement(RenderFrameBase::frameOwnerElement());
 }
 
@@ -82 +87 @@
 bool RenderIFrame::isSeamless() const
 {
-    return frameOwnerElement() && frameOwnerElement()->hasTagName(iframeTag) && toHTMLIFrameElement(frameOwnerElement())->shouldDisplaySeamlessly();
+    return iframeElement().shouldDisplaySeamlessly();
 }
 
@@ -100 +105 @@
 bool RenderIFrame::flattenFrame() const
 {
-    if (!frameOwnerElement() || !frameOwnerElement()->hasTagName(iframeTag))
-        return false;
-
-    HTMLIFrameElement* iFrameElement = toHTMLIFrameElement(frameOwnerElement());
-    Frame* frame = iFrameElement->document().frame();
+    Frame* frame = iframeElement().document().frame();
 
     if (isSeamless())
@@ -116 +117 @@
     if (style()->width().isFixed() && style()->height().isFixed()) {
         // Do not flatten iframes with scrolling="no".
-        if (iFrameElement->scrollingMode() == ScrollbarAlwaysOff)
+        if (iframeElement().scrollingMode() == ScrollbarAlwaysOff)
             return false;
         if (style()->width().value() <= 0 || style()->height().value() <= 0)