equal
deleted
inserted
replaced
296 } |
296 } |
297 |
297 |
298 void FrameView::layout(bool allowSubtree) |
298 void FrameView::layout(bool allowSubtree) |
299 { |
299 { |
300 #if PLATFORM(SYMBIAN) |
300 #if PLATFORM(SYMBIAN) |
301 OOM_PRE_CHECK(1024*1024*2, 0, "FrameView::layout") |
301 OOM_PRE_CHECK(1024*1024, 0, "FrameView::layout") |
302 #endif |
302 #endif |
303 if (d->midLayout) |
303 if (d->midLayout) |
304 return; |
304 return; |
305 |
305 |
306 d->layoutTimer.stop(); |
306 d->layoutTimer.stop(); |
717 return; |
717 return; |
718 |
718 |
719 if (!m_frame->document() || !m_frame->document()->shouldScheduleLayout()) |
719 if (!m_frame->document() || !m_frame->document()->shouldScheduleLayout()) |
720 return; |
720 return; |
721 |
721 |
|
722 if (!m_frame->settings()) |
|
723 return; |
|
724 |
722 // In flat frame layout mode the content of frame affects layout of the parent frames. |
725 // In flat frame layout mode the content of frame affects layout of the parent frames. |
723 // Invalidate also parent frame starting from the owner element of this frame. |
726 // Invalidate also parent frame starting from the owner element of this frame. |
724 #if PLATFORM(SYMBIAN) |
727 #if PLATFORM(SYMBIAN) |
725 if (m_frame->settings()->flatFrameSetLayoutEnabled() && m_frame->ownerRenderer() && m_frame->tree()->parent()->isFrameSet()) |
728 if (m_frame->settings()->flatFrameSetLayoutEnabled() && m_frame->ownerRenderer() && m_frame->tree()->parent()->isFrameSet()) |
726 #else |
729 #else |