| 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 867 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 878 } | 878 } |
| 879 | 879 |
| 880 // If there is any pagination to apply, it will affect the RenderView's styl
e, so we should | 880 // If there is any pagination to apply, it will affect the RenderView's styl
e, so we should |
| 881 // take care of that now. | 881 // take care of that now. |
| 882 applyPaginationToViewport(); | 882 applyPaginationToViewport(); |
| 883 | 883 |
| 884 // Always ensure our style info is up-to-date. This can happen in situations
where | 884 // Always ensure our style info is up-to-date. This can happen in situations
where |
| 885 // the layout beats any sort of style recalc update that needs to occur. | 885 // the layout beats any sort of style recalc update that needs to occur. |
| 886 TemporaryChange<bool> changeDoingPreLayoutStyleUpdate(m_doingPreLayoutStyleU
pdate, true); | 886 TemporaryChange<bool> changeDoingPreLayoutStyleUpdate(m_doingPreLayoutStyleU
pdate, true); |
| 887 document->updateStyleIfNeeded(); | 887 document->updateStyleIfNeeded(); |
| 888 | |
| 889 if (FastTextAutosizer* textAutosizer = document->fastTextAutosizer()) | |
| 890 textAutosizer->prepareForLayout(); | |
| 891 } | 888 } |
| 892 | 889 |
| 893 void FrameView::performLayout(RenderObject* rootForThisLayout, bool inSubtreeLay
out) | 890 void FrameView::performLayout(RenderObject* rootForThisLayout, bool inSubtreeLay
out) |
| 894 { | 891 { |
| 895 // performLayout is the actual guts of layout(). | 892 // performLayout is the actual guts of layout(). |
| 896 // FIXME: The 300 other lines in layout() probably belong in other helper fu
nctions | 893 // FIXME: The 300 other lines in layout() probably belong in other helper fu
nctions |
| 897 // so that a single human could understand what layout() is actually doing. | 894 // so that a single human could understand what layout() is actually doing. |
| 898 FrameView::DeferredRepaintScope deferRepaints(*this); | 895 FrameView::DeferredRepaintScope deferRepaints(*this); |
| 899 | 896 |
| 900 { | 897 { |
| (...skipping 2604 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3505 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) | 3502 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) |
| 3506 { | 3503 { |
| 3507 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); | 3504 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); |
| 3508 if (AXObjectCache* cache = axObjectCache()) { | 3505 if (AXObjectCache* cache = axObjectCache()) { |
| 3509 cache->remove(scrollbar); | 3506 cache->remove(scrollbar); |
| 3510 cache->handleScrollbarUpdate(this); | 3507 cache->handleScrollbarUpdate(this); |
| 3511 } | 3508 } |
| 3512 } | 3509 } |
| 3513 | 3510 |
| 3514 } // namespace WebCore | 3511 } // namespace WebCore |
| OLD | NEW |