| 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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 | 72 |
| 73 if (simplifiedLayout()) | 73 if (simplifiedLayout()) |
| 74 return; | 74 return; |
| 75 | 75 |
| 76 SubtreeLayoutScope layoutScope(*this); | 76 SubtreeLayoutScope layoutScope(*this); |
| 77 | 77 |
| 78 layoutBlockFlow(layoutScope); | 78 layoutBlockFlow(layoutScope); |
| 79 | 79 |
| 80 updateLayerTransformAfterLayout(); | 80 updateLayerTransformAfterLayout(); |
| 81 | 81 |
| 82 // Update our scroll information if we're overflow:auto/scroll/hidden now th
at we know if | |
| 83 // we overflow or not. | |
| 84 updateScrollInfoAfterLayout(); | |
| 85 | |
| 86 clearNeedsLayout(); | 82 clearNeedsLayout(); |
| 87 } | 83 } |
| 88 | 84 |
| 89 inline void RenderBlockFlow::layoutBlockFlow(SubtreeLayoutScope& layoutScope) | 85 inline void RenderBlockFlow::layoutBlockFlow(SubtreeLayoutScope& layoutScope) |
| 90 { | 86 { |
| 91 LayoutUnit oldLeft = logicalLeft(); | 87 LayoutUnit oldLeft = logicalLeft(); |
| 92 bool logicalWidthChanged = updateLogicalWidthAndColumnWidth(); | 88 bool logicalWidthChanged = updateLogicalWidthAndColumnWidth(); |
| 93 bool relayoutChildren = logicalWidthChanged; | 89 bool relayoutChildren = logicalWidthChanged; |
| 94 | 90 |
| 95 LayoutState state(*this, locationOffset(), logicalWidthChanged); | 91 LayoutState state(*this, locationOffset(), logicalWidthChanged); |
| (...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 359 float logicalLeft = logicalLeftOffsetForLine(false).toFloat(); | 355 float logicalLeft = logicalLeftOffsetForLine(false).toFloat(); |
| 360 float availableLogicalWidth = logicalRightOffsetForLine(false) - logicalLeft
; | 356 float availableLogicalWidth = logicalRightOffsetForLine(false) - logicalLeft
; |
| 361 updateLogicalWidthForAlignment(textAlign, 0, 0, logicalLeft, totalLogicalWid
th, availableLogicalWidth, 0); | 357 updateLogicalWidthForAlignment(textAlign, 0, 0, logicalLeft, totalLogicalWid
th, availableLogicalWidth, 0); |
| 362 | 358 |
| 363 if (!style()->isLeftToRightDirection()) | 359 if (!style()->isLeftToRightDirection()) |
| 364 return logicalWidth() - logicalLeft; | 360 return logicalWidth() - logicalLeft; |
| 365 return logicalLeft; | 361 return logicalLeft; |
| 366 } | 362 } |
| 367 | 363 |
| 368 } // namespace blink | 364 } // namespace blink |
| OLD | NEW |