| 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 789 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 800 ASSERT(majorAxisPositions.isTranslatedDefinite()); | 800 ASSERT(majorAxisPositions.isTranslatedDefinite()); |
| 801 DCHECK(!grid.gridItemSpan(*autoGridItem, autoPlacementMinorAxisDirection()) | 801 DCHECK(!grid.gridItemSpan(*autoGridItem, autoPlacementMinorAxisDirection()) |
| 802 .isTranslatedDefinite()); | 802 .isTranslatedDefinite()); |
| 803 size_t minorAxisSpanSize = GridPositionsResolver::spanSizeForAutoPlacedItem( | 803 size_t minorAxisSpanSize = GridPositionsResolver::spanSizeForAutoPlacedItem( |
| 804 *style(), *autoGridItem, autoPlacementMinorAxisDirection()); | 804 *style(), *autoGridItem, autoPlacementMinorAxisDirection()); |
| 805 unsigned majorAxisInitialPosition = majorAxisPositions.startLine(); | 805 unsigned majorAxisInitialPosition = majorAxisPositions.startLine(); |
| 806 | 806 |
| 807 GridIterator iterator( | 807 GridIterator iterator( |
| 808 grid, autoPlacementMajorAxisDirection(), majorAxisPositions.startLine(), | 808 grid, autoPlacementMajorAxisDirection(), majorAxisPositions.startLine(), |
| 809 isGridAutoFlowDense ? 0 | 809 isGridAutoFlowDense ? 0 |
| 810 : minorAxisCursors.get(majorAxisInitialPosition)); | 810 : minorAxisCursors.at(majorAxisInitialPosition)); |
| 811 std::unique_ptr<GridArea> emptyGridArea = iterator.nextEmptyGridArea( | 811 std::unique_ptr<GridArea> emptyGridArea = iterator.nextEmptyGridArea( |
| 812 majorAxisPositions.integerSpan(), minorAxisSpanSize); | 812 majorAxisPositions.integerSpan(), minorAxisSpanSize); |
| 813 if (!emptyGridArea) { | 813 if (!emptyGridArea) { |
| 814 emptyGridArea = createEmptyGridAreaAtSpecifiedPositionsOutsideGrid( | 814 emptyGridArea = createEmptyGridAreaAtSpecifiedPositionsOutsideGrid( |
| 815 grid, *autoGridItem, autoPlacementMajorAxisDirection(), | 815 grid, *autoGridItem, autoPlacementMajorAxisDirection(), |
| 816 majorAxisPositions); | 816 majorAxisPositions); |
| 817 } | 817 } |
| 818 | 818 |
| 819 grid.insert(*autoGridItem, *emptyGridArea); | 819 grid.insert(*autoGridItem, *emptyGridArea); |
| 820 | 820 |
| (...skipping 1270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2091 if (direction == ForRows) | 2091 if (direction == ForRows) |
| 2092 return grid.numTracks(ForRows); | 2092 return grid.numTracks(ForRows); |
| 2093 | 2093 |
| 2094 return grid.numTracks(ForRows) | 2094 return grid.numTracks(ForRows) |
| 2095 ? grid.numTracks(ForColumns) | 2095 ? grid.numTracks(ForColumns) |
| 2096 : GridPositionsResolver::explicitGridColumnCount( | 2096 : GridPositionsResolver::explicitGridColumnCount( |
| 2097 styleRef(), grid.autoRepeatTracks(ForColumns)); | 2097 styleRef(), grid.autoRepeatTracks(ForColumns)); |
| 2098 } | 2098 } |
| 2099 | 2099 |
| 2100 } // namespace blink | 2100 } // namespace blink |
| OLD | NEW |