| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> | 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> |
| 3 * 1999 Lars Knoll <knoll@kde.org> | 3 * 1999 Lars Knoll <knoll@kde.org> |
| 4 * 1999 Antti Koivisto <koivisto@kde.org> | 4 * 1999 Antti Koivisto <koivisto@kde.org> |
| 5 * 2000 Dirk Mueller <mueller@kde.org> | 5 * 2000 Dirk Mueller <mueller@kde.org> |
| 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) | 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) |
| 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
| 9 * Copyright (C) 2009 Google Inc. All rights reserved. | 9 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 10 * | 10 * |
| (...skipping 760 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 771 } | 771 } |
| 772 | 772 |
| 773 ASSERT(m_frame->document()); | 773 ASSERT(m_frame->document()); |
| 774 if (m_nestedLayoutCount <= 1) { | 774 if (m_nestedLayoutCount <= 1) { |
| 775 if (m_firstLayoutCallbackPending) | 775 if (m_firstLayoutCallbackPending) |
| 776 m_firstLayoutCallbackPending = false; | 776 m_firstLayoutCallbackPending = false; |
| 777 } | 777 } |
| 778 | 778 |
| 779 FontFaceSet::didLayout(*m_frame->document()); | 779 FontFaceSet::didLayout(*m_frame->document()); |
| 780 | 780 |
| 781 if (Page* page = m_frame->page()) { | |
| 782 if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordina
tor()) | |
| 783 scrollingCoordinator->notifyLayoutUpdated(); | |
| 784 } | |
| 785 | |
| 786 sendResizeEventIfNeeded(); | 781 sendResizeEventIfNeeded(); |
| 787 } | 782 } |
| 788 | 783 |
| 789 bool FrameView::wasViewportResized() | 784 bool FrameView::wasViewportResized() |
| 790 { | 785 { |
| 791 ASSERT(m_frame); | 786 ASSERT(m_frame); |
| 792 RenderView* renderView = this->renderView(); | 787 RenderView* renderView = this->renderView(); |
| 793 if (!renderView) | 788 if (!renderView) |
| 794 return false; | 789 return false; |
| 795 return (layoutSize(IncludeScrollbars) != m_lastViewportSize || renderView->s
tyle()->zoom() != m_lastZoomFactor); | 790 return (layoutSize(IncludeScrollbars) != m_lastViewportSize || renderView->s
tyle()->zoom() != m_lastZoomFactor); |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 979 { | 974 { |
| 980 // Updating layout can run script, which can tear down the FrameView. | 975 // Updating layout can run script, which can tear down the FrameView. |
| 981 RefPtr<FrameView> protector(this); | 976 RefPtr<FrameView> protector(this); |
| 982 | 977 |
| 983 updateLayoutAndStyleIfNeededRecursive(); | 978 updateLayoutAndStyleIfNeededRecursive(); |
| 984 | 979 |
| 985 if (RenderView* view = renderView()) { | 980 if (RenderView* view = renderView()) { |
| 986 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Up
dateLayerTree", TRACE_EVENT_SCOPE_PROCESS, "frame", m_frame.get()); | 981 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Up
dateLayerTree", TRACE_EVENT_SCOPE_PROCESS, "frame", m_frame.get()); |
| 987 view->compositor()->updateIfNeededRecursive(); | 982 view->compositor()->updateIfNeededRecursive(); |
| 988 | 983 |
| 989 if (view->compositor()->inCompositingMode()) | |
| 990 m_frame->page()->scrollingCoordinator()->updateAfterCompositingChang
eIfNeeded(); | |
| 991 | |
| 992 updateCompositedSelectionBoundsIfNeeded(); | 984 updateCompositedSelectionBoundsIfNeeded(); |
| 993 | 985 |
| 994 invalidateTreeIfNeededRecursive(); | 986 invalidateTreeIfNeededRecursive(); |
| 995 } | 987 } |
| 996 | 988 |
| 997 ASSERT(lifecycle().state() == DocumentLifecycle::PaintInvalidationClean); | 989 ASSERT(lifecycle().state() == DocumentLifecycle::PaintInvalidationClean); |
| 998 } | 990 } |
| 999 | 991 |
| 1000 void FrameView::updateLayoutAndStyleIfNeededRecursive() | 992 void FrameView::updateLayoutAndStyleIfNeededRecursive() |
| 1001 { | 993 { |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1138 void FrameView::setLayoutSizeInternal(const IntSize& size) | 1130 void FrameView::setLayoutSizeInternal(const IntSize& size) |
| 1139 { | 1131 { |
| 1140 if (m_layoutSize == size) | 1132 if (m_layoutSize == size) |
| 1141 return; | 1133 return; |
| 1142 | 1134 |
| 1143 m_layoutSize = size; | 1135 m_layoutSize = size; |
| 1144 contentsResized(); | 1136 contentsResized(); |
| 1145 } | 1137 } |
| 1146 | 1138 |
| 1147 } // namespace blink | 1139 } // namespace blink |
| OLD | NEW |