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

Side by Side Diff: Source/core/rendering/RenderBlockLineLayout.cpp

Issue 138143004: [FastTextAutosizer] Refactor FTA::inflate() to be internal to FTA (Closed) Base URL: svn://svn.chromium.org/blink/trunk
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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ight reserved. 3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ight reserved.
4 * Copyright (C) 2010 Google Inc. All rights reserved. 4 * Copyright (C) 2010 Google Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 1620 matching lines...) Expand 10 before | Expand all | Expand 10 after
1631 f->setShouldDoFullRepaintAfterLayout(true); 1631 f->setShouldDoFullRepaintAfterLayout(true);
1632 else 1632 else
1633 f->repaint(); 1633 f->repaint();
1634 } 1634 }
1635 } 1635 }
1636 } 1636 }
1637 } 1637 }
1638 1638
1639 void RenderBlockFlow::layoutInlineChildren(bool relayoutChildren, LayoutUnit& re paintLogicalTop, LayoutUnit& repaintLogicalBottom, LayoutUnit afterEdge) 1639 void RenderBlockFlow::layoutInlineChildren(bool relayoutChildren, LayoutUnit& re paintLogicalTop, LayoutUnit& repaintLogicalBottom, LayoutUnit afterEdge)
1640 { 1640 {
1641 if (FastTextAutosizer* textAutosizer = document().fastTextAutosizer())
1642 textAutosizer->inflate(this);
1643
1644 // Lay out our hypothetical grid line as though it occurs at the top of the block. 1641 // Lay out our hypothetical grid line as though it occurs at the top of the block.
1645 if (view()->layoutState() && view()->layoutState()->lineGrid() == this) 1642 if (view()->layoutState() && view()->layoutState()->lineGrid() == this)
1646 layoutLineGridBox(); 1643 layoutLineGridBox();
1647 1644
1648 RenderFlowThread* flowThread = flowThreadContainingBlock(); 1645 RenderFlowThread* flowThread = flowThreadContainingBlock();
1649 bool clearLinesForPagination = firstLineBox() && flowThread && !flowThread-> hasRegions(); 1646 bool clearLinesForPagination = firstLineBox() && flowThread && !flowThread-> hasRegions();
1650 1647
1651 // Figure out if we should clear out our line boxes. 1648 // Figure out if we should clear out our line boxes.
1652 // FIXME: Handle resize eventually! 1649 // FIXME: Handle resize eventually!
1653 bool isFullLayout = !firstLineBox() || selfNeedsLayout() || relayoutChildren || clearLinesForPagination; 1650 bool isFullLayout = !firstLineBox() || selfNeedsLayout() || relayoutChildren || clearLinesForPagination;
(...skipping 679 matching lines...) Expand 10 before | Expand all | Expand 10 after
2333 lineGridBox->alignBoxesInBlockDirection(logicalHeight(), textBoxDataMap, ver ticalPositionCache); 2330 lineGridBox->alignBoxesInBlockDirection(logicalHeight(), textBoxDataMap, ver ticalPositionCache);
2334 2331
2335 setLineGridBox(lineGridBox); 2332 setLineGridBox(lineGridBox);
2336 2333
2337 // FIXME: If any of the characteristics of the box change compared to the ol d one, then we need to do a deep dirtying 2334 // FIXME: If any of the characteristics of the box change compared to the ol d one, then we need to do a deep dirtying
2338 // (similar to what happens when the page height changes). Ideally, though, we only do this if someone is actually snapping 2335 // (similar to what happens when the page height changes). Ideally, though, we only do this if someone is actually snapping
2339 // to this grid. 2336 // to this grid.
2340 } 2337 }
2341 2338
2342 } 2339 }
OLDNEW
« Source/core/rendering/FastTextAutosizer.cpp ('K') | « Source/core/rendering/RenderBlockFlow.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698