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 2832 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2843 void FrameView::updateLayoutAndStyleForPainting() | 2843 void FrameView::updateLayoutAndStyleForPainting() |
2844 { | 2844 { |
2845 // Updating layout can run script, which can tear down the FrameView. | 2845 // Updating layout can run script, which can tear down the FrameView. |
2846 RefPtr<FrameView> protector(this); | 2846 RefPtr<FrameView> protector(this); |
2847 | 2847 |
2848 updateLayoutAndStyleIfNeededRecursive(); | 2848 updateLayoutAndStyleIfNeededRecursive(); |
2849 | 2849 |
2850 if (RenderView* view = renderView()) { | 2850 if (RenderView* view = renderView()) { |
2851 InspectorInstrumentation::willUpdateLayerTree(view->frame()); | 2851 InspectorInstrumentation::willUpdateLayerTree(view->frame()); |
2852 | 2852 |
| 2853 setCurrentScreenId(reinterpret_cast<long long>(m_frame->page())); |
| 2854 |
2853 view->compositor()->updateIfNeededRecursive(); | 2855 view->compositor()->updateIfNeededRecursive(); |
2854 | 2856 |
2855 if (view->compositor()->inCompositingMode() && m_frame->isMainFrame()) | 2857 if (view->compositor()->inCompositingMode() && m_frame->isMainFrame()) |
2856 m_frame->page()->scrollingCoordinator()->updateAfterCompositingChang
eIfNeeded(); | 2858 m_frame->page()->scrollingCoordinator()->updateAfterCompositingChang
eIfNeeded(); |
2857 | 2859 |
| 2860 setCurrentScreenId(0); |
| 2861 |
2858 InspectorInstrumentation::didUpdateLayerTree(view->frame()); | 2862 InspectorInstrumentation::didUpdateLayerTree(view->frame()); |
2859 } | 2863 } |
2860 | 2864 |
2861 scrollContentsIfNeededRecursive(); | 2865 scrollContentsIfNeededRecursive(); |
2862 } | 2866 } |
2863 | 2867 |
2864 void FrameView::updateLayoutAndStyleIfNeededRecursive() | 2868 void FrameView::updateLayoutAndStyleIfNeededRecursive() |
2865 { | 2869 { |
2866 // We have to crawl our entire tree looking for any FrameViews that need | 2870 // We have to crawl our entire tree looking for any FrameViews that need |
2867 // layout and make sure they are up to date. | 2871 // layout and make sure they are up to date. |
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3295 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) | 3299 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) |
3296 { | 3300 { |
3297 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); | 3301 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); |
3298 if (AXObjectCache* cache = axObjectCache()) { | 3302 if (AXObjectCache* cache = axObjectCache()) { |
3299 cache->remove(scrollbar); | 3303 cache->remove(scrollbar); |
3300 cache->handleScrollbarUpdate(this); | 3304 cache->handleScrollbarUpdate(this); |
3301 } | 3305 } |
3302 } | 3306 } |
3303 | 3307 |
3304 } // namespace WebCore | 3308 } // namespace WebCore |
OLD | NEW |