OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 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 381 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
392 if (LogicalHeight() != previous_height) | 392 if (LogicalHeight() != previous_height) |
393 relayout_children = true; | 393 relayout_children = true; |
394 | 394 |
395 LayoutPositionedObjects(relayout_children || IsDocumentElement()); | 395 LayoutPositionedObjects(relayout_children || IsDocumentElement()); |
396 | 396 |
397 // FIXME: css3/flexbox/repaint-rtl-column.html seems to issue paint | 397 // FIXME: css3/flexbox/repaint-rtl-column.html seems to issue paint |
398 // invalidations for more overflow than it needs to. | 398 // invalidations for more overflow than it needs to. |
399 ComputeOverflow(ClientLogicalBottomAfterRepositioning()); | 399 ComputeOverflow(ClientLogicalBottomAfterRepositioning()); |
400 } | 400 } |
401 | 401 |
402 UpdateLayerTransformAfterLayout(); | |
403 | |
404 // We have to reset this, because changes to our ancestors' style can affect | 402 // We have to reset this, because changes to our ancestors' style can affect |
405 // this value. Also, this needs to be before we call updateAfterLayout, as | 403 // this value. Also, this needs to be before we call updateAfterLayout, as |
406 // that function may re-enter this one. | 404 // that function may re-enter this one. |
407 has_definite_height_ = SizeDefiniteness::kUnknown; | 405 has_definite_height_ = SizeDefiniteness::kUnknown; |
408 | 406 |
409 // Update our scroll information if we're overflow:auto/scroll/hidden now | 407 // Update our scroll information if we're overflow:auto/scroll/hidden now |
410 // that we know if we overflow or not. | 408 // that we know if we overflow or not. |
411 UpdateAfterLayout(); | 409 UpdateAfterLayout(); |
412 | 410 |
413 ClearNeedsLayout(); | 411 ClearNeedsLayout(); |
(...skipping 1788 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2202 LayoutUnit original_offset = | 2200 LayoutUnit original_offset = |
2203 line_contexts[line_number].cross_axis_offset - cross_axis_start_edge; | 2201 line_contexts[line_number].cross_axis_offset - cross_axis_start_edge; |
2204 LayoutUnit new_offset = | 2202 LayoutUnit new_offset = |
2205 content_extent - original_offset - line_cross_axis_extent; | 2203 content_extent - original_offset - line_cross_axis_extent; |
2206 AdjustAlignmentForChild(*flex_item.box, new_offset - original_offset); | 2204 AdjustAlignmentForChild(*flex_item.box, new_offset - original_offset); |
2207 } | 2205 } |
2208 } | 2206 } |
2209 } | 2207 } |
2210 | 2208 |
2211 } // namespace blink | 2209 } // namespace blink |
OLD | NEW |