| 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 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 262 bool IsDescentBaselineForChild(const LayoutBox&, GridAxis) const; | 262 bool IsDescentBaselineForChild(const LayoutBox&, GridAxis) const; |
| 263 | 263 |
| 264 LayoutUnit MarginOverForChild(const LayoutBox&, GridAxis) const; | 264 LayoutUnit MarginOverForChild(const LayoutBox&, GridAxis) const; |
| 265 LayoutUnit MarginUnderForChild(const LayoutBox&, GridAxis) const; | 265 LayoutUnit MarginUnderForChild(const LayoutBox&, GridAxis) const; |
| 266 LayoutUnit LogicalAscentForChild(const LayoutBox&, GridAxis) const; | 266 LayoutUnit LogicalAscentForChild(const LayoutBox&, GridAxis) const; |
| 267 LayoutUnit AscentForChild(const LayoutBox&, GridAxis) const; | 267 LayoutUnit AscentForChild(const LayoutBox&, GridAxis) const; |
| 268 LayoutUnit DescentForChild(const LayoutBox&, | 268 LayoutUnit DescentForChild(const LayoutBox&, |
| 269 LayoutUnit ascent, | 269 LayoutUnit ascent, |
| 270 GridAxis) const; | 270 GridAxis) const; |
| 271 | 271 |
| 272 bool BaselineMayAffectIntrinsicWidth() const; | 272 bool BaselineMayAffectIntrinsicSize(GridTrackSizingDirection) const; |
| 273 bool BaselineMayAffectIntrinsicHeight() const; | |
| 274 void ComputeBaselineAlignmentContext(); | 273 void ComputeBaselineAlignmentContext(); |
| 275 void UpdateBaselineAlignmentContextIfNeeded(LayoutBox&, GridAxis); | 274 void UpdateBaselineAlignmentContextIfNeeded(LayoutBox&, GridAxis); |
| 276 | 275 |
| 277 LayoutUnit ColumnAxisBaselineOffsetForChild(const LayoutBox&) const; | 276 LayoutUnit ColumnAxisBaselineOffsetForChild(const LayoutBox&) const; |
| 278 LayoutUnit RowAxisBaselineOffsetForChild(const LayoutBox&) const; | 277 LayoutUnit RowAxisBaselineOffsetForChild(const LayoutBox&) const; |
| 279 | 278 |
| 280 LayoutUnit GridGap(GridTrackSizingDirection, | 279 LayoutUnit GridGap(GridTrackSizingDirection, |
| 281 Optional<LayoutUnit> available_size) const; | 280 Optional<LayoutUnit> available_size) const; |
| 282 LayoutUnit GridGap(GridTrackSizingDirection) const; | 281 LayoutUnit GridGap(GridTrackSizingDirection) const; |
| 283 | 282 |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 320 LayoutUnit max_content_height_{-1}; | 319 LayoutUnit max_content_height_{-1}; |
| 321 | 320 |
| 322 Optional<bool> has_definite_logical_height_; | 321 Optional<bool> has_definite_logical_height_; |
| 323 }; | 322 }; |
| 324 | 323 |
| 325 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutGrid, IsLayoutGrid()); | 324 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutGrid, IsLayoutGrid()); |
| 326 | 325 |
| 327 } // namespace blink | 326 } // namespace blink |
| 328 | 327 |
| 329 #endif // LayoutGrid_h | 328 #endif // LayoutGrid_h |
| OLD | NEW |