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

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

Issue 439063002: flexbox: incorrect flexbox height with overflow:auto on flex item (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Addressing the nit Created 6 years, 4 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
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 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 LayoutUnit flowAwareBorderAfter() const; 105 LayoutUnit flowAwareBorderAfter() const;
106 LayoutUnit flowAwarePaddingStart() const; 106 LayoutUnit flowAwarePaddingStart() const;
107 LayoutUnit flowAwarePaddingEnd() const; 107 LayoutUnit flowAwarePaddingEnd() const;
108 LayoutUnit flowAwarePaddingBefore() const; 108 LayoutUnit flowAwarePaddingBefore() const;
109 LayoutUnit flowAwarePaddingAfter() const; 109 LayoutUnit flowAwarePaddingAfter() const;
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 crossAxisMarginExtentForChild(RenderBox* child) const; 113 LayoutUnit crossAxisMarginExtentForChild(RenderBox* child) const;
114 LayoutUnit crossAxisScrollbarExtent() const; 114 LayoutUnit crossAxisScrollbarExtent() const;
115 LayoutUnit crossAxisScrollbarExtentForChild(RenderBox* child) const;
115 LayoutPoint flowAwareLocationForChild(RenderBox* child) const; 116 LayoutPoint flowAwareLocationForChild(RenderBox* child) const;
116 // FIXME: Supporting layout deltas. 117 // FIXME: Supporting layout deltas.
117 void setFlowAwareLocationForChild(RenderBox* child, const LayoutPoint&); 118 void setFlowAwareLocationForChild(RenderBox* child, const LayoutPoint&);
118 void adjustAlignmentForChild(RenderBox* child, LayoutUnit); 119 void adjustAlignmentForChild(RenderBox* child, LayoutUnit);
119 ItemPosition alignmentForChild(RenderBox* child) const; 120 ItemPosition alignmentForChild(RenderBox* child) const;
120 LayoutUnit mainAxisBorderAndPaddingExtentForChild(RenderBox* child) const; 121 LayoutUnit mainAxisBorderAndPaddingExtentForChild(RenderBox* child) const;
121 LayoutUnit preferredMainAxisContentExtentForChild(RenderBox* child, bool has InfiniteLineLength, bool relayoutChildren = false); 122 LayoutUnit preferredMainAxisContentExtentForChild(RenderBox* child, bool has InfiniteLineLength, bool relayoutChildren = false);
122 bool childPreferredMainAxisContentExtentRequiresLayout(RenderBox* child, boo l hasInfiniteLineLength) const; 123 bool childPreferredMainAxisContentExtentRequiresLayout(RenderBox* child, boo l hasInfiniteLineLength) const;
123 bool needToStretchChildLogicalHeight(RenderBox* child) const; 124 bool needToStretchChildLogicalHeight(RenderBox* child) const;
124 125
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 162
162 mutable OrderIterator m_orderIterator; 163 mutable OrderIterator m_orderIterator;
163 int m_numberOfInFlowChildrenOnFirstLine; 164 int m_numberOfInFlowChildrenOnFirstLine;
164 }; 165 };
165 166
166 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderFlexibleBox, isFlexibleBox()); 167 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderFlexibleBox, isFlexibleBox());
167 168
168 } // namespace blink 169 } // namespace blink
169 170
170 #endif // RenderFlexibleBox_h 171 #endif // RenderFlexibleBox_h
OLDNEW
« no previous file with comments | « LayoutTests/css3/flexbox/flexbox-height-with-overflow-auto-expected.txt ('k') | Source/core/rendering/RenderFlexibleBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698