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

Timestamp:

Nov 4, 2013, 7:31:56 PM (12 years ago)

Author:

[email protected]

Message:

CTTE: RenderFrameBase's widget is always a FrameView.
<​https://webkit.org/b/123771>

Delete widget() from RenderFrameBase and supplant a childView()
that returns FrameView*. Strip away unnecessary casts and asserts.

Reviewed by Antti Koivisto.

File:

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

trunk/Source/WebCore/rendering/RenderIFrame.cpp

@@ -97 +97 @@
 RenderView* RenderIFrame::contentRootRenderer() const
 {
-    // FIXME: Is this always a valid cast? What about plugins?
-    ASSERT(!widget() || widget()->isFrameView());
-    FrameView* childFrameView = toFrameView(widget());
+    FrameView* childFrameView = childView();
     return childFrameView ? childFrameView->frame().contentRenderer() : 0;
 }
@@ -140 +138 @@
     // Replaced elements normally do not respect padding, but seamless elements should: we'll add
     // both padding and border to the child's logical height here.
-    FrameView* childFrameView = toFrameView(widget());
+    FrameView* childFrameView = childView();
     if (childFrameView) // Widget should never be null during layout(), but just in case.
         setLogicalHeight(childFrameView->contentsHeight() + borderTop() + borderBottom() + paddingTop() + paddingBottom());