Commit 0496ea75 authored by bokan@chromium.org's avatar bokan@chromium.org

Removing remaining spurrious NULL checks on m_frame in FrameView

Amendment to CL: https://codereview.chromium.org/23483024

BUG=

Review URL: https://chromiumcodereview.appspot.com/23551010

git-svn-id: svn://svn.chromium.org/blink/trunk@157387 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent d14c7ab9
......@@ -230,12 +230,11 @@ FrameView::~FrameView()
ASSERT(!m_scrollCorner);
ASSERT(m_actionScheduler->isEmpty());
if (m_frame) {
ASSERT(m_frame->view() != this || !m_frame->contentRenderer());
RenderPart* renderer = m_frame->ownerRenderer();
if (renderer && renderer->widget() == this)
renderer->setWidget(0);
}
ASSERT(m_frame);
ASSERT(m_frame->view() != this || !m_frame->contentRenderer());
RenderPart* renderer = m_frame->ownerRenderer();
if (renderer && renderer->widget() == this)
renderer->setWidget(0);
}
void FrameView::reset()
......@@ -333,7 +332,7 @@ void FrameView::prepareForDetach()
// right now, otherwise it won't be able to reach the topDocument()'s axObject cache later.
removeFromAXObjectCache();
if (m_frame && m_frame->page()) {
if (m_frame->page()) {
if (ScrollingCoordinator* scrollingCoordinator = m_frame->page()->scrollingCoordinator())
scrollingCoordinator->willDestroyScrollableArea(this);
}
......@@ -381,10 +380,8 @@ void FrameView::clear()
reset();
if (m_frame) {
if (RenderPart* renderer = m_frame->ownerRenderer())
renderer->viewCleared();
}
if (RenderPart* renderer = m_frame->ownerRenderer())
renderer->viewCleared();
setScrollbarsSuppressed(true);
}
......@@ -2426,8 +2423,7 @@ void FrameView::setPagination(const Pagination& pagination)
m_pagination = pagination;
if (m_frame)
m_frame->document()->styleResolverChanged(RecalcStyleDeferred);
m_frame->document()->styleResolverChanged(RecalcStyleDeferred);
}
IntRect FrameView::windowClipRect(bool clipToContents) const
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment