From ca5bf195c34cea1bfa49bd483764fc3cbd84b8d5 Mon Sep 17 00:00:00 2001 From: "zalan@apple.com" Date: Thu, 15 Nov 2018 14:58:16 +0000 Subject: [PATCH] [LFC] FormattingContext base class should not declare computeStaticPosition. https://bugs.webkit.org/show_bug.cgi?id=191683 Reviewed by Antti Koivisto. Apparently only BlockFormattingContext uses it. * layout/FormattingContext.h: * layout/blockformatting/BlockFormattingContext.h: * layout/inlineformatting/InlineFormattingContext.cpp: (WebCore::Layout::InlineFormattingContext::computeStaticPosition const): Deleted. * layout/inlineformatting/InlineFormattingContext.h: git-svn-id: https://svn.webkit.org/repository/webkit/trunk@238226 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 15 +++++++++++++++ Source/WebCore/layout/FormattingContext.h | 2 -- .../layout/blockformatting/BlockFormattingContext.h | 2 +- .../layout/inlineformatting/InlineFormattingContext.cpp | 4 ---- .../layout/inlineformatting/InlineFormattingContext.h | 1 - 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 041d376..ea0c592 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,18 @@ +2018-11-15 Zalan Bujtas + + [LFC] FormattingContext base class should not declare computeStaticPosition. + https://bugs.webkit.org/show_bug.cgi?id=191683 + + Reviewed by Antti Koivisto. + + Apparently only BlockFormattingContext uses it. + + * layout/FormattingContext.h: + * layout/blockformatting/BlockFormattingContext.h: + * layout/inlineformatting/InlineFormattingContext.cpp: + (WebCore::Layout::InlineFormattingContext::computeStaticPosition const): Deleted. + * layout/inlineformatting/InlineFormattingContext.h: + 2018-11-14 Zalan Bujtas [LFC][IFC] Add support for in-flow positioned inline boxes. diff --git a/Source/WebCore/layout/FormattingContext.h b/Source/WebCore/layout/FormattingContext.h index 6769a69..a4145a4 100644 --- a/Source/WebCore/layout/FormattingContext.h +++ b/Source/WebCore/layout/FormattingContext.h @@ -69,8 +69,6 @@ protected: LayoutState& layoutState() const; const Box& root() const { return *m_root; } - virtual void computeStaticPosition(const Box&) const = 0; - void computeBorderAndPadding(const Box&) const; #ifndef NDEBUG diff --git a/Source/WebCore/layout/blockformatting/BlockFormattingContext.h b/Source/WebCore/layout/blockformatting/BlockFormattingContext.h index 9a9a0c6..f61a756 100644 --- a/Source/WebCore/layout/blockformatting/BlockFormattingContext.h +++ b/Source/WebCore/layout/blockformatting/BlockFormattingContext.h @@ -56,7 +56,7 @@ private: void computeWidthAndMargin(const Box&) const; void computeHeightAndMargin(const Box&) const; - void computeStaticPosition(const Box&) const override; + void computeStaticPosition(const Box&) const; void computeFloatingPosition(const FloatingContext&, const Box&) const; void computePositionToAvoidFloats(const FloatingContext&, const Box&) const; void computeVerticalPositionForFloatClear(const FloatingContext&, const Box&) const; diff --git a/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp b/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp index 5734420..9ee7390 100644 --- a/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp +++ b/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp @@ -442,10 +442,6 @@ void InlineFormattingContext::placeInFlowPositionedChildren(Line::RunRange runRa } } -void InlineFormattingContext::computeStaticPosition(const Box&) const -{ -} - void InlineFormattingContext::collectInlineContentForSubtree(const Box& root, InlineRunProvider& inlineRunProvider) const { // Collect inline content recursively and set breaking rules for the inline elements (for paddings, margins, positioned element etc). diff --git a/Source/WebCore/layout/inlineformatting/InlineFormattingContext.h b/Source/WebCore/layout/inlineformatting/InlineFormattingContext.h index fe69a7a..4aa8434 100644 --- a/Source/WebCore/layout/inlineformatting/InlineFormattingContext.h +++ b/Source/WebCore/layout/inlineformatting/InlineFormattingContext.h @@ -120,7 +120,6 @@ private: void computeHeightAndMargin(const Box&) const; void computeWidthAndMargin(const Box&) const; void computeFloatPosition(const FloatingContext&, Line&, const Box&) const; - void computeStaticPosition(const Box&) const override; void placeInFlowPositionedChildren(Line::RunRange) const; void collectInlineContent(InlineRunProvider&) const; -- 1.8.3.1