<!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>[164380] 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/164380">164380</a></dd>
<dt>Author</dt> <dd>krit@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-19 12:15:18 -0800 (Wed, 19 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Missing box doesn't use border-box as reference box for clip-path
https://bugs.webkit.org/show_bug.cgi?id=129049
Reviewed by Simon Fraser.
Source/WebCore:
If no reference box was specified the default reference box should be
border-box. Previously to this patch the reference box was the bounding
client rect. This was not following the specification.
http://www.w3.org/TR/2014/WD-css-masking-1-20140213/#the-clip-path
The change affects content using -webkit-clip-path in Safari. Since the
bounding client box is equalvalent to the border box most of the time
there shouldn't be to much impact.
Existing tests cover the issue.
* rendering/RenderLayer.cpp:
(WebCore::computeReferenceBox):
LayoutTests:
Update the result for overflowing content. The clip-path uses the border-box instead of
the bounding client rect as reference box.
Change pixel test to reference text.
* css3/masking/clip-path-circle-relative-overflow-expected.html: Added.
* platform/mac/css3/masking/clip-path-circle-relative-overflow-expected.png: Removed.
* platform/mac/css3/masking/clip-path-inset-expected.png: Added. This was missing in the repo.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestscss3maskingclippathcirclerelativeoverflowhtml">trunk/LayoutTests/css3/masking/clip-path-circle-relative-overflow.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscss3maskingclippathcirclerelativeoverflowexpectedhtml">trunk/LayoutTests/css3/masking/clip-path-circle-relative-overflow-expected.html</a></li>
<li><a href="#trunkLayoutTestsplatformmaccss3maskingclippathinsetexpectedpng">trunk/LayoutTests/platform/mac/css3/masking/clip-path-inset-expected.png</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformmaccss3maskingclippathcirclerelativeoverflowexpectedpng">trunk/LayoutTests/platform/mac/css3/masking/clip-path-circle-relative-overflow-expected.png</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (164379 => 164380)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-19 20:10:53 UTC (rev 164379)
+++ trunk/LayoutTests/ChangeLog 2014-02-19 20:15:18 UTC (rev 164380)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-02-19 Dirk Schulze <krit@webkit.org>
+
+ Missing box doesn't use border-box as reference box for clip-path
+ https://bugs.webkit.org/show_bug.cgi?id=129049
+
+ Reviewed by Simon Fraser.
+
+ Update the result for overflowing content. The clip-path uses the border-box instead of
+ the bounding client rect as reference box.
+ Change pixel test to reference text.
+
+ * css3/masking/clip-path-circle-relative-overflow-expected.html: Added.
+ * platform/mac/css3/masking/clip-path-circle-relative-overflow-expected.png: Removed.
+ * platform/mac/css3/masking/clip-path-inset-expected.png: Added. This was missing in the repo.
+
</ins><span class="cx"> 2014-02-19 James Craig <jcraig@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: AX: clarify reason for ignored state where possible (hidden, default for tag, etc)
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingclippathcirclerelativeoverflowexpectedhtmlfromrev164379trunkLayoutTestscss3maskingclippathcirclerelativeoverflowhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/css3/masking/clip-path-circle-relative-overflow-expected.html (from rev 164379, trunk/LayoutTests/css3/masking/clip-path-circle-relative-overflow.html) (0 => 164380)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/clip-path-circle-relative-overflow-expected.html (rev 0)
+++ trunk/LayoutTests/css3/masking/clip-path-circle-relative-overflow-expected.html 2014-02-19 20:15:18 UTC (rev 164380)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<!DOCTYPE html>
+<html lang="en">
+<head>
+<style>
+div {
+ width: 200px;
+ height: 200px;
+ background-color: green;
+ border: 20px solid black;
+ -webkit-clip-path: circle(50% at 50% 50%) border-box;
+}
+</style>
+</head>
+<body>
+<div><div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscss3maskingclippathcirclerelativeoverflowhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/masking/clip-path-circle-relative-overflow.html (164379 => 164380)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/clip-path-circle-relative-overflow.html 2014-02-19 20:10:53 UTC (rev 164379)
+++ trunk/LayoutTests/css3/masking/clip-path-circle-relative-overflow.html 2014-02-19 20:15:18 UTC (rev 164380)
</span><span class="lines">@@ -7,6 +7,7 @@
</span><span class="cx"> height: 200px;
</span><span class="cx"> background-color: green;
</span><span class="cx"> border: 20px solid black;
</span><ins>+ /* Even on missing reference box and overflowing context chose border-box. */
</ins><span class="cx"> -webkit-clip-path: circle(50% at 50% 50%);
</span><span class="cx"> }
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmaccss3maskingclippathcirclerelativeoverflowexpectedpng"></a>
<div class="binary"><h4>Deleted: trunk/LayoutTests/platform/mac/css3/masking/clip-path-circle-relative-overflow-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmaccss3maskingclippathinsetexpectedpng"></a>
<div class="binary"><h4>Added: trunk/LayoutTests/platform/mac/css3/masking/clip-path-inset-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/LayoutTests/platform/mac/css3/masking/clip-path-inset-expected.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164379 => 164380)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-19 20:10:53 UTC (rev 164379)
+++ trunk/Source/WebCore/ChangeLog 2014-02-19 20:15:18 UTC (rev 164380)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-02-19 Dirk Schulze <krit@webkit.org>
+
+ Missing box doesn't use border-box as reference box for clip-path
+ https://bugs.webkit.org/show_bug.cgi?id=129049
+
+ Reviewed by Simon Fraser.
+
+ If no reference box was specified the default reference box should be
+ border-box. Previously to this patch the reference box was the bounding
+ client rect. This was not following the specification.
+ http://www.w3.org/TR/2014/WD-css-masking-1-20140213/#the-clip-path
+ The change affects content using -webkit-clip-path in Safari. Since the
+ bounding client box is equalvalent to the border box most of the time
+ there shouldn't be to much impact.
+
+ Existing tests cover the issue.
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::computeReferenceBox):
+
</ins><span class="cx"> 2014-02-19 James Craig <jcraig@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: AX: clarify reason for ignored state where possible (hidden, default for tag, etc)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (164379 => 164380)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-02-19 20:10:53 UTC (rev 164379)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-02-19 20:15:18 UTC (rev 164380)
</span><span class="lines">@@ -3790,38 +3790,35 @@
</span><span class="cx"> template <class ReferenceBoxClipPathOperation>
</span><span class="cx"> static inline LayoutRect computeReferenceBox(const RenderObject& renderer, const ReferenceBoxClipPathOperation& clippingPath, const LayoutPoint& offsetFromRoot, const LayoutRect& rootRelativeBounds)
</span><span class="cx"> {
</span><ins>+ // FIXME: Support different reference boxes for inline content.
+ // https://bugs.webkit.org/show_bug.cgi?id=129047
+ if (!renderer.isBox())
+ return rootRelativeBounds;
+
</ins><span class="cx"> LayoutRect referenceBox;
</span><del>- if (renderer.isBox()) {
- const RenderBox& box = toRenderBox(renderer);
- switch (clippingPath.referenceBox()) {
- case ContentBox:
- referenceBox = box.contentBoxRect();
- referenceBox.moveBy(offsetFromRoot);
- break;
- case PaddingBox:
- referenceBox = box.paddingBoxRect();
- referenceBox.moveBy(offsetFromRoot);
- break;
- // fill, stroke, view-box compute to border-box for HTML elements.
- case Fill:
- case Stroke:
- case ViewBox:
- case BorderBox:
- referenceBox = box.borderBoxRect();
- referenceBox.moveBy(offsetFromRoot);
- break;
- case MarginBox:
- // FIXME: Support margin-box. Use bounding client rect for now.
- // https://bugs.webkit.org/show_bug.cgi?id=127984
- case BoxMissing:
- // FIXME: If no reference box was specified the spec demands to use
- // the border-box. However, the current prefixed version of clip-path uses
- // bounding-box. Keep bounding-box for now.
- referenceBox = rootRelativeBounds;
- }
- } else
- // FIXME: Support different reference boxes for inline content.
- referenceBox = rootRelativeBounds;
</del><ins>+ const RenderBox& box = toRenderBox(renderer);
+ switch (clippingPath.referenceBox()) {
+ case ContentBox:
+ referenceBox = box.contentBoxRect();
+ referenceBox.moveBy(offsetFromRoot);
+ break;
+ case PaddingBox:
+ referenceBox = box.paddingBoxRect();
+ referenceBox.moveBy(offsetFromRoot);
+ break;
+ // FIXME: Support margin-box. Use bounding client rect for now.
+ // https://bugs.webkit.org/show_bug.cgi?id=127984
+ case MarginBox:
+ // fill, stroke, view-box compute to border-box for HTML elements.
+ case Fill:
+ case Stroke:
+ case ViewBox:
+ case BorderBox:
+ case BoxMissing:
+ referenceBox = box.borderBoxRect();
+ referenceBox.moveBy(offsetFromRoot);
+ break;
+ }
</ins><span class="cx">
</span><span class="cx"> return referenceBox;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>