Attachment 362114 Details for Bug 194704 – Patch

[patch] Patch

bug-194704-20190215073012.patch (text/plain), 4.97 KB, created by zalan on 2019-02-15 07:30:13 PST

(hide)

Description:

Filename:

MIME Type:

Creator: zalan

Created: 2019-02-15 07:30:13 PST

Size: 4.97 KB

patch

obsolete

>Subversion Revision: 241559
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index eb4df96545bb7c3ac3511a052e2bce6b064a2d8c..413238a4d07d17359d85b82383925bf3057c7da4 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,19 @@
>+2019-02-15  Zalan Bujtas  <zalan@apple.com>
>+
>+        [LFC] Out-of-flow box is never a float box
>+        https://bugs.webkit.org/show_bug.cgi?id=194704
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        We can't have it both ways. Absolute positioning wins.
>+
>+        Test: fast/block/block-only/out-of-flow-is-never-float-box.html
>+
>+        * layout/layouttree/LayoutBox.cpp:
>+        (WebCore::Layout::Box::isFloatingPositioned const):
>+        (WebCore::Layout::Box::isLeftFloatingPositioned const):
>+        (WebCore::Layout::Box::isRightFloatingPositioned const):
>+
> 2019-02-14  Ross Kirsling  <ross.kirsling@sony.com>
> 
>         [WTF] Add environment variable helpers
>diff --git a/Source/WebCore/layout/layouttree/LayoutBox.cpp b/Source/WebCore/layout/layouttree/LayoutBox.cpp
>index f5872a03e162e27dd4549ca32f147084390cf455..15a11d91ccf820dd49940d15deb01f33da03fa22 100644
>--- a/Source/WebCore/layout/layouttree/LayoutBox.cpp
>+++ b/Source/WebCore/layout/layouttree/LayoutBox.cpp
>@@ -109,16 +109,23 @@ bool Box::isFixedPositioned() const
> 
> bool Box::isFloatingPositioned() const
> {
>+    // FIXME: Rendering code caches values like this. (style="position: absolute; float: left")
>+    if (isOutOfFlowPositioned())
>+        return false;
>     return m_style.floating() != Float::No;
> }
> 
> bool Box::isLeftFloatingPositioned() const
> {
>+    if (!isFloatingPositioned())
>+        return false;
>     return m_style.floating() == Float::Left;
> }
> 
> bool Box::isRightFloatingPositioned() const
> {
>+    if (!isFloatingPositioned())
>+        return false;
>     return m_style.floating() == Float::Right;
> }
> 
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 673899dcfba80f8be455b1ac1505cef1fee82816..9db2de7ce0b5a946ff806c2650ec27ab90d685f2 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-02-15  Zalan Bujtas  <zalan@apple.com>
>+
>+        [LFC] Out-of-flow box is never a float box
>+        https://bugs.webkit.org/show_bug.cgi?id=194704
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * LayoutReloaded/misc/LFC-passing-tests.txt:
>+
> 2019-02-14  Ross Kirsling  <ross.kirsling@sony.com>
> 
>         [WTF] Add environment variable helpers
>diff --git a/Tools/LayoutReloaded/misc/LFC-passing-tests.txt b/Tools/LayoutReloaded/misc/LFC-passing-tests.txt
>index 996dd331e12c1ae63646cd25e856376854efd5f9..d2ef4fe9b4da997089d541478c94c93f61d80a54 100644
>--- a/Tools/LayoutReloaded/misc/LFC-passing-tests.txt
>+++ b/Tools/LayoutReloaded/misc/LFC-passing-tests.txt
>@@ -102,6 +102,7 @@ fast/block/block-only/negative-margin-simple.html
> fast/block/block-only/non-auto-top-bottom-height-with-auto-margins.html
> fast/block/block-only/non-auto-top-bottom-height-with-margins.html
> fast/block/block-only/non-auto-top-bottom-left-right-widht-height-out-of-flow.html
>+fast/block/block-only/out-of-flow-is-never-float-box.html
> fast/block/block-only/out-of-flow-with-containing-block-border-padding.html
> fast/block/block-only/padding-nested.html
> fast/block/block-only/padding-simple.html
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 32bd451e1ce8ad432dea54bd49ed6d80cc7d6550..222d85f6d2a3ff162597ead9f239245088ce646f 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-02-15  Zalan Bujtas  <zalan@apple.com>
>+
>+        [LFC] Out-of-flow box is never a float box
>+        https://bugs.webkit.org/show_bug.cgi?id=194704
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * fast/block/block-only/out-of-flow-is-never-float-box-expected.html: Added.
>+        * fast/block/block-only/out-of-flow-is-never-float-box.html: Added.
>+
> 2019-02-14  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC][BFC][MarginCollapse] Replaced boxes don't collapse through their margins
>diff --git a/LayoutTests/fast/block/block-only/out-of-flow-is-never-float-box-expected.html b/LayoutTests/fast/block/block-only/out-of-flow-is-never-float-box-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..b527fa7afdefbbe04de2a750f2cef53eb6d3593d
>--- /dev/null
>+++ b/LayoutTests/fast/block/block-only/out-of-flow-is-never-float-box-expected.html
>@@ -0,0 +1,8 @@
>+<style>
>+div {
>+    width: 100px;
>+    height: 100px;
>+    background-color: green;
>+}
>+</style>
>+<div></div>
>\ No newline at end of file
>diff --git a/LayoutTests/fast/block/block-only/out-of-flow-is-never-float-box.html b/LayoutTests/fast/block/block-only/out-of-flow-is-never-float-box.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..3123f22ab0257555303935772d2e51f55f175ec5
>--- /dev/null
>+++ b/LayoutTests/fast/block/block-only/out-of-flow-is-never-float-box.html
>@@ -0,0 +1,10 @@
>+<style>
>+div {
>+    float: left;
>+    position: absolute;
>+    width: 100px;
>+    height: 100px;
>+    background-color: green;
>+}
>+</style>
>+<div></div><div><div>
>\ No newline at end of file

Actions: View | Formatted Diff | Diff

Attachments on bug 194704: 362114