Changeset 174098 in webkit
- Timestamp:
- Sep 30, 2014 3:30:34 AM (10 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r174097 r174098 1 2014-09-29 Sergio Villar Senin <svillar@igalia.com> 2 3 [CSS Grid Layout] Use modern for-loops in RenderGrid 4 https://bugs.webkit.org/show_bug.cgi?id=137214 5 6 Reviewed by Darin Adler. 7 8 New code is already using modern range based for loops. We had some 9 "old" code pending to be migrated. 10 11 No new tests as there is no change in functionality. 12 13 * rendering/RenderGrid.cpp: 14 (WebCore::RenderGrid::computeIntrinsicLogicalWidths): 15 (WebCore::RenderGrid::computeUsedBreadthOfGridTracks): 16 (WebCore::RenderGrid::computeNormalizedFractionBreadth): 17 (WebCore::RenderGrid::populateExplicitGridAndOrderIterator): 18 (WebCore::RenderGrid::layoutGridItems): 19 1 20 2014-08-01 Sergio Villar Senin <svillar@igalia.com> 2 21 -
trunk/Source/WebCore/rendering/RenderGrid.cpp
r174057 r174098 248 248 const_cast<RenderGrid*>(this)->computeUsedBreadthOfGridTracks(ForColumns, sizingData, availableLogicalSpace); 249 249 250 for ( size_t i = 0; i < sizingData.columnTracks.size(); ++i) {251 LayoutUnit minTrackBreadth = sizingData.columnTracks[i].m_usedBreadth;252 LayoutUnit maxTrackBreadth = sizingData.columnTracks[i].m_maxBreadth;250 for (auto& column : sizingData.columnTracks) { 251 LayoutUnit minTrackBreadth = column.m_usedBreadth; 252 LayoutUnit maxTrackBreadth = column.m_maxBreadth; 253 253 maxTrackBreadth = std::max(maxTrackBreadth, minTrackBreadth); 254 254 … … 321 321 resolveContentBasedTrackSizingFunctions(direction, sizingData); 322 322 323 for ( size_t i = 0; i < tracks.size(); ++i) {324 ASSERT(track s[i].m_maxBreadth != infinity);325 availableLogicalSpace -= track s[i].m_usedBreadth;323 for (auto& track : tracks) { 324 ASSERT(track.m_maxBreadth != infinity); 325 availableLogicalSpace -= track.m_usedBreadth; 326 326 } 327 327 … … 333 333 // 3. Grow all Grid tracks in GridTracks from their UsedBreadth up to their MaxBreadth value until 334 334 // availableLogicalSpace (RemainingSpace in the specs) is exhausted. 335 const size_t tracksSize = tracks.size();336 335 if (!hasUndefinedRemainingSpace) { 336 const size_t tracksSize = tracks.size(); 337 337 Vector<GridTrack*> tracksForDistribution(tracksSize); 338 338 for (size_t i = 0; i < tracksSize; ++i) … … 341 341 distributeSpaceToTracks(tracksForDistribution, 0, &GridTrack::usedBreadth, &GridTrack::growUsedBreadth, sizingData, availableLogicalSpace); 342 342 } else { 343 for ( size_t i = 0; i < tracksSize; ++i)344 track s[i].m_usedBreadth = tracks[i].m_maxBreadth;343 for (auto& track : tracks) 344 track.m_usedBreadth = track.m_maxBreadth; 345 345 } 346 346 … … 353 353 normalizedFractionBreadth = computeNormalizedFractionBreadth(tracks, GridSpan(0, tracks.size() - 1), direction, availableLogicalSpace); 354 354 else { 355 for (size_t i = 0; i < flexibleSizedTracksIndex.size(); ++i) { 356 const size_t trackIndex = flexibleSizedTracksIndex[i]; 355 for (auto trackIndex : flexibleSizedTracksIndex) { 357 356 const GridTrackSize& trackSize = gridTrackSize(direction, trackIndex); 358 357 normalizedFractionBreadth = std::max(normalizedFractionBreadth, tracks[trackIndex].m_usedBreadth / trackSize.maxTrackBreadth().flex()); … … 375 374 } 376 375 377 for (size_t i = 0; i < flexibleSizedTracksIndex.size(); ++i) { 378 const size_t trackIndex = flexibleSizedTracksIndex[i]; 376 for (auto trackIndex : flexibleSizedTracksIndex) { 379 377 const GridTrackSize& trackSize = gridTrackSize(direction, trackIndex); 380 381 track s[trackIndex].m_usedBreadth = std::max<LayoutUnit>(tracks[trackIndex].m_usedBreadth, normalizedFractionBreadth * trackSize.maxTrackBreadth().flex());378 GridTrack& track = tracks[trackIndex]; 379 track.m_usedBreadth = std::max<LayoutUnit>(track.m_usedBreadth, normalizedFractionBreadth * trackSize.maxTrackBreadth().flex()); 382 380 } 383 381 } … … 448 446 LayoutUnit availableLogicalSpaceIgnoringFractionTracks = availableLogicalSpace; 449 447 450 for (size_t i = 0; i < tracksForNormalization.size(); ++i) { 451 const GridTrackForNormalization& track = tracksForNormalization[i]; 448 for (auto& track : tracksForNormalization) { 452 449 if (track.m_normalizedFlexValue > fractionValueBasedOnGridItemsRatio) { 453 450 // If the normalized flex value (we ordered |tracksForNormalization| by increasing normalized flex value) … … 781 778 782 779 m_grid.grow(maximumRowIndex); 783 for ( size_t i = 0; i < m_grid.size(); ++i)784 m_grid[i].grow(maximumColumnIndex);780 for (auto& column : m_grid) 781 column.grow(maximumColumnIndex); 785 782 } 786 783 … … 935 932 } 936 933 937 for ( size_t i = 0; i < sizingData.rowTracks.size(); ++i)938 setLogicalHeight(logicalHeight() + sizingData.rowTracks[i].m_usedBreadth);934 for (auto& row : sizingData.rowTracks) 935 setLogicalHeight(logicalHeight() + row.m_usedBreadth); 939 936 940 937 // min / max logical height is handled in updateLogicalHeight().
Note: See TracChangeset
for help on using the changeset viewer.