Changeset 154554 in webkit for trunk/Source/WebCore/rendering/RenderFrameSet.cpp

Timestamp:

Aug 24, 2013, 3:50:46 PM (12 years ago)

Author:

[email protected]

Message:

RenderObject::frame() should return a reference.
<​https://webkit.org/b/120251>

Reviewed by Darin Adler.

There is now always a Frame, and we can get to it by walking this path:

RenderObject -> Document -> RenderView -> FrameView -> Frame

Removed the customary horde of null checks.

File:

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

trunk/Source/WebCore/rendering/RenderFrameSet.cpp

@@ -645 +645 @@
 bool RenderFrameSet::flattenFrameSet() const
 {
-    return frame() && frame()->settings().frameFlatteningEnabled();
+    return frame().settings().frameFlatteningEnabled();
 }
 
@@ -713 +713 @@
             toRenderFrameSet(ancestor)->m_isChildResizing = isResizing;
     }
-    if (Frame* frame = this->frame())
-        frame->eventHandler().setResizingFrameSet(isResizing ? frameSet() : 0);
+    frame().eventHandler().setResizingFrameSet(isResizing ? frameSet() : 0);
 }