Attachment 360245 Details for Bug 193872 – Patch

[patch] Patch

bug-193872-20190126122327.patch (text/plain), 2.54 KB, created by zalan on 2019-01-26 12:23:36 PST

(hide)

Description:

Filename:

MIME Type:

Creator: zalan

Created: 2019-01-26 12:23:36 PST

Size: 2.54 KB

patch

obsolete

>Subversion Revision: 240547
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index f8099584ab8f69a4bf454e85977e532fb6556cfc..1f747d0658f660b417bb38bdf38d4d197116a805 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-01-26  Zalan Bujtas  <zalan@apple.com>
>+
>+        [LFC][BFC] Remove redundant vertical positioning in BlockFormattingContext::computeFloatingPosition
>+        https://bugs.webkit.org/show_bug.cgi?id=193872
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This is taken care of by verticalPositionWithMargin() in BlockFormattingContext::computeHeightAndMargin(). 
>+
>+        * layout/blockformatting/BlockFormattingContext.cpp:
>+        (WebCore::Layout::BlockFormattingContext::computeFloatingPosition const):
>+
> 2019-01-26  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC] The initial values for top/bottom in contentHeightForFormattingContextRoot should not be 0.
>diff --git a/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp b/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp
>index 0f9c1b746aded5d944c3cfd9e991668cb7516933..b1a9685af8d36c30fc9abd847aef84232daeb8bc 100644
>--- a/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp
>+++ b/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp
>@@ -273,19 +273,9 @@ bool BlockFormattingContext::hasPrecomputedMarginBefore(const Box& layoutBox) co
> 
> void BlockFormattingContext::computeFloatingPosition(const FloatingContext& floatingContext, const Box& layoutBox) const
> {
>-    auto& layoutState = this->layoutState();
>     ASSERT(layoutBox.isFloatingPositioned());
>     ASSERT(hasPrecomputedMarginBefore(layoutBox));
>-
>-    auto& displayBox = layoutState.displayBoxForLayoutBox(layoutBox);
>-    // 8.3.1 Collapsing margins
>-    // In block formatting context margins between a floated box and any other box do not collapse.
>-    // Adjust the static position by using the previous inflow box's non-collapsed margin.
>-    if (auto* previousInFlowBox = layoutBox.previousInFlowSibling()) {
>-        auto& previousDisplayBox = layoutState.displayBoxForLayoutBox(*previousInFlowBox);
>-        displayBox.moveVertically(previousDisplayBox.nonCollapsedMarginAfter() - previousDisplayBox.marginAfter());
>-    }
>-    displayBox.setTopLeft(floatingContext.positionForFloat(layoutBox));
>+    layoutState().displayBoxForLayoutBox(layoutBox).setTopLeft(floatingContext.positionForFloat(layoutBox));
> }
> 
> void BlockFormattingContext::computePositionToAvoidFloats(const FloatingContext& floatingContext, const Box& layoutBox) const

Actions: View | Formatted Diff | Diff

Attachments on bug 193872: 360245