Attachment 342512 Details for Bug 186556 – Patch

[patch] Patch

bug-186556-20180611205612.patch (text/plain), 8.24 KB, created by zalan on 2018-06-11 20:56:13 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: zalan

Created: 2018-06-11 20:56:13 PDT

Size: 8.24 KB

patch

obsolete

>Subversion Revision: 232716
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index ae7f01ab2c0ea1a967b698863295f1096c504d3d..bf3ed1e9348ca175581669aa589fc9bfdb992c82 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,26 @@
>+2018-06-11  Zalan Bujtas  <zalan@apple.com>
>+
>+        [LFC] Replace HorizontalGeometry::width and margin with WidthAndMargin (Vertical too)
>+        https://bugs.webkit.org/show_bug.cgi?id=186556
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        HorizontalGeometry::width and margin -> WidthAndMargin
>+        VerticalGeometry::height and margin -> HeightAndMargin
>+
>+        * layout/FormattingContext.cpp:
>+        (WebCore::Layout::FormattingContext::computeOutOfFlowHorizontalGeometry const):
>+        (WebCore::Layout::FormattingContext::computeOutOfFlowVerticalGeometry const):
>+        * layout/FormattingContext.h:
>+        * layout/FormattingContextGeometry.cpp:
>+        (WebCore::Layout::FormattingContext::Geometry::outOfFlowNonReplacedVerticalGeometry):
>+        (WebCore::Layout::FormattingContext::Geometry::outOfFlowNonReplacedHorizontalGeometry):
>+        (WebCore::Layout::FormattingContext::Geometry::outOfFlowReplacedVerticalGeometry):
>+        (WebCore::Layout::FormattingContext::Geometry::outOfFlowReplacedHorizontalGeometry):
>+        (WebCore::Layout::FormattingContext::Geometry::inlineReplacedWidthAndMargin):
>+        (WebCore::Layout::FormattingContext::Geometry::computedNonCollapsedHorizontalMarginValue):
>+        (WebCore::Layout::FormattingContext::Geometry::computedNonCollapsedVerticalMarginValue):
>+
> 2018-06-11  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC] Remove redundant position functions for out-of-flow elements
>diff --git a/Source/WebCore/layout/FormattingContext.cpp b/Source/WebCore/layout/FormattingContext.cpp
>index 9930dc8d3e949030a8e1217d266f7eeaed7d8cad..73a504a2f956461bcb9fed969dd3e2a966ed1264 100644
>--- a/Source/WebCore/layout/FormattingContext.cpp
>+++ b/Source/WebCore/layout/FormattingContext.cpp
>@@ -67,18 +67,18 @@ void FormattingContext::computeOutOfFlowHorizontalGeometry(LayoutContext& layout
> {
>     auto horizontalGeometry = Geometry::outOfFlowHorizontalGeometry(layoutContext, layoutBox);
>     displayBox.setLeft(horizontalGeometry.left);
>-    displayBox.setWidth(horizontalGeometry.width);
>-    ASSERT(horizontalGeometry.left + horizontalGeometry.width == horizontalGeometry.right);
>-    displayBox.setHorizontalMargin(horizontalGeometry.margin);
>+    displayBox.setWidth(horizontalGeometry.widthAndMargin.width);
>+    ASSERT(horizontalGeometry.left + horizontalGeometry.widthAndMargin.width == horizontalGeometry.right);
>+    displayBox.setHorizontalMargin(horizontalGeometry.widthAndMargin.margin);
> }
> 
> void FormattingContext::computeOutOfFlowVerticalGeometry(LayoutContext& layoutContext, const Box& layoutBox, Display::Box& displayBox) const
> {
>     auto verticalGeometry = Geometry::outOfFlowVerticalGeometry(layoutContext, layoutBox);
>     displayBox.setTop(verticalGeometry.top);
>-    displayBox.setHeight(verticalGeometry.height);
>-    ASSERT(verticalGeometry.top + verticalGeometry.height == verticalGeometry.bottom);
>-    displayBox.setVerticalMargin(verticalGeometry.margin);
>+    displayBox.setHeight(verticalGeometry.heightAndMargin.height);
>+    ASSERT(verticalGeometry.top + verticalGeometry.heightAndMargin.height == verticalGeometry.bottom);
>+    displayBox.setVerticalMargin(verticalGeometry.heightAndMargin.margin);
> }
> 
> void FormattingContext::computeBorderAndPadding(LayoutContext& layoutContext, const Box& layoutBox, Display::Box& displayBox) const
>diff --git a/Source/WebCore/layout/FormattingContext.h b/Source/WebCore/layout/FormattingContext.h
>index 353bec1aed43e6133a991f94e56059794675772f..53e2c1e997e09dd13aa140196a1f32f381248733 100644
>--- a/Source/WebCore/layout/FormattingContext.h
>+++ b/Source/WebCore/layout/FormattingContext.h
>@@ -92,17 +92,15 @@ protected:
>         };
> 
>          struct HorizontalGeometry {
>-             LayoutUnit left;
>-             LayoutUnit right;
>-             LayoutUnit width;
>-             Display::Box::HorizontalEdges margin;
>+            LayoutUnit left;
>+            LayoutUnit right;
>+            WidthAndMargin widthAndMargin;
>          };
> 
>         struct VerticalGeometry {
>             LayoutUnit top;
>             LayoutUnit bottom;
>-            LayoutUnit height;
>-            Display::Box::VerticalEdges margin;
>+            HeightAndMargin heightAndMargin;
>         };
> 
>         static VerticalGeometry outOfFlowVerticalGeometry(LayoutContext&, const Box&);
>diff --git a/Source/WebCore/layout/FormattingContextGeometry.cpp b/Source/WebCore/layout/FormattingContextGeometry.cpp
>index d54518e95c2fd72f5994090c9ca3dcc5f360fc61..cee4606ed6ffa87975fa41f432b99308a7821290 100644
>--- a/Source/WebCore/layout/FormattingContextGeometry.cpp
>+++ b/Source/WebCore/layout/FormattingContextGeometry.cpp
>@@ -183,7 +183,7 @@ FormattingContext::Geometry::VerticalGeometry FormattingContext::Geometry::outOf
>     ASSERT(marginTop);
>     ASSERT(marginBottom);
> 
>-    return { *top, *bottom, *height, { *marginTop, *marginBottom} };
>+    return { *top, *bottom, { *height, { *marginTop, *marginBottom} } };
> }
> 
> FormattingContext::Geometry::HorizontalGeometry FormattingContext::Geometry::outOfFlowNonReplacedHorizontalGeometry(LayoutContext& layoutContext, const Box& layoutBox)
>@@ -324,7 +324,7 @@ FormattingContext::Geometry::HorizontalGeometry FormattingContext::Geometry::out
>     ASSERT(marginLeft);
>     ASSERT(marginRight);
> 
>-    return HorizontalGeometry { *left, *right, *width, { *marginLeft, *marginRight } };
>+    return { *left, *right, { *width, { *marginLeft, *marginRight } } };
> }
> 
> FormattingContext::Geometry::VerticalGeometry FormattingContext::Geometry::outOfFlowReplacedVerticalGeometry(LayoutContext& layoutContext, const Box& layoutBox)
>@@ -391,7 +391,7 @@ FormattingContext::Geometry::VerticalGeometry FormattingContext::Geometry::outOf
>     if (boxHeight > containingBlockHeight)
>         bottom = containingBlockHeight - (*top + *marginTop + borderTop + paddingTop + height + paddingBottom + borderBottom + *marginBottom); 
> 
>-    return { *top, *bottom, height, { *marginTop, *marginBottom } };
>+    return { *top, *bottom, { height, { *marginTop, *marginBottom } } };
> }
> 
> FormattingContext::Geometry::HorizontalGeometry FormattingContext::Geometry::outOfFlowReplacedHorizontalGeometry(LayoutContext& layoutContext, const Box& layoutBox)
>@@ -484,7 +484,7 @@ FormattingContext::Geometry::HorizontalGeometry FormattingContext::Geometry::out
>     ASSERT(marginLeft);
>     ASSERT(marginRight);
> 
>-    return { *left, *right, width, { *marginLeft, *marginRight } };
>+    return { *left, *right, { width, { *marginLeft, *marginRight } } };
> }
> 
> FormattingContext::Geometry::HeightAndMargin FormattingContext::Geometry::floatingNonReplacedHeightAndMargin(LayoutContext& layoutContext, const Box& layoutBox)
>@@ -680,7 +680,7 @@ FormattingContext::Geometry::WidthAndMargin FormattingContext::Geometry::inlineR
>         computedWidthValue = 300;
>     }
> 
>-    return WidthAndMargin { computedWidthValue, { computedMarginLeftValue, computedMarginRightValue } };
>+    return { computedWidthValue, { computedMarginLeftValue, computedMarginRightValue } };
> }
> 
> Display::Box::Edges FormattingContext::Geometry::computedBorder(LayoutContext&, const Box& layoutBox)
>@@ -712,7 +712,7 @@ Display::Box::HorizontalEdges FormattingContext::Geometry::computedNonCollapsedH
>     auto marginRight = style.marginRight();
> 
>     auto containingBlockWidth = layoutContext.displayBoxForLayoutBox(*layoutBox.containingBlock())->width();
>-    return Display::Box::HorizontalEdges {
>+    return {
>         marginLeft.isAuto() ? LayoutUnit { 0 } : valueForLength(marginLeft, containingBlockWidth),
>         marginRight.isAuto() ? LayoutUnit { 0 } : valueForLength(marginRight, containingBlockWidth)
>     };
>@@ -725,7 +725,7 @@ Display::Box::VerticalEdges FormattingContext::Geometry::computedNonCollapsedVer
>     auto marginBottom = style.marginBottom();
> 
>     auto containingBlockWidth = layoutContext.displayBoxForLayoutBox(*layoutBox.containingBlock())->width();
>-    return Display::Box::VerticalEdges {
>+    return {
>         marginTop.isAuto() ? LayoutUnit { 0 } : valueForLength(marginTop, containingBlockWidth),
>         marginBottom.isAuto() ? LayoutUnit { 0 } : valueForLength(marginBottom, containingBlockWidth)
>     };

Actions: View | Formatted Diff | Diff

Attachments on bug 186556: 342512