Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(153)

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

Issue 134013002: Upgrade align-self and align-items parsing to CSS 3 (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Really fix the tests Created 6 years, 11 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 LayoutUnit flowAwareMarginStartForChild(RenderBox* child) const; 110 LayoutUnit flowAwareMarginStartForChild(RenderBox* child) const;
111 LayoutUnit flowAwareMarginEndForChild(RenderBox* child) const; 111 LayoutUnit flowAwareMarginEndForChild(RenderBox* child) const;
112 LayoutUnit flowAwareMarginBeforeForChild(RenderBox* child) const; 112 LayoutUnit flowAwareMarginBeforeForChild(RenderBox* child) const;
113 LayoutUnit flowAwareMarginAfterForChild(RenderBox* child) const; 113 LayoutUnit flowAwareMarginAfterForChild(RenderBox* child) const;
114 LayoutUnit crossAxisMarginExtentForChild(RenderBox* child) const; 114 LayoutUnit crossAxisMarginExtentForChild(RenderBox* child) const;
115 LayoutUnit crossAxisScrollbarExtent() const; 115 LayoutUnit crossAxisScrollbarExtent() const;
116 LayoutPoint flowAwareLocationForChild(RenderBox* child) const; 116 LayoutPoint flowAwareLocationForChild(RenderBox* child) const;
117 // FIXME: Supporting layout deltas. 117 // FIXME: Supporting layout deltas.
118 void setFlowAwareLocationForChild(RenderBox* child, const LayoutPoint&); 118 void setFlowAwareLocationForChild(RenderBox* child, const LayoutPoint&);
119 void adjustAlignmentForChild(RenderBox* child, LayoutUnit); 119 void adjustAlignmentForChild(RenderBox* child, LayoutUnit);
120 EAlignItems alignmentForChild(RenderBox* child) const; 120 ItemPosition alignmentForChild(RenderBox* child) const;
121 LayoutUnit mainAxisBorderAndPaddingExtentForChild(RenderBox* child) const; 121 LayoutUnit mainAxisBorderAndPaddingExtentForChild(RenderBox* child) const;
122 LayoutUnit mainAxisScrollbarExtentForChild(RenderBox* child) const; 122 LayoutUnit mainAxisScrollbarExtentForChild(RenderBox* child) const;
123 LayoutUnit preferredMainAxisContentExtentForChild(RenderBox* child, bool has InfiniteLineLength); 123 LayoutUnit preferredMainAxisContentExtentForChild(RenderBox* child, bool has InfiniteLineLength);
124 124
125 void layoutFlexItems(bool relayoutChildren, Vector<LineContext>&); 125 void layoutFlexItems(bool relayoutChildren, Vector<LineContext>&);
126 LayoutUnit autoMarginOffsetInMainAxis(const OrderedFlexItemList&, LayoutUnit & availableFreeSpace); 126 LayoutUnit autoMarginOffsetInMainAxis(const OrderedFlexItemList&, LayoutUnit & availableFreeSpace);
127 void updateAutoMarginsInMainAxis(RenderBox* child, LayoutUnit autoMarginOffs et); 127 void updateAutoMarginsInMainAxis(RenderBox* child, LayoutUnit autoMarginOffs et);
128 bool hasAutoMarginsInCrossAxis(RenderBox* child) const; 128 bool hasAutoMarginsInCrossAxis(RenderBox* child) const;
129 bool updateAutoMarginsInCrossAxis(RenderBox* child, LayoutUnit availableAlig nmentSpace); 129 bool updateAutoMarginsInCrossAxis(RenderBox* child, LayoutUnit availableAlig nmentSpace);
130 void repositionLogicalHeightDependentFlexItems(Vector<LineContext>&); 130 void repositionLogicalHeightDependentFlexItems(Vector<LineContext>&);
(...skipping 27 matching lines...) Expand all
158 158
159 mutable OrderIterator m_orderIterator; 159 mutable OrderIterator m_orderIterator;
160 int m_numberOfInFlowChildrenOnFirstLine; 160 int m_numberOfInFlowChildrenOnFirstLine;
161 }; 161 };
162 162
163 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderFlexibleBox, isFlexibleBox()); 163 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderFlexibleBox, isFlexibleBox());
164 164
165 } // namespace WebCore 165 } // namespace WebCore
166 166
167 #endif // RenderFlexibleBox_h 167 #endif // RenderFlexibleBox_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698