<!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>[198138] 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/198138">198138</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-03-14 10:22:54 -0700 (Mon, 14 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Outline: auto has sharp corners with single line contenteditable.
https://bugs.webkit.org/show_bug.cgi?id=155418
Reviewed by Tim Horton.
Multiple rectangles assumed multiline content and it broke bottomLeft and bottomRight corner check.
This patch adds fast path for polygons with 4 corners.
Source/WebCore:
Test: fast/inline/hidpi-outline-auto-with-one-focusring-rect.html
* platform/graphics/PathUtilities.cpp:
(WebCore::cornerType):
(WebCore::cornerTypeForMultiline):
(WebCore::rectFromPolygon):
(WebCore::PathUtilities::pathWithShrinkWrappedRectsForOutline):
LayoutTests:
* fast/inline/hidpi-outline-auto-with-one-focusring-rect-expected.html: Added.
* fast/inline/hidpi-outline-auto-with-one-focusring-rect.html: Added.</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="#trunkSourceWebCoreplatformgraphicsPathUtilitiescpp">trunk/Source/WebCore/platform/graphics/PathUtilities.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastinlinehidpioutlineautowithonefocusringrectexpectedhtml">trunk/LayoutTests/fast/inline/hidpi-outline-auto-with-one-focusring-rect-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastinlinehidpioutlineautowithonefocusringrecthtml">trunk/LayoutTests/fast/inline/hidpi-outline-auto-with-one-focusring-rect.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (198137 => 198138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-14 17:18:53 UTC (rev 198137)
+++ trunk/LayoutTests/ChangeLog 2016-03-14 17:22:54 UTC (rev 198138)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-03-14 Zalan Bujtas <zalan@apple.com>
+
+ Outline: auto has sharp corners with single line contenteditable.
+ https://bugs.webkit.org/show_bug.cgi?id=155418
+
+ Reviewed by Tim Horton.
+
+ Multiple rectangles assumed multiline content and it broke bottomLeft and bottomRight corner check.
+ This patch adds fast path for polygons with 4 corners.
+
+ * fast/inline/hidpi-outline-auto-with-one-focusring-rect-expected.html: Added.
+ * fast/inline/hidpi-outline-auto-with-one-focusring-rect.html: Added.
+
</ins><span class="cx"> 2016-03-14 Joanmarie Diggs <jdiggs@igalia.com>
</span><span class="cx">
</span><span class="cx"> [AX] SVG element with child desc not exposed
</span></span></pre></div>
<a id="trunkLayoutTestsfastinlinehidpioutlineautowithonefocusringrectexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/inline/hidpi-outline-auto-with-one-focusring-rect-expected.html (0 => 198138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/inline/hidpi-outline-auto-with-one-focusring-rect-expected.html (rev 0)
+++ trunk/LayoutTests/fast/inline/hidpi-outline-auto-with-one-focusring-rect-expected.html 2016-03-14 17:22:54 UTC (rev 198138)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests when focusring collects multiple rects but they end up being one final rect.</title>
+</head>
+<body></body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastinlinehidpioutlineautowithonefocusringrecthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/inline/hidpi-outline-auto-with-one-focusring-rect.html (0 => 198138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/inline/hidpi-outline-auto-with-one-focusring-rect.html (rev 0)
+++ trunk/LayoutTests/fast/inline/hidpi-outline-auto-with-one-focusring-rect.html 2016-03-14 17:22:54 UTC (rev 198138)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests when focusring collects multiple rects but they end up being one final rect.</title>
+<style>
+div {
+ position: absolute;
+}
+
+.border-radius {
+ outline-style: auto;
+ border-radius: 10px 10px 10px 10px;
+ color: white;
+ top: 10px;
+ left: 10px;
+ width: 300px;
+ height: 40px;
+}
+
+.cover {
+ border: 6px solid white;
+ border-radius: 14px 14px 14px 14px;
+ top: 6px;
+ left: 6px;
+ width: 296px;
+ height: 36px;
+}
+</style>
+</head>
+<body>
+<div class=border-radius contentEditable="true">foobar foobar foobar</div>
+<div class=cover></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198137 => 198138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-14 17:18:53 UTC (rev 198137)
+++ trunk/Source/WebCore/ChangeLog 2016-03-14 17:22:54 UTC (rev 198138)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-03-14 Zalan Bujtas <zalan@apple.com>
+
+ Outline: auto has sharp corners with single line contenteditable.
+ https://bugs.webkit.org/show_bug.cgi?id=155418
+
+ Reviewed by Tim Horton.
+
+ Multiple rectangles assumed multiline content and it broke bottomLeft and bottomRight corner check.
+ This patch adds fast path for polygons with 4 corners.
+
+ Test: fast/inline/hidpi-outline-auto-with-one-focusring-rect.html
+
+ * platform/graphics/PathUtilities.cpp:
+ (WebCore::cornerType):
+ (WebCore::cornerTypeForMultiline):
+ (WebCore::rectFromPolygon):
+ (WebCore::PathUtilities::pathWithShrinkWrappedRectsForOutline):
+
</ins><span class="cx"> 2016-03-14 Joanmarie Diggs <jdiggs@igalia.com>
</span><span class="cx">
</span><span class="cx"> [AX] SVG element with child desc not exposed
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsPathUtilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/PathUtilities.cpp (198137 => 198138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/PathUtilities.cpp 2016-03-14 17:18:53 UTC (rev 198137)
+++ trunk/Source/WebCore/platform/graphics/PathUtilities.cpp 2016-03-14 17:22:54 UTC (rev 198138)
</span><span class="lines">@@ -307,7 +307,7 @@
</span><span class="cx">
</span><span class="cx"> for (auto& poly : polys) {
</span><span class="cx"> Path path;
</span><del>- for (unsigned i = 0; i < poly.size(); i++) {
</del><ins>+ for (unsigned i = 0; i < poly.size(); ++i) {
</ins><span class="cx"> FloatPointGraph::Edge& toEdge = poly[i];
</span><span class="cx"> // Connect the first edge to the last.
</span><span class="cx"> FloatPointGraph::Edge& fromEdge = (i > 0) ? poly[i - 1] : poly[poly.size() - 1];
</span><span class="lines">@@ -373,22 +373,36 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> enum class CornerType { TopLeft, TopRight, BottomRight, BottomLeft, Other };
</span><del>-static CornerType cornerType(const FloatPointGraph::Edge& fromEdge, const FloatPointGraph::Edge& toEdge, const Vector<FloatPoint>& corners)
</del><ins>+static CornerType cornerType(const FloatPointGraph::Edge& fromEdge, const FloatPointGraph::Edge& toEdge)
</ins><span class="cx"> {
</span><span class="cx"> auto fromEdgeVector = *fromEdge.second - *fromEdge.first;
</span><span class="cx"> auto toEdgeVector = *toEdge.second - *toEdge.first;
</span><span class="cx">
</span><del>- if (fromEdgeVector.height() < 0 && toEdgeVector.width() > 0 && corners.at(0) == *fromEdge.second)
</del><ins>+ if (fromEdgeVector.height() < 0 && toEdgeVector.width() > 0)
</ins><span class="cx"> return CornerType::TopLeft;
</span><del>- if (fromEdgeVector.width() > 0 && toEdgeVector.height() > 0 && corners.at(1) == *fromEdge.second)
</del><ins>+ if (fromEdgeVector.width() > 0 && toEdgeVector.height() > 0)
</ins><span class="cx"> return CornerType::TopRight;
</span><del>- if (fromEdgeVector.height() > 0 && toEdgeVector.width() < 0 && corners.at(2) == *fromEdge.second)
</del><ins>+ if (fromEdgeVector.height() > 0 && toEdgeVector.width() < 0)
</ins><span class="cx"> return CornerType::BottomRight;
</span><del>- if (fromEdgeVector.width() < 0 && toEdgeVector.height() < 0 && corners.at(3) == *fromEdge.second)
</del><ins>+ if (fromEdgeVector.width() < 0 && toEdgeVector.height() < 0)
</ins><span class="cx"> return CornerType::BottomLeft;
</span><span class="cx"> return CornerType::Other;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static CornerType cornerTypeForMultiline(const FloatPointGraph::Edge& fromEdge, const FloatPointGraph::Edge& toEdge, const Vector<FloatPoint>& corners)
+{
+ auto corner = cornerType(fromEdge, toEdge);
+ if (corner == CornerType::TopLeft && corners.at(0) == *fromEdge.second)
+ return corner;
+ if (corner == CornerType::TopRight && corners.at(1) == *fromEdge.second)
+ return corner;
+ if (corner == CornerType::BottomRight && corners.at(2) == *fromEdge.second)
+ return corner;
+ if (corner == CornerType::BottomLeft && corners.at(3) == *fromEdge.second)
+ return corner;
+ return CornerType::Other;
+}
+
</ins><span class="cx"> static std::pair<FloatPoint, FloatPoint> controlPointsForBezierCurve(CornerType cornerType, const FloatPointGraph::Edge& fromEdge,
</span><span class="cx"> const FloatPointGraph::Edge& toEdge, const FloatSize& radius)
</span><span class="cx"> {
</span><span class="lines">@@ -445,6 +459,30 @@
</span><span class="cx"> return radii;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static Optional<FloatRect> rectFromPolygon(const FloatPointGraph::Polygon& poly)
+{
+ if (poly.size() != 4)
+ return Optional<FloatRect>();
+
+ Optional<FloatPoint> topLeft;
+ Optional<FloatPoint> bottomRight;
+ for (unsigned i = 0; i < poly.size(); ++i) {
+ const auto& toEdge = poly[i];
+ const auto& fromEdge = (i > 0) ? poly[i - 1] : poly[poly.size() - 1];
+ auto corner = cornerType(fromEdge, toEdge);
+ if (corner == CornerType::TopLeft) {
+ ASSERT(!topLeft);
+ topLeft = *fromEdge.second;
+ } else if (corner == CornerType::BottomRight) {
+ ASSERT(!bottomRight);
+ bottomRight = *fromEdge.second;
+ }
+ }
+ if (!topLeft || !bottomRight)
+ return Optional<FloatRect>();
+ return FloatRect(topLeft.value(), bottomRight.value());
+}
+
</ins><span class="cx"> Path PathUtilities::pathWithShrinkWrappedRectsForOutline(const Vector<FloatRect>& rects, const BorderData& borderData, float outlineOffset, TextDirection direction,
</span><span class="cx"> WritingMode writingMode)
</span><span class="cx"> {
</span><span class="lines">@@ -453,21 +491,31 @@
</span><span class="cx"> FloatSize topRightRadius = FloatSize(borderData.topRight().width().value(), borderData.topRight().height().value());
</span><span class="cx"> FloatSize bottomRightRadius = FloatSize(borderData.bottomRight().width().value(), borderData.bottomRight().height().value());
</span><span class="cx"> FloatSize bottomLeftRadius = FloatSize(borderData.bottomLeft().width().value(), borderData.bottomLeft().height().value());
</span><del>- if (rects.size() == 1) {
- FloatRect rect = rects.at(0);
</del><ins>+
+ auto roundedRect = [topLeftRadius, topRightRadius, bottomRightRadius, bottomLeftRadius, outlineOffset] (const FloatRect& rect)
+ {
</ins><span class="cx"> auto radii = adjustedtRadiiForHuggingCurve(topLeftRadius, topRightRadius, bottomLeftRadius, bottomRightRadius, outlineOffset);
</span><span class="cx"> radii.scale(calcBorderRadiiConstraintScaleFor(rect, radii));
</span><span class="cx">
</span><span class="cx"> Path path;
</span><span class="cx"> path.addRoundedRect(FloatRoundedRect(rect, radii));
</span><span class="cx"> return path;
</span><del>- }
</del><ins>+ };
</ins><span class="cx">
</span><ins>+ if (rects.size() == 1)
+ return roundedRect(rects.at(0));
+
</ins><span class="cx"> FloatPointGraph graph;
</span><span class="cx"> const auto polys = polygonsForRect(rects, graph);
</span><span class="cx"> // Fall back to corner painting with no radius for empty and disjoint rectangles.
</span><span class="cx"> if (!polys.size() || polys.size() > 1)
</span><span class="cx"> return Path();
</span><ins>+ const auto& poly = polys.at(0);
+ // Fast path when poly has one rect only.
+ Optional<FloatRect> rect = rectFromPolygon(poly);
+ if (rect)
+ return roundedRect(rect.value());
+
</ins><span class="cx"> Path path;
</span><span class="cx"> // Multiline outline needs to match multiline border painting. Only first and last lines are getting rounded borders.
</span><span class="cx"> auto isLeftToRight = isLeftToRightDirection(direction);
</span><span class="lines">@@ -490,8 +538,7 @@
</span><span class="cx"> corners.append(lastLineRect.maxXMaxYCorner());
</span><span class="cx"> corners.append(isHorizontal ? firstLineRect.minXMaxYCorner() : lastLineRect.minXMaxYCorner());
</span><span class="cx">
</span><del>- const auto& poly = polys.at(0);
- for (unsigned i = 0; i < poly.size(); i++) {
</del><ins>+ for (unsigned i = 0; i < poly.size(); ++i) {
</ins><span class="cx"> auto moveOrAddLineTo = [i, &path] (const FloatPoint& startPoint)
</span><span class="cx"> {
</span><span class="cx"> if (!i)
</span><span class="lines">@@ -502,7 +549,7 @@
</span><span class="cx"> const auto& toEdge = poly[i];
</span><span class="cx"> const auto& fromEdge = (i > 0) ? poly[i - 1] : poly[poly.size() - 1];
</span><span class="cx"> FloatSize radius;
</span><del>- auto corner = cornerType(fromEdge, toEdge, corners);
</del><ins>+ auto corner = cornerTypeForMultiline(fromEdge, toEdge, corners);
</ins><span class="cx"> switch (corner) {
</span><span class="cx"> case CornerType::TopLeft: {
</span><span class="cx"> radius = topLeftRadius;
</span></span></pre>
</div>
</div>
</body>
</html>