Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(86)

Side by Side Diff: Source/core/frame/FrameView.cpp

Issue 101543009: Make cluster creation independent of fingerprinting. Keep track of current (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@pdr-multiplier
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « LayoutTests/TestExpectations ('k') | Source/core/rendering/FastTextAutosizer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 848 matching lines...) Expand 10 before | Expand all | Expand 10 after
859 } 859 }
860 860
861 // If there is any pagination to apply, it will affect the RenderView's styl e, so we should 861 // If there is any pagination to apply, it will affect the RenderView's styl e, so we should
862 // take care of that now. 862 // take care of that now.
863 applyPaginationToViewport(); 863 applyPaginationToViewport();
864 864
865 // Always ensure our style info is up-to-date. This can happen in situations where 865 // Always ensure our style info is up-to-date. This can happen in situations where
866 // the layout beats any sort of style recalc update that needs to occur. 866 // the layout beats any sort of style recalc update that needs to occur.
867 TemporaryChange<bool> changeDoingPreLayoutStyleUpdate(m_doingPreLayoutStyleU pdate, true); 867 TemporaryChange<bool> changeDoingPreLayoutStyleUpdate(m_doingPreLayoutStyleU pdate, true);
868 document->updateStyleIfNeeded(); 868 document->updateStyleIfNeeded();
869
870 if (FastTextAutosizer* textAutosizer = document->fastTextAutosizer())
871 textAutosizer->prepareForLayout();
872 } 869 }
873 870
874 void FrameView::performLayout(RenderObject* rootForThisLayout, bool inSubtreeLay out) 871 void FrameView::performLayout(RenderObject* rootForThisLayout, bool inSubtreeLay out)
875 { 872 {
876 // performLayout is the actual guts of layout(). 873 // performLayout is the actual guts of layout().
877 // FIXME: The 300 other lines in layout() probably belong in other helper fu nctions 874 // FIXME: The 300 other lines in layout() probably belong in other helper fu nctions
878 // so that a single human could understand what layout() is actually doing. 875 // so that a single human could understand what layout() is actually doing.
879 FrameView::DeferredRepaintScope deferRepaints(*this); 876 FrameView::DeferredRepaintScope deferRepaints(*this);
880 877
881 { 878 {
(...skipping 2616 matching lines...) Expand 10 before | Expand all | Expand 10 after
3498 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation) 3495 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation)
3499 { 3496 {
3500 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); 3497 ScrollableArea::willRemoveScrollbar(scrollbar, orientation);
3501 if (AXObjectCache* cache = axObjectCache()) { 3498 if (AXObjectCache* cache = axObjectCache()) {
3502 cache->remove(scrollbar); 3499 cache->remove(scrollbar);
3503 cache->handleScrollbarUpdate(this); 3500 cache->handleScrollbarUpdate(this);
3504 } 3501 }
3505 } 3502 }
3506 3503
3507 } // namespace WebCore 3504 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/TestExpectations ('k') | Source/core/rendering/FastTextAutosizer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698