<!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>[244848] 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/244848">244848</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2019-05-01 13:46:20 -0700 (Wed, 01 May 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>[iOS] Star rating is covered with a black circle when writing a review on Yelp
https://bugs.webkit.org/show_bug.cgi?id=197469
<rdar://problem/48094446>

Reviewed by Dean Jackson.

Source/WebCore:

This patch moves the background painting of the radio/checkbox form controls in checked state to RenderTheme.
It enables content authors to disable default appearance using -webkit-appearance: none (it is also inline with what we do on macOS).

Test: fast/forms/radio-and-checkbox-checked-with-no-appearance.html

* css/html.css:
(input:matches([type="checkbox"], [type="radio"]):checked):
* rendering/RenderThemeIOS.mm:
(WebCore::RenderThemeIOS::paintCheckboxDecorations):
(WebCore::RenderThemeIOS::paintRadioDecorations):

LayoutTests:

* fast/forms/radio-and-checkbox-checked-with-no-appearance-expected.html: Added.
* fast/forms/radio-and-checkbox-checked-with-no-appearance.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="#trunkSourceWebCorecsshtmlcss">trunk/Source/WebCore/css/html.css</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeIOSmm">trunk/Source/WebCore/rendering/RenderThemeIOS.mm</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastformsradioandcheckboxcheckedwithnoappearanceexpectedhtml">trunk/LayoutTests/fast/forms/radio-and-checkbox-checked-with-no-appearance-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastformsradioandcheckboxcheckedwithnoappearancehtml">trunk/LayoutTests/fast/forms/radio-and-checkbox-checked-with-no-appearance.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (244847 => 244848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2019-05-01 20:44:36 UTC (rev 244847)
+++ trunk/LayoutTests/ChangeLog 2019-05-01 20:46:20 UTC (rev 244848)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2019-05-01  Zalan Bujtas  <zalan@apple.com>
+
+        [iOS] Star rating is covered with a black circle when writing a review on Yelp
+        https://bugs.webkit.org/show_bug.cgi?id=197469
+        <rdar://problem/48094446>
+
+        Reviewed by Dean Jackson.
+
+        * fast/forms/radio-and-checkbox-checked-with-no-appearance-expected.html: Added.
+        * fast/forms/radio-and-checkbox-checked-with-no-appearance.html: Added.
+
</ins><span class="cx"> 2019-05-01  Ryan Haddad  <ryanhaddad@apple.com>
</span><span class="cx"> 
</span><span class="cx">         REGRESSION: Layout test imported/w3c/web-platform-tests/resource-timing/resource-timing-level1.sub.html is frequently failing on Mac-ews
</span></span></pre></div>
<a id="trunkLayoutTestsfastformsradioandcheckboxcheckedwithnoappearanceexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/radio-and-checkbox-checked-with-no-appearance-expected.html (0 => 244848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/radio-and-checkbox-checked-with-no-appearance-expected.html                         (rev 0)
+++ trunk/LayoutTests/fast/forms/radio-and-checkbox-checked-with-no-appearance-expected.html    2019-05-01 20:46:20 UTC (rev 244848)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that the checked version of the radio and checkbox input controls paint blank with appearance: none</title>
+</head>
+<body>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastformsradioandcheckboxcheckedwithnoappearancehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/radio-and-checkbox-checked-with-no-appearance.html (0 => 244848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/radio-and-checkbox-checked-with-no-appearance.html                          (rev 0)
+++ trunk/LayoutTests/fast/forms/radio-and-checkbox-checked-with-no-appearance.html     2019-05-01 20:46:20 UTC (rev 244848)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that the checked version of the radio and checkbox input controls paint blank with appearance: none</title>
+<style>
+input {
+    width: 50px;
+    height: 50px;
+    -webkit-appearance: none;
+}
+</style>
+</head>
+<body>
+<input type="radio" checked><input type="checkbox" checked>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (244847 => 244848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-05-01 20:44:36 UTC (rev 244847)
+++ trunk/Source/WebCore/ChangeLog      2019-05-01 20:46:20 UTC (rev 244848)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2019-05-01  Zalan Bujtas  <zalan@apple.com>
+
+        [iOS] Star rating is covered with a black circle when writing a review on Yelp
+        https://bugs.webkit.org/show_bug.cgi?id=197469
+        <rdar://problem/48094446>
+
+        Reviewed by Dean Jackson.
+
+        This patch moves the background painting of the radio/checkbox form controls in checked state to RenderTheme.
+        It enables content authors to disable default appearance using -webkit-appearance: none (it is also inline with what we do on macOS).
+
+        Test: fast/forms/radio-and-checkbox-checked-with-no-appearance.html
+
+        * css/html.css:
+        (input:matches([type="checkbox"], [type="radio"]):checked):
+        * rendering/RenderThemeIOS.mm:
+        (WebCore::RenderThemeIOS::paintCheckboxDecorations):
+        (WebCore::RenderThemeIOS::paintRadioDecorations):
+
</ins><span class="cx"> 2019-05-01  Said Abou-Hallawa  <sabouhallawa@apple.com>
</span><span class="cx"> 
</span><span class="cx">         REGRESSION (r244182): RenderingUpdate should not be scheduled for invisible pages
</span></span></pre></div>
<a id="trunkSourceWebCorecsshtmlcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/html.css (244847 => 244848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/html.css        2019-05-01 20:44:36 UTC (rev 244847)
+++ trunk/Source/WebCore/css/html.css   2019-05-01 20:46:20 UTC (rev 244848)
</span><span class="lines">@@ -886,7 +886,6 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> input:matches([type="checkbox"], [type="radio"]):checked {
</span><del>-    background: rgba(0, 0, 0, 0.8);
</del><span class="cx">     border-color: rgba(255, 255, 255, 0.0);
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.mm (244847 => 244848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2019-05-01 20:44:36 UTC (rev 244847)
+++ trunk/Source/WebCore/rendering/RenderThemeIOS.mm    2019-05-01 20:46:20 UTC (rev 244848)
</span><span class="lines">@@ -385,13 +385,15 @@
</span><span class="cx">     bool checked = isChecked(box);
</span><span class="cx">     bool indeterminate = isIndeterminate(box);
</span><span class="cx">     CGContextRef cgContext = paintInfo.context().platformContext();
</span><del>-
</del><span class="cx">     GraphicsContextStateSaver stateSaver { paintInfo.context() };
</span><del>-    auto clip = addRoundedBorderClip(box, paintInfo.context(), rect);
-    float width = clip.width();
-    float height = clip.height();
</del><span class="cx"> 
</span><span class="cx">     if (checked || indeterminate) {
</span><ins>+        auto border = box.style().getRoundedBorderFor(rect);
+        paintInfo.context().fillRoundedRect(border.pixelSnappedRoundedRectForPainting(box.document().deviceScaleFactor()), Color(0.0f, 0.0f, 0.0f, 0.8f));
+
+        auto clip = addRoundedBorderClip(box, paintInfo.context(), rect);
+        auto width = clip.width();
+        auto height = clip.height();
</ins><span class="cx">         drawAxialGradient(cgContext, gradientWithName(ConcaveGradient), clip.location(), FloatPoint { clip.x(), clip.maxY() }, LinearInterpolation);
</span><span class="cx"> 
</span><span class="cx">         constexpr float thicknessRatio = 2 / 14.0;
</span><span class="lines">@@ -425,10 +427,13 @@
</span><span class="cx">         lineWidth = std::max<float>(lineWidth, 1);
</span><span class="cx">         drawJoinedLines(cgContext, Vector<CGPoint> { WTFMove(shadow) }, kCGLineCapSquare, lineWidth, Color { 0.0f, 0.0f, 0.0f, 0.7f });
</span><span class="cx"> 
</span><del>-        lineWidth = std::max<float>(std::min(clip.width(), clip.height()) * thicknessRatio, 1);
</del><ins>+        lineWidth = std::max<float>(std::min(width, height) * thicknessRatio, 1);
</ins><span class="cx">         drawJoinedLines(cgContext, Vector<CGPoint> { WTFMove(line) }, kCGLineCapButt, lineWidth, Color { 1.0f, 1.0f, 1.0f, 240 / 255.0f });
</span><span class="cx">     } else {
</span><del>-        FloatPoint bottomCenter { clip.x() + clip.width() / 2.0f, clip.maxY() };
</del><ins>+        auto clip = addRoundedBorderClip(box, paintInfo.context(), rect);
+        auto width = clip.width();
+        auto height = clip.height();
+        FloatPoint bottomCenter { clip.x() + width / 2.0f, clip.maxY() };
</ins><span class="cx"> 
</span><span class="cx">         drawAxialGradient(cgContext, gradientWithName(ShadeGradient), clip.location(), FloatPoint { clip.x(), clip.maxY() }, LinearInterpolation);
</span><span class="cx">         drawRadialGradient(cgContext, gradientWithName(ShineGradient), bottomCenter, 0, bottomCenter, sqrtf((width * width) / 4.0f + height * height), ExponentialInterpolation);
</span><span class="lines">@@ -471,10 +476,19 @@
</span><span class="cx"> bool RenderThemeIOS::paintRadioDecorations(const RenderObject& box, const PaintInfo& paintInfo, const IntRect& rect)
</span><span class="cx"> {
</span><span class="cx">     GraphicsContextStateSaver stateSaver(paintInfo.context());
</span><del>-    FloatRect clip = addRoundedBorderClip(box, paintInfo.context(), rect);
</del><ins>+    CGContextRef cgContext = paintInfo.context().platformContext();
</ins><span class="cx"> 
</span><del>-    CGContextRef cgContext = paintInfo.context().platformContext();
</del><ins>+    auto drawShadeAndShineGradients = [&](auto clip) {
+        FloatPoint bottomCenter(clip.x() + clip.width() / 2.0, clip.maxY());
+        drawAxialGradient(cgContext, gradientWithName(ShadeGradient), clip.location(), FloatPoint(clip.x(), clip.maxY()), LinearInterpolation);
+        drawRadialGradient(cgContext, gradientWithName(ShineGradient), bottomCenter, 0, bottomCenter, std::max(clip.width(), clip.height()), ExponentialInterpolation);
+    };
+
</ins><span class="cx">     if (isChecked(box)) {
</span><ins>+        auto border = box.style().getRoundedBorderFor(rect);
+        paintInfo.context().fillRoundedRect(border.pixelSnappedRoundedRectForPainting(box.document().deviceScaleFactor()), Color(0.0f, 0.0f, 0.0f, 0.8f));
+
+        auto clip = addRoundedBorderClip(box, paintInfo.context(), rect);
</ins><span class="cx">         drawAxialGradient(cgContext, gradientWithName(ConcaveGradient), clip.location(), FloatPoint(clip.x(), clip.maxY()), LinearInterpolation);
</span><span class="cx"> 
</span><span class="cx">         // The inner circle is 6 / 14 the size of the surrounding circle, 
</span><span class="lines">@@ -489,10 +503,11 @@
</span><span class="cx"> 
</span><span class="cx">         FloatSize radius(clip.width() / 2.0f, clip.height() / 2.0f);
</span><span class="cx">         paintInfo.context().clipRoundedRect(FloatRoundedRect(clip, radius, radius, radius, radius));
</span><ins>+        drawShadeAndShineGradients(clip);
+    } else {
+        auto clip = addRoundedBorderClip(box, paintInfo.context(), rect);
+        drawShadeAndShineGradients(clip);
</ins><span class="cx">     }
</span><del>-    FloatPoint bottomCenter(clip.x() + clip.width() / 2.0, clip.maxY());
-    drawAxialGradient(cgContext, gradientWithName(ShadeGradient), clip.location(), FloatPoint(clip.x(), clip.maxY()), LinearInterpolation);
-    drawRadialGradient(cgContext, gradientWithName(ShineGradient), bottomCenter, 0, bottomCenter, std::max(clip.width(), clip.height()), ExponentialInterpolation);
</del><span class="cx">     return false;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>