diff options
Diffstat (limited to 'WebCore/page/FrameView.cpp')
| -rw-r--r-- | WebCore/page/FrameView.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/WebCore/page/FrameView.cpp b/WebCore/page/FrameView.cpp index 1508e07..dfbe7a2 100644 --- a/WebCore/page/FrameView.cpp +++ b/WebCore/page/FrameView.cpp @@ -694,8 +694,12 @@ void FrameView::layout(bool allowSubtree) RenderObject* rootRenderer = documentElement ? documentElement->renderer() : 0; Node* body = document->body(); if (body && body->renderer()) { +<<<<<<< HEAD if (body->hasTagName(framesetTag) && !m_frame->settings()->frameFlatteningEnabled()) { #if !defined(ANDROID_FLATTEN_IFRAME) && !defined(ANDROID_FLATTEN_FRAMESET) +======= + if (body->hasTagName(framesetTag) && m_frame->settings() && !m_frame->settings()->frameFlatteningEnabled()) { +>>>>>>> webkit.org at r62496 body->renderer()->setChildNeedsLayout(true); vMode = ScrollbarAlwaysOff; hMode = ScrollbarAlwaysOff; @@ -1372,7 +1376,7 @@ void FrameView::scheduleRelayout() // When frame flattening is enabled, the contents of the frame affects layout of the parent frames. // Also invalidate parent frame starting from the owner element of this frame. - if (m_frame->settings()->frameFlatteningEnabled() && m_frame->ownerRenderer()) { + if (m_frame->settings() && m_frame->settings()->frameFlatteningEnabled() && m_frame->ownerRenderer()) { if (m_frame->ownerElement()->hasTagName(iframeTag) || m_frame->ownerElement()->hasTagName(frameTag)) m_frame->ownerRenderer()->setNeedsLayout(true, true); } |