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 1312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1323 GridTrackSizingDirection direction, | 1323 GridTrackSizingDirection direction, |
1324 GridSizingData& sizingData) const { | 1324 GridSizingData& sizingData) const { |
1325 GridTrackSizingDirection childInlineDirection = | 1325 GridTrackSizingDirection childInlineDirection = |
1326 flowAwareDirectionForChild(child, ForColumns); | 1326 flowAwareDirectionForChild(child, ForColumns); |
1327 bool isRowAxis = direction == childInlineDirection; | 1327 bool isRowAxis = direction == childInlineDirection; |
1328 const Length& childSize = isRowAxis ? child.styleRef().logicalWidth() | 1328 const Length& childSize = isRowAxis ? child.styleRef().logicalWidth() |
1329 : child.styleRef().logicalHeight(); | 1329 : child.styleRef().logicalHeight(); |
1330 const Length& childMinSize = isRowAxis ? child.styleRef().logicalMinWidth() | 1330 const Length& childMinSize = isRowAxis ? child.styleRef().logicalMinWidth() |
1331 : child.styleRef().logicalMinHeight(); | 1331 : child.styleRef().logicalMinHeight(); |
1332 bool overflowIsVisible = | 1332 bool overflowIsVisible = |
1333 isRowAxis ? child.styleRef().overflowInlineDirection() == OverflowVisible | 1333 isRowAxis |
1334 : child.styleRef().overflowBlockDirection() == OverflowVisible; | 1334 ? child.styleRef().overflowInlineDirection() == EOverflow::Visible |
| 1335 : child.styleRef().overflowBlockDirection() == EOverflow::Visible; |
1335 if (!childSize.isAuto() || (childMinSize.isAuto() && overflowIsVisible)) | 1336 if (!childSize.isAuto() || (childMinSize.isAuto() && overflowIsVisible)) |
1336 return minContentForChild(child, direction, sizingData); | 1337 return minContentForChild(child, direction, sizingData); |
1337 | 1338 |
1338 bool overrideSizeHasChanged = | 1339 bool overrideSizeHasChanged = |
1339 updateOverrideContainingBlockContentSizeForChild( | 1340 updateOverrideContainingBlockContentSizeForChild( |
1340 child, childInlineDirection, sizingData); | 1341 child, childInlineDirection, sizingData); |
1341 if (isRowAxis) { | 1342 if (isRowAxis) { |
1342 LayoutUnit marginLogicalWidth = | 1343 LayoutUnit marginLogicalWidth = |
1343 sizingData.sizingOperation == TrackSizing | 1344 sizingData.sizingOperation == TrackSizing |
1344 ? computeMarginLogicalSizeForChild(InlineDirection, child) | 1345 ? computeMarginLogicalSizeForChild(InlineDirection, child) |
(...skipping 2253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3598 if (direction == ForRows) | 3599 if (direction == ForRows) |
3599 return grid.numTracks(ForRows); | 3600 return grid.numTracks(ForRows); |
3600 | 3601 |
3601 return grid.numTracks(ForRows) | 3602 return grid.numTracks(ForRows) |
3602 ? grid.numTracks(ForColumns) | 3603 ? grid.numTracks(ForColumns) |
3603 : GridPositionsResolver::explicitGridColumnCount( | 3604 : GridPositionsResolver::explicitGridColumnCount( |
3604 styleRef(), grid.autoRepeatTracks(ForColumns)); | 3605 styleRef(), grid.autoRepeatTracks(ForColumns)); |
3605 } | 3606 } |
3606 | 3607 |
3607 } // namespace blink | 3608 } // namespace blink |
OLD | NEW |