OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
301 setPaginationStrut(0); | 301 setPaginationStrut(0); |
302 } | 302 } |
303 | 303 |
304 SubtreeLayoutScope layoutScope(this); | 304 SubtreeLayoutScope layoutScope(this); |
305 | 305 |
306 LayoutUnit beforeEdge = borderBefore() + paddingBefore(); | 306 LayoutUnit beforeEdge = borderBefore() + paddingBefore(); |
307 LayoutUnit afterEdge = borderAfter() + paddingAfter() + scrollbarLogicalHeig
ht(); | 307 LayoutUnit afterEdge = borderAfter() + paddingAfter() + scrollbarLogicalHeig
ht(); |
308 LayoutUnit previousHeight = logicalHeight(); | 308 LayoutUnit previousHeight = logicalHeight(); |
309 setLogicalHeight(beforeEdge); | 309 setLogicalHeight(beforeEdge); |
310 | 310 |
311 FastTextAutosizer* textAutosizer = document().fastTextAutosizer(); | |
312 if (textAutosizer) | |
313 textAutosizer->beginLayout(this); | |
314 | |
315 m_repaintLogicalTop = 0; | 311 m_repaintLogicalTop = 0; |
316 m_repaintLogicalBottom = 0; | 312 m_repaintLogicalBottom = 0; |
317 LayoutUnit maxFloatLogicalBottom = 0; | 313 LayoutUnit maxFloatLogicalBottom = 0; |
318 if (!firstChild() && !isAnonymousBlock()) | 314 if (!firstChild() && !isAnonymousBlock()) |
319 setChildrenInline(true); | 315 setChildrenInline(true); |
| 316 |
| 317 FastTextAutosizer* textAutosizer = document().fastTextAutosizer(); |
| 318 if (textAutosizer) |
| 319 textAutosizer->beginLayout(this); |
| 320 |
320 if (childrenInline()) | 321 if (childrenInline()) |
321 layoutInlineChildren(relayoutChildren, m_repaintLogicalTop, m_repaintLog
icalBottom, afterEdge); | 322 layoutInlineChildren(relayoutChildren, m_repaintLogicalTop, m_repaintLog
icalBottom, afterEdge); |
322 else | 323 else |
323 layoutBlockChildren(relayoutChildren, maxFloatLogicalBottom, layoutScope
, beforeEdge, afterEdge); | 324 layoutBlockChildren(relayoutChildren, maxFloatLogicalBottom, layoutScope
, beforeEdge, afterEdge); |
324 | 325 |
325 if (textAutosizer) | 326 if (textAutosizer) |
326 textAutosizer->endLayout(this); | 327 textAutosizer->endLayout(this); |
327 | 328 |
328 if (frameView()->partialLayout().isStopping()) { | 329 if (frameView()->partialLayout().isStopping()) { |
329 statePusher.pop(); | 330 statePusher.pop(); |
(...skipping 2479 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2809 RenderBlockFlow::RenderBlockFlowRareData& RenderBlockFlow::ensureRareData() | 2810 RenderBlockFlow::RenderBlockFlowRareData& RenderBlockFlow::ensureRareData() |
2810 { | 2811 { |
2811 if (m_rareData) | 2812 if (m_rareData) |
2812 return *m_rareData; | 2813 return *m_rareData; |
2813 | 2814 |
2814 m_rareData = adoptPtr(new RenderBlockFlowRareData(this)); | 2815 m_rareData = adoptPtr(new RenderBlockFlowRareData(this)); |
2815 return *m_rareData; | 2816 return *m_rareData; |
2816 } | 2817 } |
2817 | 2818 |
2818 } // namespace WebCore | 2819 } // namespace WebCore |
OLD | NEW |