Source/core/rendering/RenderGrid.h - Issue 19661006: Revert last week's OrderIterator changes

Side by Side Diff: Source/core/rendering/RenderGrid.h

Issue 19661006: Revert last week's OrderIterator changes (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 7 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « Source/core/rendering/RenderFlexibleBox.cpp ('k') | Source/core/rendering/RenderGrid.cpp » ('j') | no next file with comments »

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 41 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
52 virtual void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) OVERRIDE;	52 virtual void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) OVERRIDE;

53	53

54 virtual bool avoidsFloats() const OVERRIDE { return true; }	54 virtual bool avoidsFloats() const OVERRIDE { return true; }

55 virtual bool canCollapseAnonymousBlockChild() const OVERRIDE { return false; }	55 virtual bool canCollapseAnonymousBlockChild() const OVERRIDE { return false; }

56	56

57 private:	57 private:

58 virtual bool isRenderGrid() const OVERRIDE { return true; }	58 virtual bool isRenderGrid() const OVERRIDE { return true; }

59 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Layo utUnit& maxLogicalWidth) const OVERRIDE;	59 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Layo utUnit& maxLogicalWidth) const OVERRIDE;

60 virtual void computePreferredLogicalWidths() OVERRIDE;	60 virtual void computePreferredLogicalWidths() OVERRIDE;

61	61

62 virtual void removeChild(RenderObject* child) OVERRIDE FINAL;

63

64 LayoutUnit computePreferredTrackWidth(const GridLength&, size_t) const;	62 LayoutUnit computePreferredTrackWidth(const GridLength&, size_t) const;

65	63

66 class GridIterator;	64 class GridIterator;

67 enum TrackSizingDirection { ForColumns, ForRows };	65 enum TrackSizingDirection { ForColumns, ForRows };

68 void computedUsedBreadthOfGridTracks(TrackSizingDirection, Vector<GridTrack> & columnTracks, Vector<GridTrack>& rowTracks);	66 void computedUsedBreadthOfGridTracks(TrackSizingDirection, Vector<GridTrack> & columnTracks, Vector<GridTrack>& rowTracks);

69 LayoutUnit computeUsedBreadthOfMinLength(TrackSizingDirection, const GridLen gth&) const;	67 LayoutUnit computeUsedBreadthOfMinLength(TrackSizingDirection, const GridLen gth&) const;

70 LayoutUnit computeUsedBreadthOfMaxLength(TrackSizingDirection, const GridLen gth&, LayoutUnit usedBreadth) const;	68 LayoutUnit computeUsedBreadthOfMaxLength(TrackSizingDirection, const GridLen gth&, LayoutUnit usedBreadth) const;

71 LayoutUnit computeUsedBreadthOfSpecifiedLength(TrackSizingDirection, const L ength&) const;	69 LayoutUnit computeUsedBreadthOfSpecifiedLength(TrackSizingDirection, const L ength&) const;

72 void resolveContentBasedTrackSizingFunctions(TrackSizingDirection, Vector<Gr idTrack>& columnTracks, Vector<GridTrack>& rowTracks, LayoutUnit& availableLogic alSpace);	70 void resolveContentBasedTrackSizingFunctions(TrackSizingDirection, Vector<Gr idTrack>& columnTracks, Vector<GridTrack>& rowTracks, LayoutUnit& availableLogic alSpace);

73	71

(...skipping 61 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
135 }	133 }

136	134

137 Vector<Vector<Vector<RenderBox*, 1> > > m_grid;	135 Vector<Vector<Vector<RenderBox*, 1> > > m_grid;

138 HashMap<const RenderBox*, GridCoordinate> m_gridItemCoordinate;	136 HashMap<const RenderBox*, GridCoordinate> m_gridItemCoordinate;

139 OrderIterator m_orderIterator;	137 OrderIterator m_orderIterator;

140 };	138 };

141	139

142 } // namespace WebCore	140 } // namespace WebCore

143	141

144 #endif // RenderGrid_h	142 #endif // RenderGrid_h

OLD	NEW