<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[243488] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/243488">243488</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2019-03-26 00:12:47 -0700 (Tue, 26 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Hit-testing on layers overlapping scrollers should hit-test on text boxes
https://bugs.webkit.org/show_bug.cgi?id=195373
<rdar://problem/48649865>

Reviewed by Simon Fraser.

Source/WebCore:

* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::paint):
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paint):

Collect event region for overflowing line boxes.

* rendering/SimpleLineLayoutFunctions.cpp:
(WebCore::SimpleLineLayout::paintFlow):

Collect event region for overflowing simple lines.

LayoutTests:

* fast/scrolling/ios/overflow-scroll-overlap-3.html:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastscrollingiosoverflowscrolloverlap3expectedtxt">trunk/LayoutTests/fast/scrolling/ios/overflow-scroll-overlap-3-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastscrollingiosoverflowscrolloverlap3html">trunk/LayoutTests/fast/scrolling/ios/overflow-scroll-overlap-3.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineFlowBoxcpp">trunk/Source/WebCore/rendering/InlineFlowBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineTextBoxcpp">trunk/Source/WebCore/rendering/InlineTextBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutFunctionscpp">trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (243487 => 243488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2019-03-26 06:12:55 UTC (rev 243487)
+++ trunk/LayoutTests/ChangeLog 2019-03-26 07:12:47 UTC (rev 243488)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2019-03-26  Antti Koivisto  <antti@apple.com>
+
+        Hit-testing on layers overlapping scrollers should hit-test on text boxes
+        https://bugs.webkit.org/show_bug.cgi?id=195373
+        <rdar://problem/48649865>
+
+        Reviewed by Simon Fraser.
+
+        * fast/scrolling/ios/overflow-scroll-overlap-3.html:
+
</ins><span class="cx"> 2019-03-25  Fujii Hironori  <Hironori.Fujii@sony.com>
</span><span class="cx"> 
</span><span class="cx">         Unreviewed, rolling out r243450.
</span></span></pre></div>
<a id="trunkLayoutTestsfastscrollingiosoverflowscrolloverlap3expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/scrolling/ios/overflow-scroll-overlap-3-expected.txt (243487 => 243488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/scrolling/ios/overflow-scroll-overlap-3-expected.txt      2019-03-26 06:12:55 UTC (rev 243487)
+++ trunk/LayoutTests/fast/scrolling/ios/overflow-scroll-overlap-3-expected.txt 2019-03-26 07:12:47 UTC (rev 243488)
</span><span class="lines">@@ -1,5 +1,11 @@
</span><span class="cx"> Test that scrollable areas with text overlap are correctly targeted.
</span><span class="cx"> 
</span><del>-case 1: Scrollable 1 
</del><ins>+case 1: 
</ins><span class="cx"> case 2: Scrollable 2 
</span><ins>+case 3: Scrollable 3 
+case 4: 
+case 5: Scrollable 5 
+case 6: Scrollable 6 
+case 7: 
+case 8: Scrollable 8 
</ins><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsfastscrollingiosoverflowscrolloverlap3html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/scrolling/ios/overflow-scroll-overlap-3.html (243487 => 243488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/scrolling/ios/overflow-scroll-overlap-3.html      2019-03-26 06:12:55 UTC (rev 243487)
+++ trunk/LayoutTests/fast/scrolling/ios/overflow-scroll-overlap-3.html 2019-03-26 07:12:47 UTC (rev 243488)
</span><span class="lines">@@ -71,6 +71,75 @@
</span><span class="cx">     </div>
</span><span class="cx"> </div>
</span><span class="cx"> 
</span><ins>+<div class="case">
+    <div class="overflowscroll target">
+        <div class="scrollcontent"></div>
+    </div>
+    <div class="overlapping" style="top:-60px; pointer-events:none">
+    Text text text text text text text text text text text text text text text text text text text text text text
+    </div>
+</div>
+
+<div class="case">
+    <div class="overflowscroll target">
+        <div class="scrollcontent"></div>
+    </div>
+    <div class="overlapping" style="top:-60px">
+        <b>
+            Text text text text text text text text text text text text
+            <i>text text text text text text text text text text</i>
+        </b>
+    </div>
+</div>
+
+<div class="case">
+    <div class="overflowscroll target">
+        <div class="scrollcontent"></div>
+    </div>
+    <div class="overlapping" style="top:-60px; padding-left:40px">
+        <b>
+            Text text text text text text text text text text text text
+            <i>text text text text text text text text text text</i>
+        </b>
+    </div>
+</div>
+
+<div class="case">
+    <div class="overflowscroll target">
+        <div class="scrollcontent"></div>
+    </div>
+    <div class="overlapping" style="top:-60px; pointer-events:none">
+        <b>
+            Text text text text text text text text text text text text
+            <i>text text text text text text text text text text</i>
+        </b>
+    </div>
+</div>
+
+<div class="case">
+    <div class="overflowscroll target">
+        <div class="scrollcontent"></div>
+    </div>
+    <div class="overlapping" style="top:-60px; visibility:hidden">
+        <b style="visibility:visible">
+            Text text text text text text text text text text text text
+            <i>text text text text text text text text text text</i>
+        </b>
+    </div>
+</div>
+
+<div class="case">
+    <div class="overflowscroll target">
+        <div class="scrollcontent"></div>
+    </div>
+    <div class="overlapping" style="top:-60px; visibility:hidden">
+        <b style="visibility:visible">
+            Text text text text text text text text text text text text
+            <i style="visibility:hidden">text text text text text text text text text text</i>
+        </b>
+    </div>
+</div>
+
</ins><span class="cx"> <div id=log></div>
</span><span class="cx"> 
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (243487 => 243488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-03-26 06:12:55 UTC (rev 243487)
+++ trunk/Source/WebCore/ChangeLog      2019-03-26 07:12:47 UTC (rev 243488)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2019-03-26  Antti Koivisto  <antti@apple.com>
+
+        Hit-testing on layers overlapping scrollers should hit-test on text boxes
+        https://bugs.webkit.org/show_bug.cgi?id=195373
+        <rdar://problem/48649865>
+
+        Reviewed by Simon Fraser.
+
+        * rendering/InlineFlowBox.cpp:
+        (WebCore::InlineFlowBox::paint):
+        * rendering/InlineTextBox.cpp:
+        (WebCore::InlineTextBox::paint):
+
+        Collect event region for overflowing line boxes.
+
+        * rendering/SimpleLineLayoutFunctions.cpp:
+        (WebCore::SimpleLineLayout::paintFlow):
+
+        Collect event region for overflowing simple lines.
+
</ins><span class="cx"> 2019-03-25  Alex Christensen  <achristensen@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Expected shouldn't assume its contained types are copyable
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineFlowBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineFlowBox.cpp (243487 => 243488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineFlowBox.cpp 2019-03-26 06:12:55 UTC (rev 243487)
+++ trunk/Source/WebCore/rendering/InlineFlowBox.cpp    2019-03-26 07:12:47 UTC (rev 243488)
</span><span class="lines">@@ -1150,7 +1150,7 @@
</span><span class="cx"> 
</span><span class="cx"> void InlineFlowBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom)
</span><span class="cx"> {
</span><del>-    if (paintInfo.phase != PaintPhase::Foreground && paintInfo.phase != PaintPhase::Selection && paintInfo.phase != PaintPhase::Outline && paintInfo.phase != PaintPhase::SelfOutline && paintInfo.phase != PaintPhase::ChildOutlines && paintInfo.phase != PaintPhase::TextClip && paintInfo.phase != PaintPhase::Mask)
</del><ins>+    if (paintInfo.phase != PaintPhase::Foreground && paintInfo.phase != PaintPhase::Selection && paintInfo.phase != PaintPhase::Outline && paintInfo.phase != PaintPhase::SelfOutline && paintInfo.phase != PaintPhase::ChildOutlines && paintInfo.phase != PaintPhase::TextClip && paintInfo.phase != PaintPhase::Mask && paintInfo.phase != PaintPhase::EventRegion)
</ins><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     LayoutRect overflowRect(visualOverflowRect(lineTop, lineBottom));
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (243487 => 243488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineTextBox.cpp 2019-03-26 06:12:55 UTC (rev 243487)
+++ trunk/Source/WebCore/rendering/InlineTextBox.cpp    2019-03-26 07:12:47 UTC (rev 243488)
</span><span class="lines">@@ -502,6 +502,12 @@
</span><span class="cx">     boxOrigin.moveBy(localPaintOffset);
</span><span class="cx">     FloatRect boxRect(boxOrigin, FloatSize(logicalWidth(), logicalHeight()));
</span><span class="cx"> 
</span><ins>+    if (paintInfo.phase == PaintPhase::EventRegion) {
+        if (visibleToHitTesting())
+            paintInfo.eventRegion->unite(enclosingIntRect(boxRect));
+        return;
+    }
+
</ins><span class="cx">     auto* combinedText = this->combinedText();
</span><span class="cx"> 
</span><span class="cx">     bool shouldRotate = !isHorizontal() && !combinedText;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp (243487 => 243488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp     2019-03-26 06:12:55 UTC (rev 243487)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp        2019-03-26 07:12:47 UTC (rev 243488)
</span><span class="lines">@@ -76,6 +76,18 @@
</span><span class="cx"> 
</span><span class="cx"> void paintFlow(const RenderBlockFlow& flow, const Layout& layout, PaintInfo& paintInfo, const LayoutPoint& paintOffset)
</span><span class="cx"> {
</span><ins>+    if (paintInfo.phase == PaintPhase::EventRegion) {
+        if (!flow.visibleToHitTesting())
+            return;
+        auto paintRect = paintInfo.rect;
+        paintRect.moveBy(-paintOffset);
+        for (auto run : layout.runResolver().rangeForRect(paintRect)) {
+            FloatRect visualOverflowRect = computeOverflow(flow, run.rect());
+            paintInfo.eventRegion->unite(enclosingIntRect(visualOverflowRect));
+        }
+        return;
+    }
+
</ins><span class="cx">     if (paintInfo.phase != PaintPhase::Foreground)
</span><span class="cx">         return;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>