| OLD | NEW |
| 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 2112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2123 child.intrinsicContentLogicalHeight(); | 2123 child.intrinsicContentLogicalHeight(); |
| 2124 child.forceChildLayout(); | 2124 child.forceChildLayout(); |
| 2125 child.setIntrinsicContentLogicalHeight( | 2125 child.setIntrinsicContentLogicalHeight( |
| 2126 childIntrinsicContentLogicalHeight); | 2126 childIntrinsicContentLogicalHeight); |
| 2127 } | 2127 } |
| 2128 } else if (hasOrthogonalFlow(child) && | 2128 } else if (hasOrthogonalFlow(child) && |
| 2129 child.style()->logicalWidth().isAuto()) { | 2129 child.style()->logicalWidth().isAuto()) { |
| 2130 LayoutUnit childWidth = | 2130 LayoutUnit childWidth = |
| 2131 (lineCrossAxisExtent - crossAxisMarginExtentForChild(child)) | 2131 (lineCrossAxisExtent - crossAxisMarginExtentForChild(child)) |
| 2132 .clampNegativeToZero(); | 2132 .clampNegativeToZero(); |
| 2133 childWidth = | 2133 childWidth = child.constrainLogicalWidthByMinMax( |
| 2134 child.constrainLogicalWidthByMinMax(childWidth, childWidth, this); | 2134 childWidth, crossAxisContentExtent(), this); |
| 2135 | 2135 |
| 2136 if (childWidth != child.logicalWidth()) { | 2136 if (childWidth != child.logicalWidth()) { |
| 2137 child.setOverrideLogicalContentWidth( | 2137 child.setOverrideLogicalContentWidth( |
| 2138 childWidth - child.borderAndPaddingLogicalWidth()); | 2138 childWidth - child.borderAndPaddingLogicalWidth()); |
| 2139 child.forceChildLayout(); | 2139 child.forceChildLayout(); |
| 2140 } | 2140 } |
| 2141 } | 2141 } |
| 2142 } | 2142 } |
| 2143 | 2143 |
| 2144 void LayoutFlexibleBox::flipForRightToLeftColumn( | 2144 void LayoutFlexibleBox::flipForRightToLeftColumn( |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2180 LayoutUnit originalOffset = | 2180 LayoutUnit originalOffset = |
| 2181 lineContexts[lineNumber].crossAxisOffset - crossAxisStartEdge; | 2181 lineContexts[lineNumber].crossAxisOffset - crossAxisStartEdge; |
| 2182 LayoutUnit newOffset = | 2182 LayoutUnit newOffset = |
| 2183 contentExtent - originalOffset - lineCrossAxisExtent; | 2183 contentExtent - originalOffset - lineCrossAxisExtent; |
| 2184 adjustAlignmentForChild(*flexItem.box, newOffset - originalOffset); | 2184 adjustAlignmentForChild(*flexItem.box, newOffset - originalOffset); |
| 2185 } | 2185 } |
| 2186 } | 2186 } |
| 2187 } | 2187 } |
| 2188 | 2188 |
| 2189 } // namespace blink | 2189 } // namespace blink |
| OLD | NEW |