diff --git a/Source/WebCore/layout/formattingContexts/inline/invalidation/InlineDamage.h b/Source/WebCore/layout/formattingContexts/inline/invalidation/InlineDamage.h index 02686e5bedde4..ee15d4654b57f 100644 --- a/Source/WebCore/layout/formattingContexts/inline/invalidation/InlineDamage.h +++ b/Source/WebCore/layout/formattingContexts/inline/invalidation/InlineDamage.h @@ -45,15 +45,7 @@ class InlineDamage { enum class Type : uint8_t { // Can't decide the type of damage. Let's nuke all the things. Invalid, - // Content changed or some style property that drives soft wrap opportunities (e.g. going from white-space: pre to normal). - // This tells us to re-process the inline content and run line layout. NeedsContentUpdateAndLineLayout, - // Same content but either the constraint or some style that may affect line breaking changed (e.g. font-size or containing block set new horizontal constraint). - NeedsLineLayout, - // Line breaking positions are the same, only height related style changed (e.g img's height changes). - NeedsVerticalAdjustment, - // Line breaking positions are the same, runs may show up at a different horizontal position (e.g. text-align changes). - NeedsHorizontalAdjustment }; Type type() const { return m_damageType; } diff --git a/Source/WebCore/layout/formattingContexts/inline/invalidation/InlineInvalidation.cpp b/Source/WebCore/layout/formattingContexts/inline/invalidation/InlineInvalidation.cpp index 038dbbc768b8d..129ac7d66b787 100644 --- a/Source/WebCore/layout/formattingContexts/inline/invalidation/InlineInvalidation.cpp +++ b/Source/WebCore/layout/formattingContexts/inline/invalidation/InlineInvalidation.cpp @@ -480,11 +480,6 @@ bool InlineInvalidation::inlineLevelBoxWillBeRemoved(const Box& layoutBox) return invalidatedLine.has_value(); } -void InlineInvalidation::horizontalConstraintChanged() -{ - m_inlineDamage.setDamageType(InlineDamage::Type::NeedsLineLayout); -} - void InlineInvalidation::restartForPagination(size_t lineIndex, LayoutUnit pageTopAdjustment) { auto leadingContentDisplayBoxOnDamagedLine = leadingContentDisplayForLineIndex(lineIndex, displayBoxes()); @@ -496,7 +491,7 @@ void InlineInvalidation::restartForPagination(size_t lineIndex, LayoutUnit pageT auto invalidatedLine = InvalidatedLine { lineIndex, *inlineItemPositionForLeadingDisplayBox }; - updateInlineDamage(InlineDamage::Type::NeedsLineLayout, InlineDamage::Reason::Pagination, invalidatedLine, ShouldApplyRangeLayout::Yes, pageTopAdjustment); + updateInlineDamage(InlineDamage::Type::NeedsContentUpdateAndLineLayout, InlineDamage::Reason::Pagination, invalidatedLine, ShouldApplyRangeLayout::Yes, pageTopAdjustment); } } diff --git a/Source/WebCore/layout/formattingContexts/inline/invalidation/InlineInvalidation.h b/Source/WebCore/layout/formattingContexts/inline/invalidation/InlineInvalidation.h index 9eec9d6b91957..2e7fe4557386b 100644 --- a/Source/WebCore/layout/formattingContexts/inline/invalidation/InlineInvalidation.h +++ b/Source/WebCore/layout/formattingContexts/inline/invalidation/InlineInvalidation.h @@ -52,8 +52,6 @@ class InlineInvalidation { bool inlineLevelBoxInserted(const Box&); bool inlineLevelBoxWillBeRemoved(const Box&); - void horizontalConstraintChanged(); - void restartForPagination(size_t lineIndex, LayoutUnit pageTopAdjustment); private: