| 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 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 346 LayoutUnit afterEdge = borderAfter() + paddingAfter() + scrollbarLogicalHeig
ht(); | 346 LayoutUnit afterEdge = borderAfter() + paddingAfter() + scrollbarLogicalHeig
ht(); |
| 347 LayoutUnit previousHeight = logicalHeight(); | 347 LayoutUnit previousHeight = logicalHeight(); |
| 348 setLogicalHeight(beforeEdge); | 348 setLogicalHeight(beforeEdge); |
| 349 | 349 |
| 350 m_repaintLogicalTop = 0; | 350 m_repaintLogicalTop = 0; |
| 351 m_repaintLogicalBottom = 0; | 351 m_repaintLogicalBottom = 0; |
| 352 LayoutUnit maxFloatLogicalBottom = 0; | 352 LayoutUnit maxFloatLogicalBottom = 0; |
| 353 if (!firstChild() && !isAnonymousBlock()) | 353 if (!firstChild() && !isAnonymousBlock()) |
| 354 setChildrenInline(true); | 354 setChildrenInline(true); |
| 355 | 355 |
| 356 FastTextAutosizer::LayoutScope fastTextAutosizerLayoutScope(document(), this
); | 356 FastTextAutosizer::LayoutScope fastTextAutosizerLayoutScope(this); |
| 357 | 357 |
| 358 if (childrenInline()) | 358 if (childrenInline()) |
| 359 layoutInlineChildren(relayoutChildren, m_repaintLogicalTop, m_repaintLog
icalBottom, afterEdge); | 359 layoutInlineChildren(relayoutChildren, m_repaintLogicalTop, m_repaintLog
icalBottom, afterEdge); |
| 360 else | 360 else |
| 361 layoutBlockChildren(relayoutChildren, maxFloatLogicalBottom, layoutScope
, beforeEdge, afterEdge); | 361 layoutBlockChildren(relayoutChildren, maxFloatLogicalBottom, layoutScope
, beforeEdge, afterEdge); |
| 362 | 362 |
| 363 if (frameView()->partialLayout().isStopping()) { | 363 if (frameView()->partialLayout().isStopping()) { |
| 364 statePusher.pop(); | 364 statePusher.pop(); |
| 365 return true; | 365 return true; |
| 366 } | 366 } |
| (...skipping 2465 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2832 RenderBlockFlow::RenderBlockFlowRareData& RenderBlockFlow::ensureRareData() | 2832 RenderBlockFlow::RenderBlockFlowRareData& RenderBlockFlow::ensureRareData() |
| 2833 { | 2833 { |
| 2834 if (m_rareData) | 2834 if (m_rareData) |
| 2835 return *m_rareData; | 2835 return *m_rareData; |
| 2836 | 2836 |
| 2837 m_rareData = adoptPtr(new RenderBlockFlowRareData(this)); | 2837 m_rareData = adoptPtr(new RenderBlockFlowRareData(this)); |
| 2838 return *m_rareData; | 2838 return *m_rareData; |
| 2839 } | 2839 } |
| 2840 | 2840 |
| 2841 } // namespace WebCore | 2841 } // namespace WebCore |
| OLD | NEW |