Changeset 227346 in webkit

Timestamp:

Jan 22, 2018, 12:07:29 PM (7 years ago)

Author:

Antti Koivisto

Message:

REGRESSION (Safari 11): Buttons inside a fieldset legend cannot be clicked on in Safari 11
​https://bugs.webkit.org/show_bug.cgi?id=179666
<rdar://problem/35534292>

Reviewed by Zalan Bujtas.

Source/WebCore:

The legend element of a fieldset is in the border area, outside the clip rect.
With overflow:hidden mouse events won't reach it.

Test case by Dhaya Benmessaoud.

Test: fast/forms/legend-overflow-hidden-hit-test.html

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::nodeAtPoint):
(WebCore::RenderBlock::hitTestExcludedChildrenInBorder):

Add a special case to hit testing to handle legend, similarly to what is done for painting.

• rendering/RenderBlock.h:

LayoutTests:

• fast/forms/legend-overflow-hidden-hit-test-expected.txt: Added.
• fast/forms/legend-overflow-hidden-hit-test.html: Added.
• platform/ios/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/legend-overflow-hidden-hit-test-expected.txt (added)
• LayoutTests/fast/forms/legend-overflow-hidden-hit-test.html (added)
• LayoutTests/platform/ios/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderBlock.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-01-22  Antti Koivisto  <antti@apple.com>
+
+        REGRESSION (Safari 11): Buttons inside a fieldset legend cannot be clicked on in Safari 11
+        https://bugs.webkit.org/show_bug.cgi?id=179666
+        <rdar://problem/35534292>
+
+        Reviewed by Zalan Bujtas.
+
+        * fast/forms/legend-overflow-hidden-hit-test-expected.txt: Added.
+        * fast/forms/legend-overflow-hidden-hit-test.html: Added.
+        * platform/ios/TestExpectations:
+
 2018-01-22  Joanmarie Diggs  <jdiggs@igalia.com>
 

trunk/LayoutTests/platform/ios/TestExpectations

@@ -559 +559 @@
 fast/forms/input-select-on-click.html [ Skip ]
 fast/forms/input-step-as-double.html [ Skip ]
+fast/forms/legend-overflow-hidden-hit-test.html [ Skip ]
 fast/forms/listbox-deselect-scroll.html [ Skip ]
 fast/forms/listbox-scrollbar-hit-test.html [ Skip ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-01-22  Antti Koivisto  <antti@apple.com>
+
+        REGRESSION (Safari 11): Buttons inside a fieldset legend cannot be clicked on in Safari 11
+        https://bugs.webkit.org/show_bug.cgi?id=179666
+        <rdar://problem/35534292>
+
+        Reviewed by Zalan Bujtas.
+
+        The legend element of a fieldset is in the border area, outside the clip rect.
+        With overflow:hidden mouse events won't reach it.
+
+        Test case by Dhaya Benmessaoud.
+
+        Test: fast/forms/legend-overflow-hidden-hit-test.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::nodeAtPoint):
+        (WebCore::RenderBlock::hitTestExcludedChildrenInBorder):
+
+        Add a special case to hit testing to handle legend, similarly to what is done for painting.
+
+        * rendering/RenderBlock.h:
+
 2018-01-22  Joanmarie Diggs  <jdiggs@igalia.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -2226 +2226 @@
     }
 
+    if (!checkChildren && hitTestExcludedChildrenInBorder(request, result, locationInContainer, adjustedLocation, hitTestAction))
+        return true;
+
     // Check if the point is outside radii.
     if (!isRenderView() && style().hasBorderRadius()) {
@@ -3657 +3660 @@
     box->paintAsInlineBlock(paintInfo, childPoint);
 }
+
+bool RenderBlock::hitTestExcludedChildrenInBorder(const HitTestRequest& request, HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction hitTestAction)
+{
+    if (!isFieldset())
+        return false;
+
+    auto* legend = findFieldsetLegend();
+    if (!legend || !legend->isExcludedFromNormalLayout() || legend->hasSelfPaintingLayer())
+        return false;
+
+    HitTestAction childHitTest = hitTestAction;
+    if (hitTestAction == HitTestChildBlockBackgrounds)
+        childHitTest = HitTestChildBlockBackground;
+    LayoutPoint childPoint = flipForWritingModeForChild(legend, accumulatedOffset);
+    return legend->nodeAtPoint(request, result, locationInContainer, childPoint, childHitTest);
+}
     
 } // namespace WebCore

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -456 +456 @@
     virtual bool hitTestFloats(const HitTestRequest&, HitTestResult&, const HitTestLocation&, const LayoutPoint&) { return false; }
     virtual bool hitTestInlineChildren(const HitTestRequest&, HitTestResult&, const HitTestLocation&, const LayoutPoint&, HitTestAction) { return false; }
+    bool hitTestExcludedChildrenInBorder(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction);
 
     virtual bool isPointInOverflowControl(HitTestResult&, const LayoutPoint& locationInContainer, const LayoutPoint& accumulatedOffset);