<!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>[201752] 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/201752">201752</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-06-07 08:03:40 -0700 (Tue, 07 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Video elements are painted twice, in PaintPhaseForeground and PaintPhaseSelfOutline
https://bugs.webkit.org/show_bug.cgi?id=158247
Patch by Fujii Hironori <Hironori.Fujii@sony.com> on 2016-06-07
Reviewed by Simon Fraser.
Source/WebCore:
Test: fast/replaced/outline-replaced-elements-offset.html
In <http://trac.webkit.org/changeset/105247>,
RenderReplaced::paint was changed to call
RenderReplaced::paintReplaced in PaintPhaseOutline and
PaintPhaseSelfOutline to paint outline of SVG.
As the result, RenderVideo::paintReplaced paints twice,
in forground and outline phase.
It was changed to paint outline of SVG in PaintPhaseForeground
since <http://trac.webkit.org/changeset/168645>. No need to call
RenderReplaced::paintReplaced in outline phases anymore.
* rendering/RenderReplaced.cpp:
(WebCore::RenderReplaced::paint): Return early if
PaintPhaseOutline or PaintPhaseSelfOutline.
Return early unless PaintPhaseForeground nor PaintPhaseSelection,
even if canHaveChildren().
LayoutTests:
* fast/replaced/outline-replaced-elements-offset-expected.html: Added.
* fast/replaced/outline-replaced-elements-offset.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="#trunkSourceWebCorerenderingRenderReplacedcpp">trunk/Source/WebCore/rendering/RenderReplaced.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastreplacedoutlinereplacedelementsoffsetexpectedhtml">trunk/LayoutTests/fast/replaced/outline-replaced-elements-offset-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastreplacedoutlinereplacedelementsoffsethtml">trunk/LayoutTests/fast/replaced/outline-replaced-elements-offset.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (201751 => 201752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-07 14:32:24 UTC (rev 201751)
+++ trunk/LayoutTests/ChangeLog 2016-06-07 15:03:40 UTC (rev 201752)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-06-07 Fujii Hironori <Hironori.Fujii@sony.com>
+
+ Video elements are painted twice, in PaintPhaseForeground and PaintPhaseSelfOutline
+ https://bugs.webkit.org/show_bug.cgi?id=158247
+
+ Reviewed by Simon Fraser.
+
+ * fast/replaced/outline-replaced-elements-offset-expected.html: Added.
+ * fast/replaced/outline-replaced-elements-offset.html: Added.
+
</ins><span class="cx"> 2016-06-07 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Mark fast/text/international/system-language/han-quotes.html as flaky
</span></span></pre></div>
<a id="trunkLayoutTestsfastreplacedoutlinereplacedelementsoffsetexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/replaced/outline-replaced-elements-offset-expected.html (0 => 201752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/replaced/outline-replaced-elements-offset-expected.html (rev 0)
+++ trunk/LayoutTests/fast/replaced/outline-replaced-elements-offset-expected.html 2016-06-07 15:03:40 UTC (rev 201752)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .group {
+ float: left; width: 180px;
+ }
+
+ div.item {
+ margin: 10px 0 20px 10px;
+ outline: 4px solid black;
+ outline-offset: -10px;
+ background-color: blue;
+ display: block;
+ height: 100px;
+ width: 100px;
+ }
+</style>
+
+<body>
+All the replaced elements below should have a solid black inset outline.<p>
+
+<div class="group">
+ &lt;video&gt;
+ <div class="item"></div>
+ &lt;canvas&gt;
+ <div class="item"></div>
+ &lt;media&gt;
+ <div class="item"></div>
+</div>
+
+<div class="group">
+ &lt;iframe&gt;
+ <div class="item"></div>
+ &lt;object&gt;
+ <div class="item"></div>
+</div>
+
+<div class="group">
+ &lt;input type=image&gt;
+ <div class="item"></div>
+ &lt;img&gt;
+ <div class="item"></div>
+</div>
+
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastreplacedoutlinereplacedelementsoffsethtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/replaced/outline-replaced-elements-offset.html (0 => 201752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/replaced/outline-replaced-elements-offset.html (rev 0)
+++ trunk/LayoutTests/fast/replaced/outline-replaced-elements-offset.html 2016-06-07 15:03:40 UTC (rev 201752)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .group {
+ float: left; width: 180px;
+ }
+
+ iframe, object, img, input[type="image"], canvas, media, video {
+ margin: 10px 0 20px 10px;
+ outline: 4px solid black;
+ outline-offset: -10px;
+ border: none;
+ border-radius: 0;
+ background-color: blue;
+ display: block;
+ height: 100px;
+ width: 100px;
+ }
+</style>
+
+<body>
+All the replaced elements below should have a solid black inset outline.<p>
+
+<div class="group">
+ &lt;video&gt;
+ <video poster="resources/square-blue-100x100.png"></video>
+ &lt;canvas&gt;
+ <canvas src="one day maybe"></canvas>
+ &lt;media&gt;
+ <media src=""></media>
+</div>
+
+<div class="group">
+ &lt;iframe&gt;
+ <iframe src="resources/square-blue-100x100.png"></iframe>
+ &lt;object&gt;
+ <object src="resources/square-blue-100x100.png"></object>
+</div>
+
+<div class="group">
+ &lt;input type=image&gt;
+ <input type="image" src="resources/square-blue-100x100.png">
+ &lt;img&gt;
+ <img src="resources/square-blue-100x100.png">
+</div>
+
+</body>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201751 => 201752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-07 14:32:24 UTC (rev 201751)
+++ trunk/Source/WebCore/ChangeLog 2016-06-07 15:03:40 UTC (rev 201752)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2016-06-07 Fujii Hironori <Hironori.Fujii@sony.com>
+
+ Video elements are painted twice, in PaintPhaseForeground and PaintPhaseSelfOutline
+ https://bugs.webkit.org/show_bug.cgi?id=158247
+
+ Reviewed by Simon Fraser.
+
+ Test: fast/replaced/outline-replaced-elements-offset.html
+
+ In <http://trac.webkit.org/changeset/105247>,
+ RenderReplaced::paint was changed to call
+ RenderReplaced::paintReplaced in PaintPhaseOutline and
+ PaintPhaseSelfOutline to paint outline of SVG.
+
+ As the result, RenderVideo::paintReplaced paints twice,
+ in forground and outline phase.
+
+ It was changed to paint outline of SVG in PaintPhaseForeground
+ since <http://trac.webkit.org/changeset/168645>. No need to call
+ RenderReplaced::paintReplaced in outline phases anymore.
+
+ * rendering/RenderReplaced.cpp:
+ (WebCore::RenderReplaced::paint): Return early if
+ PaintPhaseOutline or PaintPhaseSelfOutline.
+ Return early unless PaintPhaseForeground nor PaintPhaseSelection,
+ even if canHaveChildren().
+
</ins><span class="cx"> 2016-06-07 Nael Ouedraogo <nael.ouedraogo@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> Creating a TouchList with non Touch items should throw an exception
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderReplacedcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderReplaced.cpp (201751 => 201752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderReplaced.cpp 2016-06-07 14:32:24 UTC (rev 201751)
+++ trunk/Source/WebCore/rendering/RenderReplaced.cpp 2016-06-07 15:03:40 UTC (rev 201752)
</span><span class="lines">@@ -154,11 +154,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutRect paintRect = LayoutRect(adjustedPaintOffset, size());
</span><del>- if ((paintInfo.phase == PaintPhaseOutline || paintInfo.phase == PaintPhaseSelfOutline) && style().outlineWidth())
- paintOutline(paintInfo, paintRect);
-
- if (paintInfo.phase != PaintPhaseForeground && paintInfo.phase != PaintPhaseSelection && !canHaveChildren())
</del><ins>+ if (paintInfo.phase == PaintPhaseOutline || paintInfo.phase == PaintPhaseSelfOutline) {
+ if (style().outlineWidth())
+ paintOutline(paintInfo, paintRect);
</ins><span class="cx"> return;
</span><ins>+ }
+
+ if (paintInfo.phase != PaintPhaseForeground && paintInfo.phase != PaintPhaseSelection)
+ return;
</ins><span class="cx">
</span><span class="cx"> if (!paintInfo.shouldPaintWithinRoot(*this))
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>