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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
97 | 97 |
98 layoutChildren(relayoutChildren, layoutScope, beforeEdge, afterEdge); | 98 layoutChildren(relayoutChildren, layoutScope, beforeEdge, afterEdge); |
99 | 99 |
100 LayoutUnit oldClientAfterEdge = clientLogicalBottom(); | 100 LayoutUnit oldClientAfterEdge = clientLogicalBottom(); |
101 | 101 |
102 updateLogicalHeight(); | 102 updateLogicalHeight(); |
103 | 103 |
104 if (previousHeight != logicalHeight()) | 104 if (previousHeight != logicalHeight()) |
105 relayoutChildren = true; | 105 relayoutChildren = true; |
106 | 106 |
107 layoutPositionedObjects(relayoutChildren || isDocumentElement(), oldLeft !=
logicalLeft() ? ForcedLayoutAfterContainingBlockMoved : DefaultLayout); | 107 layoutPositionedObjects(relayoutChildren, oldLeft != logicalLeft() ? ForcedL
ayoutAfterContainingBlockMoved : DefaultLayout); |
108 | 108 |
109 // Add overflow from children (unless we're multi-column, since in that case
all our child overflow is clipped anyway). | 109 // Add overflow from children (unless we're multi-column, since in that case
all our child overflow is clipped anyway). |
110 computeOverflow(oldClientAfterEdge); | 110 computeOverflow(oldClientAfterEdge); |
111 } | 111 } |
112 | 112 |
113 void RenderBlockFlow::determineLogicalLeftPositionForChild(RenderBox* child) | 113 void RenderBlockFlow::determineLogicalLeftPositionForChild(RenderBox* child) |
114 { | 114 { |
115 LayoutUnit startPosition = borderStart() + paddingStart(); | 115 LayoutUnit startPosition = borderStart() + paddingStart(); |
116 LayoutUnit totalAvailableLogicalWidth = borderAndPaddingLogicalWidth() + ava
ilableLogicalWidth(); | 116 LayoutUnit totalAvailableLogicalWidth = borderAndPaddingLogicalWidth() + ava
ilableLogicalWidth(); |
117 | 117 |
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
355 float logicalLeft = logicalLeftOffsetForLine(false).toFloat(); | 355 float logicalLeft = logicalLeftOffsetForLine(false).toFloat(); |
356 float availableLogicalWidth = logicalRightOffsetForLine(false) - logicalLeft
; | 356 float availableLogicalWidth = logicalRightOffsetForLine(false) - logicalLeft
; |
357 updateLogicalWidthForAlignment(textAlign, 0, 0, logicalLeft, totalLogicalWid
th, availableLogicalWidth, 0); | 357 updateLogicalWidthForAlignment(textAlign, 0, 0, logicalLeft, totalLogicalWid
th, availableLogicalWidth, 0); |
358 | 358 |
359 if (!style()->isLeftToRightDirection()) | 359 if (!style()->isLeftToRightDirection()) |
360 return logicalWidth() - logicalLeft; | 360 return logicalWidth() - logicalLeft; |
361 return logicalLeft; | 361 return logicalLeft; |
362 } | 362 } |
363 | 363 |
364 } // namespace blink | 364 } // namespace blink |
OLD | NEW |