Chromium Code Reviews| 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 847 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 858 } | 858 } |
| 859 | 859 |
| 860 // If there is any pagination to apply, it will affect the RenderView's styl e, so we should | 860 // If there is any pagination to apply, it will affect the RenderView's styl e, so we should |
| 861 // take care of that now. | 861 // take care of that now. |
| 862 applyPaginationToViewport(); | 862 applyPaginationToViewport(); |
| 863 | 863 |
| 864 // Always ensure our style info is up-to-date. This can happen in situations where | 864 // Always ensure our style info is up-to-date. This can happen in situations where |
| 865 // the layout beats any sort of style recalc update that needs to occur. | 865 // the layout beats any sort of style recalc update that needs to occur. |
| 866 TemporaryChange<bool> changeDoingPreLayoutStyleUpdate(m_doingPreLayoutStyleU pdate, true); | 866 TemporaryChange<bool> changeDoingPreLayoutStyleUpdate(m_doingPreLayoutStyleU pdate, true); |
| 867 document->updateStyleIfNeeded(); | 867 document->updateStyleIfNeeded(); |
| 868 | |
| 869 if (FastTextAutosizer* textAutosizer = document->fastTextAutosizer()) | |
| 870 textAutosizer->prepareForLayout(); | |
|
pdr.
2013/12/21 01:46:57
I think we still need a mechanism for calling setN
skobes
2014/01/07 03:12:37
I'm not sure I follow. There are three issues I c
| |
| 871 } | 868 } |
| 872 | 869 |
| 873 void FrameView::performLayout(RenderObject* rootForThisLayout, bool inSubtreeLay out) | 870 void FrameView::performLayout(RenderObject* rootForThisLayout, bool inSubtreeLay out) |
| 874 { | 871 { |
| 875 // performLayout is the actual guts of layout(). | 872 // performLayout is the actual guts of layout(). |
| 876 // FIXME: The 300 other lines in layout() probably belong in other helper fu nctions | 873 // FIXME: The 300 other lines in layout() probably belong in other helper fu nctions |
| 877 // so that a single human could understand what layout() is actually doing. | 874 // so that a single human could understand what layout() is actually doing. |
| 878 FrameView::DeferredRepaintScope deferRepaints(*this); | 875 FrameView::DeferredRepaintScope deferRepaints(*this); |
| 879 | 876 |
| 880 { | 877 { |
| (...skipping 2600 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3481 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation) | 3478 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation) |
| 3482 { | 3479 { |
| 3483 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); | 3480 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); |
| 3484 if (AXObjectCache* cache = axObjectCache()) { | 3481 if (AXObjectCache* cache = axObjectCache()) { |
| 3485 cache->remove(scrollbar); | 3482 cache->remove(scrollbar); |
| 3486 cache->handleScrollbarUpdate(this); | 3483 cache->handleScrollbarUpdate(this); |
| 3487 } | 3484 } |
| 3488 } | 3485 } |
| 3489 | 3486 |
| 3490 } // namespace WebCore | 3487 } // namespace WebCore |
| OLD | NEW |