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 1115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1126 case ItemPositionCenter: | 1126 case ItemPositionCenter: |
1127 return centeredColumnPositionForChild(child); | 1127 return centeredColumnPositionForChild(child); |
1128 case ItemPositionStart: | 1128 case ItemPositionStart: |
1129 return columnPositionAlignedWithGridContainerStart(child); | 1129 return columnPositionAlignedWithGridContainerStart(child); |
1130 case ItemPositionEnd: | 1130 case ItemPositionEnd: |
1131 return columnPositionAlignedWithGridContainerEnd(child); | 1131 return columnPositionAlignedWithGridContainerEnd(child); |
1132 | 1132 |
1133 case ItemPositionAuto: | 1133 case ItemPositionAuto: |
1134 case ItemPositionStretch: | 1134 case ItemPositionStretch: |
1135 case ItemPositionBaseline: | 1135 case ItemPositionBaseline: |
| 1136 case ItemPositionLastBaseline: |
1136 // FIXME: Implement the previous values. For now, we always start align
the child. | 1137 // FIXME: Implement the previous values. For now, we always start align
the child. |
1137 return startOfColumnForChild(child); | 1138 return startOfColumnForChild(child); |
1138 } | 1139 } |
1139 | 1140 |
1140 ASSERT_NOT_REACHED(); | 1141 ASSERT_NOT_REACHED(); |
1141 return 0; | 1142 return 0; |
1142 } | 1143 } |
1143 | 1144 |
1144 LayoutUnit RenderGrid::rowPositionForChild(const RenderBox* child) const | 1145 LayoutUnit RenderGrid::rowPositionForChild(const RenderBox* child) const |
1145 { | 1146 { |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1235 if (isOutOfFlowPositioned()) | 1236 if (isOutOfFlowPositioned()) |
1236 return "RenderGrid (positioned)"; | 1237 return "RenderGrid (positioned)"; |
1237 if (isAnonymous()) | 1238 if (isAnonymous()) |
1238 return "RenderGrid (generated)"; | 1239 return "RenderGrid (generated)"; |
1239 if (isRelPositioned()) | 1240 if (isRelPositioned()) |
1240 return "RenderGrid (relative positioned)"; | 1241 return "RenderGrid (relative positioned)"; |
1241 return "RenderGrid"; | 1242 return "RenderGrid"; |
1242 } | 1243 } |
1243 | 1244 |
1244 } // namespace WebCore | 1245 } // namespace WebCore |
OLD | NEW |