<!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>[190254] 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/190254">190254</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-09-25 15:01:21 -0700 (Fri, 25 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Scrolling a overflow: scroll region makes find overlay holes stick to the edge of the region
https://bugs.webkit.org/show_bug.cgi?id=149572
<rdar://problem/13093602>
Reviewed by Simon Fraser.
Test: fast/text/mark-matches-overflow-clip.html
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintTextMatchMarker):
Clip the rendered marker rect to the overflow rect.
* testing/Internals.cpp:
(WebCore::Internals::dumpMarkerRectsForNode):
* testing/Internals.h:
* testing/Internals.idl:
Add a internals function to dump the rendered rects for a marker.
* fast/text/mark-matches-overflow-clip-expected.txt: Added.
* fast/text/mark-matches-overflow-clip.html: Added.
Add a test ensuring that a find match that is clipped out by overflow
ends up with a clipped rendered rect.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineTextBoxcpp">trunk/Source/WebCore/rendering/InlineTextBox.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsidl">trunk/Source/WebCore/testing/Internals.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextmarkmatchesoverflowclipexpectedtxt">trunk/LayoutTests/fast/text/mark-matches-overflow-clip-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasttextmarkmatchesoverflowcliphtml">trunk/LayoutTests/fast/text/mark-matches-overflow-clip.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (190253 => 190254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-09-25 21:50:48 UTC (rev 190253)
+++ trunk/LayoutTests/ChangeLog 2015-09-25 22:01:21 UTC (rev 190254)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-09-25 Tim Horton <timothy_horton@apple.com>
+
+ Scrolling a overflow: scroll region makes find overlay holes stick to the edge of the region
+ https://bugs.webkit.org/show_bug.cgi?id=149572
+ <rdar://problem/13093602>
+
+ Reviewed by Simon Fraser.
+
+ * fast/text/mark-matches-overflow-clip-expected.txt: Added.
+ * fast/text/mark-matches-overflow-clip.html: Added.
+ Add a test ensuring that a find match that is clipped out by overflow
+ ends up with a clipped rendered rect.
+
</ins><span class="cx"> 2015-09-25 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Mark media/media-controls-play-button-updates.html failed for all Mac platforms.
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextmarkmatchesoverflowclipexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/mark-matches-overflow-clip-expected.txt (0 => 190254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/mark-matches-overflow-clip-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/text/mark-matches-overflow-clip-expected.txt 2015-09-25 22:01:21 UTC (rev 190254)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+marker rects: (58, 94, 15, 18)
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextmarkmatchesoverflowcliphtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/mark-matches-overflow-clip.html (0 => 190254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/mark-matches-overflow-clip.html (rev 0)
+++ trunk/LayoutTests/fast/text/mark-matches-overflow-clip.html 2015-09-25 22:01:21 UTC (rev 190254)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+<style>
+p {
+ display: inline-block;
+ overflow: scroll;
+ width: 60px;
+ margin: 50px;
+}
+</style>
+<p>
+<span style="position: relative; left: -25pt;">Quo usque tandem abutere, Catilina, patientia nostra?</span>
+</p>
+<script>
+window.onload = function () {
+ if (!window.internals) {
+ document.write("This test requires internals + testRunner to run.");
+ return;
+ }
+
+ testRunner.dumpAsText();
+ internals.countMatchesForText("tandem", 0, "mark");
+
+ var markedNode = document.getElementsByTagName("span")[0].firstChild;
+ document.write(internals.dumpMarkerRectsForNode(markedNode, "TextMatch", 0));
+}
+</script>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190253 => 190254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-25 21:50:48 UTC (rev 190253)
+++ trunk/Source/WebCore/ChangeLog 2015-09-25 22:01:21 UTC (rev 190254)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-09-25 Tim Horton <timothy_horton@apple.com>
+
+ Scrolling a overflow: scroll region makes find overlay holes stick to the edge of the region
+ https://bugs.webkit.org/show_bug.cgi?id=149572
+ <rdar://problem/13093602>
+
+ Reviewed by Simon Fraser.
+
+ Test: fast/text/mark-matches-overflow-clip.html
+
+ * rendering/InlineTextBox.cpp:
+ (WebCore::InlineTextBox::paintTextMatchMarker):
+ Clip the rendered marker rect to the overflow rect.
+
+ * testing/Internals.cpp:
+ (WebCore::Internals::dumpMarkerRectsForNode):
+ * testing/Internals.h:
+ * testing/Internals.idl:
+ Add a internals function to dump the rendered rects for a marker.
+
</ins><span class="cx"> 2015-09-25 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Win] Switch to CMake
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (190253 => 190254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineTextBox.cpp 2015-09-25 21:50:48 UTC (rev 190253)
+++ trunk/Source/WebCore/rendering/InlineTextBox.cpp 2015-09-25 22:01:21 UTC (rev 190254)
</span><span class="lines">@@ -1142,8 +1142,13 @@
</span><span class="cx"> font.adjustSelectionRectForText(run, renderedRect, sPos, ePos);
</span><span class="cx"> IntRect markerRect = enclosingIntRect(renderedRect);
</span><span class="cx"> markerRect = renderer().localToAbsoluteQuad(FloatQuad(markerRect)).enclosingBoundingBox();
</span><ins>+ markerRect.intersect(enclosingIntRect(renderer().absoluteClippedOverflowRect()));
+
+ if (markerRect.isEmpty())
+ return;
+
</ins><span class="cx"> marker.addRenderedRect(markerRect);
</span><del>-
</del><ins>+
</ins><span class="cx"> // Optionally highlight the text
</span><span class="cx"> if (renderer().frame().editor().markedTextMatchesAreHighlighted()) {
</span><span class="cx"> Color color = marker.activeMatch() ? renderer().theme().platformActiveTextSearchHighlightColor() : renderer().theme().platformInactiveTextSearchHighlightColor();
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (190253 => 190254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2015-09-25 21:50:48 UTC (rev 190253)
+++ trunk/Source/WebCore/testing/Internals.cpp 2015-09-25 22:01:21 UTC (rev 190254)
</span><span class="lines">@@ -1045,6 +1045,27 @@
</span><span class="cx"> return marker->description();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String Internals::dumpMarkerRectsForNode(Node* node, const String& markerType, unsigned index, ExceptionCode& ec)
+{
+ RenderedDocumentMarker* marker = markerAt(node, markerType, index, ec);
+ if (!marker)
+ return String();
+ StringBuilder rectString;
+ rectString.append("marker rects: ");
+ for (const auto& rect : marker->renderedRects()) {
+ rectString.append("(");
+ rectString.appendNumber(rect.x().toFloat());
+ rectString.append(", ");
+ rectString.appendNumber(rect.y().toFloat());
+ rectString.append(", ");
+ rectString.appendNumber(rect.width().toFloat());
+ rectString.append(", ");
+ rectString.appendNumber(rect.height().toFloat());
+ rectString.append(") ");
+ }
+ return rectString.toString();
+}
+
</ins><span class="cx"> void Internals::addTextMatchMarker(const Range* range, bool isActive)
</span><span class="cx"> {
</span><span class="cx"> range->ownerDocument().updateLayoutIgnorePendingStylesheets();
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (190253 => 190254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2015-09-25 21:50:48 UTC (rev 190253)
+++ trunk/Source/WebCore/testing/Internals.h 2015-09-25 22:01:21 UTC (rev 190254)
</span><span class="lines">@@ -158,6 +158,7 @@
</span><span class="cx"> unsigned markerCountForNode(Node*, const String&, ExceptionCode&);
</span><span class="cx"> RefPtr<Range> markerRangeForNode(Node*, const String& markerType, unsigned index, ExceptionCode&);
</span><span class="cx"> String markerDescriptionForNode(Node*, const String& markerType, unsigned index, ExceptionCode&);
</span><ins>+ String dumpMarkerRectsForNode(Node*, const String& markerType, unsigned index, ExceptionCode&);
</ins><span class="cx"> void addTextMatchMarker(const Range*, bool isActive);
</span><span class="cx"> void setMarkedTextMatchesAreHighlighted(bool, ExceptionCode&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (190253 => 190254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2015-09-25 21:50:48 UTC (rev 190253)
+++ trunk/Source/WebCore/testing/Internals.idl 2015-09-25 22:01:21 UTC (rev 190254)
</span><span class="lines">@@ -131,6 +131,7 @@
</span><span class="cx"> [RaisesException] unsigned long markerCountForNode(Node node, DOMString markerType);
</span><span class="cx"> [RaisesException] Range markerRangeForNode(Node node, DOMString markerType, unsigned long index);
</span><span class="cx"> [RaisesException] DOMString markerDescriptionForNode(Node node, DOMString markerType, unsigned long index);
</span><ins>+ [RaisesException] DOMString dumpMarkerRectsForNode(Node node, DOMString markerType, unsigned long index);
</ins><span class="cx"> void addTextMatchMarker(Range range, boolean isActive);
</span><span class="cx"> [RaisesException] void setMarkedTextMatchesAreHighlighted(boolean flag);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>