WebKit Bugzilla
Attachment 361795 Details for
Bug 194540
: [LFC] Remove redundant InlineFormattingContext::computeBorderAndPadding
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-194540-20190212075027.patch (text/plain), 4.98 KB, created by
zalan
on 2019-02-12 07:50:28 PST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
zalan
Created:
2019-02-12 07:50:28 PST
Size:
4.98 KB
patch
obsolete
>Subversion Revision: 241294 >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index 91aa7de11f6b6558d20109b304d14dfeb12cfddf..20071dd888b268bb7f6fed6ab129b5902b24b9ec 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,19 @@ >+2019-02-12 Zalan Bujtas <zalan@apple.com> >+ >+ [LFC] Remove redundant InlineFormattingContext::computeBorderAndPadding >+ https://bugs.webkit.org/show_bug.cgi?id=194540 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Use FormattingContext::computeBorderAndPadding instead. >+ >+ * layout/FormattingContext.cpp: >+ (WebCore::Layout::FormattingContext::computeBorderAndPadding const): >+ * layout/FormattingContext.h: >+ * layout/inlineformatting/InlineFormattingContext.cpp: >+ (WebCore::Layout::InlineFormattingContext::computeBorderAndPadding const): Deleted. >+ * layout/inlineformatting/InlineFormattingContext.h: >+ > 2019-02-12 Zalan Bujtas <zalan@apple.com> > > [LFC][IFC] Add intrinsic width support for float boxes. >diff --git a/Source/WebCore/layout/FormattingContext.cpp b/Source/WebCore/layout/FormattingContext.cpp >index 8944c3d6f59d3db5afacc9b134f01de1514033ce..a1ec4a15bc6e26594d0053c83bc165efa74a15d6 100644 >--- a/Source/WebCore/layout/FormattingContext.cpp >+++ b/Source/WebCore/layout/FormattingContext.cpp >@@ -123,13 +123,14 @@ void FormattingContext::computeOutOfFlowVerticalGeometry(const Box& layoutBox) c > displayBox.setVerticalMargin({ nonCollapsedVerticalMargin, { } }); > } > >-void FormattingContext::computeBorderAndPadding(const Box& layoutBox) const >+void FormattingContext::computeBorderAndPadding(const Box& layoutBox, Optional<UsedHorizontalValues> usedValues) const > { > auto& layoutState = this->layoutState(); >+ if (!usedValues) >+ usedValues = UsedHorizontalValues { layoutState.displayBoxForLayoutBox(*layoutBox.containingBlock()).contentBoxWidth() }; > auto& displayBox = layoutState.displayBoxForLayoutBox(layoutBox); >- auto containingBlockWidth = layoutState.displayBoxForLayoutBox(*layoutBox.containingBlock()).contentBoxWidth(); > displayBox.setBorder(Geometry::computedBorder(layoutBox)); >- displayBox.setPadding(Geometry::computedPadding(layoutBox, UsedHorizontalValues { containingBlockWidth })); >+ displayBox.setPadding(Geometry::computedPadding(layoutBox, *usedValues)); > } > > void FormattingContext::layoutOutOfFlowDescendants(const Box& layoutBox) const >diff --git a/Source/WebCore/layout/FormattingContext.h b/Source/WebCore/layout/FormattingContext.h >index bc3b437f80389bf99a6ff975ee16dc968760acd7..209962b3587233fff82e6020e2ebef1fb9d26cc1 100644 >--- a/Source/WebCore/layout/FormattingContext.h >+++ b/Source/WebCore/layout/FormattingContext.h >@@ -69,7 +69,7 @@ protected: > FormattingState& formattingState() const { return m_formattingState; } > const Box& root() const { return *m_root; } > >- void computeBorderAndPadding(const Box&) const; >+ void computeBorderAndPadding(const Box&, Optional<UsedHorizontalValues> = WTF::nullopt) const; > > #ifndef NDEBUG > virtual void validateGeometryConstraintsAfterLayout() const; >diff --git a/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp b/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp >index 72d83119da29a8960aaa2b36f017f8a9253e4e1e..fb982b3d1e68cd2f0127d2ca05f0c550ba256d38 100644 >--- a/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp >+++ b/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp >@@ -190,13 +190,6 @@ void InlineFormattingContext::computeMargin(const Box& layoutBox, UsedHorizontal > displayBox.setHorizontalMargin({ computedHorizontalMargin.start.valueOr(0), computedHorizontalMargin.end.valueOr(0) }); > } > >-void InlineFormattingContext::computeBorderAndPadding(const Box& layoutBox, UsedHorizontalValues usedValues) const >-{ >- auto& displayBox = layoutState().displayBoxForLayoutBox(layoutBox); >- displayBox.setBorder(Geometry::computedBorder(layoutBox)); >- displayBox.setPadding(Geometry::computedPadding(layoutBox, usedValues)); >-} >- > void InlineFormattingContext::computeWidthAndMargin(const Box& layoutBox, UsedHorizontalValues usedValues) const > { > auto& layoutState = this->layoutState(); >diff --git a/Source/WebCore/layout/inlineformatting/InlineFormattingContext.h b/Source/WebCore/layout/inlineformatting/InlineFormattingContext.h >index bb0b09541315a26c409eed3ad62552690beb6a68..a4fb31584adf8b81d8d5c61c3372612b0da93281 100644 >--- a/Source/WebCore/layout/inlineformatting/InlineFormattingContext.h >+++ b/Source/WebCore/layout/inlineformatting/InlineFormattingContext.h >@@ -92,7 +92,6 @@ private: > void computeIntrinsicWidthForInlineBlock(const Box&) const; > void computeWidthAndHeightForReplacedInlineBox(const Box&, UsedHorizontalValues) const; > void computeMargin(const Box&, UsedHorizontalValues) const; >- void computeBorderAndPadding(const Box&, UsedHorizontalValues) const; > void computeHeightAndMargin(const Box&) const; > void computeWidthAndMargin(const Box&, UsedHorizontalValues) const; >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
koivisto
:
review+
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 194540
: 361795