| 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 1142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1153 case ItemPositionCenter: | 1153 case ItemPositionCenter: |
| 1154 return centeredColumnPositionForChild(child); | 1154 return centeredColumnPositionForChild(child); |
| 1155 case ItemPositionStart: | 1155 case ItemPositionStart: |
| 1156 return columnPositionAlignedWithGridContainerStart(child); | 1156 return columnPositionAlignedWithGridContainerStart(child); |
| 1157 case ItemPositionEnd: | 1157 case ItemPositionEnd: |
| 1158 return columnPositionAlignedWithGridContainerEnd(child); | 1158 return columnPositionAlignedWithGridContainerEnd(child); |
| 1159 | 1159 |
| 1160 case ItemPositionAuto: | 1160 case ItemPositionAuto: |
| 1161 case ItemPositionStretch: | 1161 case ItemPositionStretch: |
| 1162 case ItemPositionBaseline: | 1162 case ItemPositionBaseline: |
| 1163 case ItemPositionLastBaseline: |
| 1163 // FIXME: Implement the previous values. For now, we always start align
the child. | 1164 // FIXME: Implement the previous values. For now, we always start align
the child. |
| 1164 return startOfColumnForChild(child); | 1165 return startOfColumnForChild(child); |
| 1165 } | 1166 } |
| 1166 | 1167 |
| 1167 ASSERT_NOT_REACHED(); | 1168 ASSERT_NOT_REACHED(); |
| 1168 return 0; | 1169 return 0; |
| 1169 } | 1170 } |
| 1170 | 1171 |
| 1171 LayoutUnit RenderGrid::rowPositionForChild(const RenderBox* child) const | 1172 LayoutUnit RenderGrid::rowPositionForChild(const RenderBox* child) const |
| 1172 { | 1173 { |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1262 if (isOutOfFlowPositioned()) | 1263 if (isOutOfFlowPositioned()) |
| 1263 return "RenderGrid (positioned)"; | 1264 return "RenderGrid (positioned)"; |
| 1264 if (isAnonymous()) | 1265 if (isAnonymous()) |
| 1265 return "RenderGrid (generated)"; | 1266 return "RenderGrid (generated)"; |
| 1266 if (isRelPositioned()) | 1267 if (isRelPositioned()) |
| 1267 return "RenderGrid (relative positioned)"; | 1268 return "RenderGrid (relative positioned)"; |
| 1268 return "RenderGrid"; | 1269 return "RenderGrid"; |
| 1269 } | 1270 } |
| 1270 | 1271 |
| 1271 } // namespace WebCore | 1272 } // namespace WebCore |
| OLD | NEW |