| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2011 Apple 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 888 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 899 GridSizingData sizingData(gridColumnCount(), gridRowCount()); | 899 GridSizingData sizingData(gridColumnCount(), gridRowCount()); |
| 900 computeUsedBreadthOfGridTracks(ForColumns, sizingData); | 900 computeUsedBreadthOfGridTracks(ForColumns, sizingData); |
| 901 ASSERT(tracksAreWiderThanMinTrackBreadth(ForColumns, sizingData.columnTracks
)); | 901 ASSERT(tracksAreWiderThanMinTrackBreadth(ForColumns, sizingData.columnTracks
)); |
| 902 computeUsedBreadthOfGridTracks(ForRows, sizingData); | 902 computeUsedBreadthOfGridTracks(ForRows, sizingData); |
| 903 ASSERT(tracksAreWiderThanMinTrackBreadth(ForRows, sizingData.rowTracks)); | 903 ASSERT(tracksAreWiderThanMinTrackBreadth(ForRows, sizingData.rowTracks)); |
| 904 | 904 |
| 905 populateGridPositions(sizingData); | 905 populateGridPositions(sizingData); |
| 906 m_gridItemsOverflowingGridArea.resize(0); | 906 m_gridItemsOverflowingGridArea.resize(0); |
| 907 | 907 |
| 908 for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBo
x()) { | 908 for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBo
x()) { |
| 909 child->setMayNeedInvalidation(true); |
| 910 |
| 909 // Because the grid area cannot be styled, we don't need to adjust | 911 // Because the grid area cannot be styled, we don't need to adjust |
| 910 // the grid breadth to account for 'box-sizing'. | 912 // the grid breadth to account for 'box-sizing'. |
| 911 LayoutUnit oldOverrideContainingBlockContentLogicalWidth = child->hasOve
rrideContainingBlockLogicalWidth() ? child->overrideContainingBlockContentLogica
lWidth() : LayoutUnit(); | 913 LayoutUnit oldOverrideContainingBlockContentLogicalWidth = child->hasOve
rrideContainingBlockLogicalWidth() ? child->overrideContainingBlockContentLogica
lWidth() : LayoutUnit(); |
| 912 LayoutUnit oldOverrideContainingBlockContentLogicalHeight = child->hasOv
errideContainingBlockLogicalHeight() ? child->overrideContainingBlockContentLogi
calHeight() : LayoutUnit(); | 914 LayoutUnit oldOverrideContainingBlockContentLogicalHeight = child->hasOv
errideContainingBlockLogicalHeight() ? child->overrideContainingBlockContentLogi
calHeight() : LayoutUnit(); |
| 913 | 915 |
| 914 LayoutUnit overrideContainingBlockContentLogicalWidth = gridAreaBreadthF
orChild(child, ForColumns, sizingData.columnTracks); | 916 LayoutUnit overrideContainingBlockContentLogicalWidth = gridAreaBreadthF
orChild(child, ForColumns, sizingData.columnTracks); |
| 915 LayoutUnit overrideContainingBlockContentLogicalHeight = gridAreaBreadth
ForChild(child, ForRows, sizingData.rowTracks); | 917 LayoutUnit overrideContainingBlockContentLogicalHeight = gridAreaBreadth
ForChild(child, ForRows, sizingData.rowTracks); |
| 916 | 918 |
| 917 SubtreeLayoutScope layoutScope(*child); | 919 SubtreeLayoutScope layoutScope(*child); |
| 918 if (oldOverrideContainingBlockContentLogicalWidth != overrideContainingB
lockContentLogicalWidth || (oldOverrideContainingBlockContentLogicalHeight != ov
errideContainingBlockContentLogicalHeight && child->hasRelativeLogicalHeight())) | 920 if (oldOverrideContainingBlockContentLogicalWidth != overrideContainingB
lockContentLogicalWidth || (oldOverrideContainingBlockContentLogicalHeight != ov
errideContainingBlockContentLogicalHeight && child->hasRelativeLogicalHeight())) |
| (...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1225 if (isOutOfFlowPositioned()) | 1227 if (isOutOfFlowPositioned()) |
| 1226 return "RenderGrid (positioned)"; | 1228 return "RenderGrid (positioned)"; |
| 1227 if (isAnonymous()) | 1229 if (isAnonymous()) |
| 1228 return "RenderGrid (generated)"; | 1230 return "RenderGrid (generated)"; |
| 1229 if (isRelPositioned()) | 1231 if (isRelPositioned()) |
| 1230 return "RenderGrid (relative positioned)"; | 1232 return "RenderGrid (relative positioned)"; |
| 1231 return "RenderGrid"; | 1233 return "RenderGrid"; |
| 1232 } | 1234 } |
| 1233 | 1235 |
| 1234 } // namespace WebCore | 1236 } // namespace WebCore |
| OLD | NEW |