Changeset 278379 in webkit

Timestamp:

Jun 2, 2021 3:31:09 PM (14 months ago)

Author:

Alan Bujtas

Message:

Incorrect selection when tall float is present
​https://bugs.webkit.org/show_bug.cgi?id=226552
<rdar://problem/78781056>

Reviewed by Simon Fraser.

Source/WebCore:

While floats may end up at the bottom of their containers, they do not necessarily stretch the container by their full height.
e.g. <div><div style="float: left; height: 10px; width: 10px;"></div>some<br>text<br>here</div>
The [some text here] content wraps around the float and stretches the containing block <div>.

Test: editing/selection/select-out-of-floated-non-editable-13.html

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::positionForPoint):

LayoutTests:

• editing/selection/select-out-of-floated-non-editable-07.html:
• editing/selection/select-out-of-floated-non-editable-13-expected.txt: Added.
• editing/selection/select-out-of-floated-non-editable-13.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/selection/select-out-of-floated-non-editable-13-expected.txt (added)
• LayoutTests/editing/selection/select-out-of-floated-non-editable-13.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-06-02  Alan Bujtas  <zalan@apple.com>
+
+        Incorrect selection when tall float is present
+        https://bugs.webkit.org/show_bug.cgi?id=226552
+        <rdar://problem/78781056>
+
+        Reviewed by Simon Fraser.
+
+        * editing/selection/select-out-of-floated-non-editable-07.html:
+        * editing/selection/select-out-of-floated-non-editable-13-expected.txt: Added.
+        * editing/selection/select-out-of-floated-non-editable-13.html: Added.
+
 2021-06-02  Antoine Quint  <graouts@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-06-02  Alan Bujtas  <zalan@apple.com>
+
+        Incorrect selection when tall float is present
+        https://bugs.webkit.org/show_bug.cgi?id=226552
+        <rdar://problem/78781056>
+
+        Reviewed by Simon Fraser.
+
+        While floats may end up at the bottom of their containers, they do not necessarily stretch the container by their full height.
+        e.g. <div><div style="float: left; height: 10px; width: 10px;"></div>some<br>text<br>here</div>
+        The [some text here] content wraps around the float and stretches the containing block <div>.
+
+        Test: editing/selection/select-out-of-floated-non-editable-13.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::positionForPoint):
+
 2021-06-02  Antoine Quint  <graouts@webkit.org>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -2226 +2226 @@
             if (!isChildHitTestCandidate(*childBox, fragment, pointInLogicalContents))
                 continue;
-            LayoutUnit childLogicalBottom = logicalTopForChild(*childBox) + logicalHeightForChild(*childBox);
+            auto childLogicalBottom = logicalTopForChild(*childBox) + logicalHeightForChild(*childBox);
             if (is<RenderBlockFlow>(childBox))
-                childLogicalBottom += downcast<RenderBlockFlow>(childBox)->lowestFloatLogicalBottom();
+                childLogicalBottom = std::max(childLogicalBottom, downcast<RenderBlockFlow>(*childBox).lowestFloatLogicalBottom());
             // We hit child if our click is above the bottom of its padding box (like IE6/7 and FF3).
             if (isChildHitTestCandidate(*childBox, fragment, pointInLogicalContents) && (pointInLogicalContents.y() < childLogicalBottom