| 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 465 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 476 ASSERT(needsLayout()); | 476 ASSERT(needsLayout()); |
| 477 | 477 |
| 478 if (!relayoutChildren && simplifiedLayout()) | 478 if (!relayoutChildren && simplifiedLayout()) |
| 479 return; | 479 return; |
| 480 | 480 |
| 481 SubtreeLayoutScope layoutScope(*this); | 481 SubtreeLayoutScope layoutScope(*this); |
| 482 | 482 |
| 483 { | 483 { |
| 484 // LayoutState needs this deliberate scope to pop before updating scroll | 484 // LayoutState needs this deliberate scope to pop before updating scroll |
| 485 // information (which may trigger relayout). | 485 // information (which may trigger relayout). |
| 486 LayoutState state(*this, locationOffset()); | 486 LayoutState state(*this); |
| 487 | 487 |
| 488 LayoutSize previousSize = size(); | 488 LayoutSize previousSize = size(); |
| 489 | 489 |
| 490 // We need to clear both own and containingBlock override sizes to | 490 // We need to clear both own and containingBlock override sizes to |
| 491 // ensure we get the same result when grid's intrinsic size is | 491 // ensure we get the same result when grid's intrinsic size is |
| 492 // computed again in the updateLogicalWidth call bellow. | 492 // computed again in the updateLogicalWidth call bellow. |
| 493 if (sizesLogicalWidthToFitContent(styleRef().logicalWidth()) || | 493 if (sizesLogicalWidthToFitContent(styleRef().logicalWidth()) || |
| 494 styleRef().logicalWidth().isIntrinsicOrAuto()) { | 494 styleRef().logicalWidth().isIntrinsicOrAuto()) { |
| 495 for (auto* child = firstInFlowChildBox(); child; | 495 for (auto* child = firstInFlowChildBox(); child; |
| 496 child = child->nextInFlowSiblingBox()) { | 496 child = child->nextInFlowSiblingBox()) { |
| (...skipping 2835 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3332 if (!m_gridItemArea.isEmpty()) | 3332 if (!m_gridItemArea.isEmpty()) |
| 3333 GridPainter(*this).paintChildren(paintInfo, paintOffset); | 3333 GridPainter(*this).paintChildren(paintInfo, paintOffset); |
| 3334 } | 3334 } |
| 3335 | 3335 |
| 3336 bool LayoutGrid::cachedHasDefiniteLogicalHeight() const { | 3336 bool LayoutGrid::cachedHasDefiniteLogicalHeight() const { |
| 3337 SECURITY_DCHECK(m_hasDefiniteLogicalHeight); | 3337 SECURITY_DCHECK(m_hasDefiniteLogicalHeight); |
| 3338 return m_hasDefiniteLogicalHeight.value(); | 3338 return m_hasDefiniteLogicalHeight.value(); |
| 3339 } | 3339 } |
| 3340 | 3340 |
| 3341 } // namespace blink | 3341 } // namespace blink |
| OLD | NEW |