<!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>[198599] trunk/Source/WebCore</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/198599">198599</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-03-23 15:27:42 -0700 (Wed, 23 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Change the paint count indicator to indicate whether a layer is opaque
https://bugs.webkit.org/show_bug.cgi?id=155810
Reviewed by Tim Horton.
In non-opaque layers, give the paint count indicator a diagonal top left corner. Being
able to see layer opaqueness helps diagnose bugs.
Also use CGContextStateSaver, and move the indicator in by a pixel to overlap less
with the layer border.
* platform/graphics/ca/PlatformCALayer.cpp:
(WebCore::PlatformCALayer::drawRepaintIndicator):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaPlatformCALayercpp">trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198598 => 198599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-23 21:55:55 UTC (rev 198598)
+++ trunk/Source/WebCore/ChangeLog 2016-03-23 22:27:42 UTC (rev 198599)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-03-23 Simon Fraser <simon.fraser@apple.com>
+
+ Change the paint count indicator to indicate whether a layer is opaque
+ https://bugs.webkit.org/show_bug.cgi?id=155810
+
+ Reviewed by Tim Horton.
+
+ In non-opaque layers, give the paint count indicator a diagonal top left corner. Being
+ able to see layer opaqueness helps diagnose bugs.
+
+ Also use CGContextStateSaver, and move the indicator in by a pixel to overlap less
+ with the layer border.
+
+ * platform/graphics/ca/PlatformCALayer.cpp:
+ (WebCore::PlatformCALayer::drawRepaintIndicator):
+
</ins><span class="cx"> 2016-03-23 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> ASSERTION FAILED: y2 >= y1 in WebCore::RenderElement::drawLineForBoxSide
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaPlatformCALayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp (198598 => 198599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp 2016-03-23 21:55:55 UTC (rev 198598)
+++ trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp 2016-03-23 22:27:42 UTC (rev 198599)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "PlatformCALayer.h"
</span><span class="cx">
</span><ins>+#include "GraphicsContextCG.h"
</ins><span class="cx"> #include "LayerPool.h"
</span><span class="cx"> #include "PlatformCALayerClient.h"
</span><span class="cx"> #include "TextStream.h"
</span><span class="lines">@@ -64,12 +65,11 @@
</span><span class="cx"> char text[16]; // that's a lot of repaints
</span><span class="cx"> snprintf(text, sizeof(text), "%d", repaintCount);
</span><span class="cx">
</span><del>- CGRect indicatorBox = platformCALayer->bounds();
</del><ins>+ FloatRect indicatorBox = platformCALayer->bounds();\
+ indicatorBox.setLocation( { 1, 1 } );
+ indicatorBox.setSize(FloatSize(12 + 10 * strlen(text), 27));
</ins><span class="cx">
</span><del>- CGContextSaveGState(context);
-
- indicatorBox.size.width = 12 + 10 * strlen(text);
- indicatorBox.size.height = 27;
</del><ins>+ CGContextStateSaver stateSaver(context);
</ins><span class="cx">
</span><span class="cx"> CGContextSetAlpha(context, 0.5f);
</span><span class="cx"> CGContextBeginTransparencyLayerWithRect(context, indicatorBox, 0);
</span><span class="lines">@@ -79,23 +79,37 @@
</span><span class="cx"> else
</span><span class="cx"> CGContextSetRGBFillColor(context, 0, 0.5f, 0.25f, 1);
</span><span class="cx">
</span><del>- CGContextFillRect(context, indicatorBox);
-
- if (platformCALayer->acceleratesDrawing())
- CGContextSetRGBFillColor(context, 1, 0, 0, 1);
- else
- CGContextSetRGBFillColor(context, 1, 1, 1, 1);
</del><ins>+ if (platformCALayer->isOpaque())
+ CGContextFillRect(context, indicatorBox);
+ else {
+ Path boundsPath;
+ boundsPath.moveTo(indicatorBox.maxXMinYCorner());
+ boundsPath.addLineTo(indicatorBox.maxXMaxYCorner());
+ boundsPath.addLineTo(indicatorBox.minXMaxYCorner());
</ins><span class="cx">
</span><ins>+ const float cornerChunk = 8;
+ boundsPath.addLineTo(FloatPoint(indicatorBox.x(), indicatorBox.y() + cornerChunk));
+ boundsPath.addLineTo(FloatPoint(indicatorBox.x() + cornerChunk, indicatorBox.y()));
+ boundsPath.closeSubpath();
+
+ CGContextAddPath(context, boundsPath.platformPath());
+ CGContextFillPath(context);
+ }
+
</ins><span class="cx"> if (platformCALayer->owner()->isUsingDisplayListDrawing(platformCALayer)) {
</span><span class="cx"> CGContextSetRGBStrokeColor(context, 0, 0, 0, 0.65);
</span><span class="cx"> CGContextSetLineWidth(context, 2);
</span><span class="cx"> CGContextStrokeRect(context, indicatorBox);
</span><span class="cx"> }
</span><ins>+
+ if (platformCALayer->acceleratesDrawing())
+ CGContextSetRGBFillColor(context, 1, 0, 0, 1);
+ else
+ CGContextSetRGBFillColor(context, 1, 1, 1, 1);
</ins><span class="cx">
</span><del>- platformCALayer->drawTextAtPoint(context, indicatorBox.origin.x + 5, indicatorBox.origin.y + 22, CGSizeMake(1, -1), 22, text, strlen(text));
</del><ins>+ platformCALayer->drawTextAtPoint(context, indicatorBox.x() + 5, indicatorBox.y() + 22, CGSizeMake(1, -1), 22, text, strlen(text));
</ins><span class="cx">
</span><span class="cx"> CGContextEndTransparencyLayer(context);
</span><del>- CGContextRestoreGState(context);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PlatformCALayer::flipContext(CGContextRef context, CGFloat height)
</span></span></pre>
</div>
</div>
</body>
</html>