<!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>[183511] 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/183511">183511</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-04-28 15:21:25 -0700 (Tue, 28 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Checkboxes on bugs.webkit.org are painted with stripes at some zoom levels.
https://bugs.webkit.org/show_bug.cgi?id=144351
Reviewed by Simon Fraser.
This patch ensures that CG context is properly restored after painting dashed/dotted lines.
Source/WebCore:
Test: fast/forms/checkbox-painting-with-hr.html
* platform/graphics/cg/GraphicsContextCG.cpp:
(WebCore::GraphicsContext::drawLine):
LayoutTests:
* fast/forms/checkbox-painting-with-hr-expected.html: Added.
* fast/forms/checkbox-painting-with-hr.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="#trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp">trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastformscheckboxpaintingwithhrexpectedhtml">trunk/LayoutTests/fast/forms/checkbox-painting-with-hr-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastformscheckboxpaintingwithhrhtml">trunk/LayoutTests/fast/forms/checkbox-painting-with-hr.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (183510 => 183511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-04-28 21:51:04 UTC (rev 183510)
+++ trunk/LayoutTests/ChangeLog 2015-04-28 22:21:25 UTC (rev 183511)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-04-28 Zalan Bujtas <zalan@apple.com>
+
+ Checkboxes on bugs.webkit.org are painted with stripes at some zoom levels.
+ https://bugs.webkit.org/show_bug.cgi?id=144351
+
+ Reviewed by Simon Fraser.
+
+ This patch ensures that CG context is properly restored after painting dashed/dotted lines.
+
+ * fast/forms/checkbox-painting-with-hr-expected.html: Added.
+ * fast/forms/checkbox-painting-with-hr.html: Added.
+
</ins><span class="cx"> 2015-04-28 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> DFG should generate efficient code for branching on a string's boolean value.
</span></span></pre></div>
<a id="trunkLayoutTestsfastformscheckboxpaintingwithhrexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/checkbox-painting-with-hr-expected.html (0 => 183511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/checkbox-painting-with-hr-expected.html (rev 0)
+++ trunk/LayoutTests/fast/forms/checkbox-painting-with-hr-expected.html 2015-04-28 22:21:25 UTC (rev 183511)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that checkboxes are painted properly when dashed/dotted horizontal rule is present.</title>
+</head>
+<body>
+ <input type="checkbox" checked="checked">
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastformscheckboxpaintingwithhrhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/checkbox-painting-with-hr.html (0 => 183511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/checkbox-painting-with-hr.html (rev 0)
+++ trunk/LayoutTests/fast/forms/checkbox-painting-with-hr.html 2015-04-28 22:21:25 UTC (rev 183511)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that checkboxes are painted properly when dashed/dotted horizontal rule is present.</title>
+<style>
+ hr {
+ margin-top: -10px;
+ border: 1px dashed white;
+ }
+</style>
+</head>
+<body>
+ <hr>
+ <input type="checkbox" checked="checked">
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183510 => 183511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-28 21:51:04 UTC (rev 183510)
+++ trunk/Source/WebCore/ChangeLog 2015-04-28 22:21:25 UTC (rev 183511)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-04-28 Zalan Bujtas <zalan@apple.com>
+
+ Checkboxes on bugs.webkit.org are painted with stripes at some zoom levels.
+ https://bugs.webkit.org/show_bug.cgi?id=144351
+
+ Reviewed by Simon Fraser.
+
+ This patch ensures that CG context is properly restored after painting dashed/dotted lines.
+
+ Test: fast/forms/checkbox-painting-with-hr.html
+
+ * platform/graphics/cg/GraphicsContextCG.cpp:
+ (WebCore::GraphicsContext::drawLine):
+
</ins><span class="cx"> 2015-04-28 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Provide contentsToView() and viewToContents() functions on ScrollView, and use them
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (183510 => 183511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2015-04-28 21:51:04 UTC (rev 183510)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2015-04-28 22:21:25 UTC (rev 183511)
</span><span class="lines">@@ -294,11 +294,12 @@
</span><span class="cx"> CGContextRef context = platformContext();
</span><span class="cx"> StrokeStyle strokeStyle = this->strokeStyle();
</span><span class="cx"> float cornerWidth = 0;
</span><ins>+ bool drawsDashedLine = strokeStyle == DottedStroke || strokeStyle == DashedStroke;
</ins><span class="cx">
</span><del>- if (strokeStyle == DottedStroke || strokeStyle == DashedStroke) {
</del><ins>+ if (drawsDashedLine) {
+ CGContextSaveGState(context);
</ins><span class="cx"> // Figure out end points to ensure we always paint corners.
</span><span class="cx"> cornerWidth = strokeStyle == DottedStroke ? thickness : std::min(2 * thickness, std::max(thickness, strokeWidth / 3));
</span><del>- CGContextSaveGState(context);
</del><span class="cx"> setCGFillColor(context, strokeColor(), strokeColorSpace());
</span><span class="cx"> if (isVerticalLine) {
</span><span class="cx"> CGContextFillRect(context, FloatRect(point1.x(), point1.y(), thickness, cornerWidth));
</span><span class="lines">@@ -307,12 +308,13 @@
</span><span class="cx"> CGContextFillRect(context, FloatRect(point1.x(), point1.y(), cornerWidth, thickness));
</span><span class="cx"> CGContextFillRect(context, FloatRect(point2.x() - cornerWidth, point1.y(), cornerWidth, thickness));
</span><span class="cx"> }
</span><del>- CGContextRestoreGState(context);
</del><span class="cx"> strokeWidth -= 2 * cornerWidth;
</span><span class="cx"> float patternWidth = strokeStyle == DottedStroke ? thickness : std::min(3 * thickness, std::max(thickness, strokeWidth / 3));
</span><span class="cx"> // Check if corner drawing sufficiently covers the line.
</span><del>- if (strokeWidth <= patternWidth + 1)
</del><ins>+ if (strokeWidth <= patternWidth + 1) {
+ CGContextRestoreGState(context);
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Pattern starts with full fill and ends with the empty fill.
</span><span class="cx"> // 1. Let's start with the empty phase after the corner.
</span><span class="lines">@@ -360,6 +362,8 @@
</span><span class="cx"> CGContextMoveToPoint(context, p1.x(), p1.y());
</span><span class="cx"> CGContextAddLineToPoint(context, p2.x(), p2.y());
</span><span class="cx"> CGContextStrokePath(context);
</span><ins>+ if (drawsDashedLine)
+ CGContextRestoreGState(context);
</ins><span class="cx"> if (shouldAntialias())
</span><span class="cx"> CGContextSetShouldAntialias(context, true);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>