Attachment 360952 Details for Bug 194185 – Patch

[patch] Patch

bug-194185-20190201201046.patch (text/plain), 5.53 KB, created by zalan on 2019-02-01 20:11:01 PST

(hide)

Description:

Filename:

MIME Type:

Creator: zalan

Created: 2019-02-01 20:11:01 PST

Size: 5.53 KB

patch

obsolete

>Subversion Revision: 240887
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 26eb7b39d95137bf89cbb1b83d01a419f05772e4..e96f7e7c04411ff9c1acf3a3cb79e729b62f5e75 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-02-01  Zalan Bujtas  <zalan@apple.com>
>+
>+        [LFC] Add missing case to out-of-flow non-replaced horizontal used margin value computation
>+        https://bugs.webkit.org/show_bug.cgi?id=194185
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        If none of horizontal values (left, right, width, margin-left/right) are auto, then usedHorizontalMarginValues = computedHorizontalMarginValues.
>+
>+        Test: fast/block/block-only/absolute-position-left-right-margin.html
>+
>+        * layout/FormattingContextGeometry.cpp:
>+        (WebCore::Layout::FormattingContext::Geometry::outOfFlowNonReplacedHorizontalGeometry):
>+
> 2019-02-01  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC] Fix statically positioned replaced out-of-flow horizontal geometry
>diff --git a/Source/WebCore/layout/FormattingContextGeometry.cpp b/Source/WebCore/layout/FormattingContextGeometry.cpp
>index 7a69aed8fb7b30b2a64fc93d45b2f0f6914e28c4..f809c36a05f9aaf93901d22af71a5695ab17fd16 100644
>--- a/Source/WebCore/layout/FormattingContextGeometry.cpp
>+++ b/Source/WebCore/layout/FormattingContextGeometry.cpp
>@@ -478,7 +478,8 @@ HorizontalGeometry FormattingContext::Geometry::outOfFlowNonReplacedHorizontalGe
>                 else
>                     usedHorizontalMargin.end = containingBlockWidth - (usedHorizontalMargin.start + borderLeft + paddingLeft + contentWidth() + paddingRight + borderRight + *right);
>             }
>-        }
>+        } else
>+            usedHorizontalMargin = { *computedHorizontalMargin.start, *computedHorizontalMargin.end };
>     } else {
>         // Otherwise, set 'auto' values for 'margin-left' and 'margin-right' to 0, and pick the one of the following six rules that applies.
>         usedHorizontalMargin = { computedHorizontalMargin.start.valueOr(0), computedHorizontalMargin.end.valueOr(0) };
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 0317db98fd67c8ff156491f2f1eeb0cd2efc83ff..c3150821aac5c9626f26bff1f09574112b5e98a5 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-02-01  Zalan Bujtas  <zalan@apple.com>
>+
>+        [LFC] Add missing case to out-of-flow non-replaced horizontal used margin value computation
>+        https://bugs.webkit.org/show_bug.cgi?id=194185
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * LayoutReloaded/misc/LFC-passing-tests.txt:
>+
> 2019-02-01  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC] Expand tests coverage (12 new tests -> 787)
>diff --git a/Tools/LayoutReloaded/misc/LFC-passing-tests.txt b/Tools/LayoutReloaded/misc/LFC-passing-tests.txt
>index a761470f53861aaddff8a33a9ec561cd350916f9..e22fc3af156cf4c68fe3a2a51baf24710e5f14a0 100644
>--- a/Tools/LayoutReloaded/misc/LFC-passing-tests.txt
>+++ b/Tools/LayoutReloaded/misc/LFC-passing-tests.txt
>@@ -7,6 +7,7 @@ fast/block/block-only/absolute-left-auto.html
> fast/block/block-only/absolute-left-right-top-bottom-auto.html
> fast/block/block-only/absolute-nested2.html
> fast/block/block-only/absolute-nested.html
>+fast/block/block-only/absolute-position-left-right-margin.html
> fast/block/block-only/absolute-position-min-max-height.html
> fast/block/block-only/absolute-position-min-max-width.html
> fast/block/block-only/absolute-position-when-containing-block-is-not-in-the-formatting-context2.html
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index f6299541c0f9e70cf9dd2464f36036f66589eb42..7662f8884c683042ad09e62007eef510f2d63189 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-02-01  Zalan Bujtas  <zalan@apple.com>
>+
>+        [LFC] Add missing case to out-of-flow non-replaced horizontal used margin value computation
>+        https://bugs.webkit.org/show_bug.cgi?id=194185
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * fast/block/block-only/absolute-position-left-right-margin-expected.html: Added.
>+        * fast/block/block-only/absolute-position-left-right-margin.html: Added.
>+
> 2019-02-01  Megan Gardner  <megan_gardner@apple.com>
> 
>         Rewrite and rebaseline smart copy paste tests to work on iOS and MacOS
>diff --git a/LayoutTests/fast/block/block-only/absolute-position-left-right-margin-expected.html b/LayoutTests/fast/block/block-only/absolute-position-left-right-margin-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..0d0e754272797ba8b5bdde052ba3915d7002afde
>--- /dev/null
>+++ b/LayoutTests/fast/block/block-only/absolute-position-left-right-margin-expected.html
>@@ -0,0 +1,15 @@
>+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
>+<html>
>+<head>
>+<style>
>+div {
>+  width: 100px;
>+  height: 100px;
>+  background-color: green;
>+}
>+</style>
>+</head>
>+<body>
>+<div></div>
>+</body>
>+</html>
>diff --git a/LayoutTests/fast/block/block-only/absolute-position-left-right-margin.html b/LayoutTests/fast/block/block-only/absolute-position-left-right-margin.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..a2054286a7adf0b1bc9a726d3647ebef32fc4e80
>--- /dev/null
>+++ b/LayoutTests/fast/block/block-only/absolute-position-left-right-margin.html
>@@ -0,0 +1,19 @@
>+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
>+<html>
>+<head>
>+<style>
>+div {
>+  position: absolute;
>+  left: 0px;
>+  right: 8px;
>+  margin-left: 8px;
>+  width: 100px;
>+  height: 100px;
>+  background-color: green;
>+}
>+</style>
>+</head>
>+<body>
>+<div></div>
>+</body>
>+</html>

Flags:

koivisto: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 194185: 360952