<!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>[164640] 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/164640">164640</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-25 02:16:04 -0800 (Tue, 25 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Blending] -webkit-mix-blend-mode should force transform-style: flat.
https://bugs.webkit.org/show_bug.cgi?id=126158
Patch by Mihai Tica <mitica@adobe.com> on 2014-02-25
Reviewed by Mihnea Ovidenie.
Source/WebCore:
As stated in the http://www.w3.org/TR/css3-transforms/#propdef-transform-style, an element with blending
should force transform-style: flat.
Test: css3/compositing/blend-mode-transform-style.html
* css/StyleResolver.cpp:
(WebCore::StyleResolver::adjustRenderStyle): If blending is detected, set transform-style to flat.
LayoutTests:
For an element with -webkit-mix-blend-mode, test that the value of -webkit-transform-style computes to flat.
* css3/compositing/blend-mode-transform-style-expected.txt: Added.
* css3/compositing/blend-mode-transform-style.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="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscss3compositingblendmodetransformstyleexpectedtxt">trunk/LayoutTests/css3/compositing/blend-mode-transform-style-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3compositingblendmodetransformstylehtml">trunk/LayoutTests/css3/compositing/blend-mode-transform-style.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (164639 => 164640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-25 10:05:38 UTC (rev 164639)
+++ trunk/LayoutTests/ChangeLog 2014-02-25 10:16:04 UTC (rev 164640)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-02-25 Mihai Tica <mitica@adobe.com>
+
+ [CSS Blending] -webkit-mix-blend-mode should force transform-style: flat.
+ https://bugs.webkit.org/show_bug.cgi?id=126158
+
+ Reviewed by Mihnea Ovidenie.
+
+ For an element with -webkit-mix-blend-mode, test that the value of -webkit-transform-style computes to flat.
+
+ * css3/compositing/blend-mode-transform-style-expected.txt: Added.
+ * css3/compositing/blend-mode-transform-style.html: Added.
+
</ins><span class="cx"> 2014-02-24 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Support abbr, acronym
</span></span></pre></div>
<a id="trunkLayoutTestscss3compositingblendmodetransformstyleexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/blend-mode-transform-style-expected.txt (0 => 164640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/blend-mode-transform-style-expected.txt (rev 0)
+++ trunk/LayoutTests/css3/compositing/blend-mode-transform-style-expected.txt 2014-02-25 10:16:04 UTC (rev 164640)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+PASS getTransformStyle("blend-mode-normal-with-transform-style-preserve-3d") is "preserve-3d"
+PASS getTransformStyle("blending-with-transform-style-preserve-3d") is "flat"
+PASS getTransformStyle("blending-with-transform-style-flat") is "flat"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+Test that an element with -webkit-mix-blend-mode other than normal forces the computed value of transform-style to flat.
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestscss3compositingblendmodetransformstylehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/blend-mode-transform-style.html (0 => 164640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/blend-mode-transform-style.html (rev 0)
+++ trunk/LayoutTests/css3/compositing/blend-mode-transform-style.html 2014-02-25 10:16:04 UTC (rev 164640)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+<!DOCTYPE HTML>
+<style>
+ div {
+ width: 100px;
+ height: 100px;
+ }
+ .noblender {
+ -webkit-mix-blend-mode: normal;
+ }
+ .blender {
+ -webkit-mix-blend-mode: difference;
+ }
+</style>
+<p>Test that an element with -webkit-mix-blend-mode other than normal forces the computed value of transform-style to flat.</p>
+<div id="blend-mode-normal-with-transform-style-preserve-3d" class="noblender" style="-webkit-transform-style: preserve-3d;"></div>
+<div id="blending-with-transform-style-preserve-3d" class="blender" style="-webkit-transform-style: preserve-3d;"></div>
+<div id="blending-with-transform-style-flat" class="blender" style="-webkit-transform-style: flat;"></div>
+<script src="../../resources/js-test.js"></script>
+<script>
+ function getTransformStyle(elementID) {
+ return getComputedStyle(document.getElementById(elementID)).webkitTransformStyle;
+ }
+
+ function test(id, expected) {
+ shouldBeEqualToString('getTransformStyle("' + id + '")', expected);
+ }
+
+ test("blend-mode-normal-with-transform-style-preserve-3d", "preserve-3d");
+ test("blending-with-transform-style-preserve-3d", "flat");
+ test("blending-with-transform-style-flat", "flat");
+</script>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164639 => 164640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-25 10:05:38 UTC (rev 164639)
+++ trunk/Source/WebCore/ChangeLog 2014-02-25 10:16:04 UTC (rev 164640)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-02-25 Mihai Tica <mitica@adobe.com>
+
+ [CSS Blending] -webkit-mix-blend-mode should force transform-style: flat.
+ https://bugs.webkit.org/show_bug.cgi?id=126158
+
+ Reviewed by Mihnea Ovidenie.
+
+ As stated in the http://www.w3.org/TR/css3-transforms/#propdef-transform-style, an element with blending
+ should force transform-style: flat.
+
+ Test: css3/compositing/blend-mode-transform-style.html
+
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::adjustRenderStyle): If blending is detected, set transform-style to flat.
+
</ins><span class="cx"> 2014-02-25 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Move to using std::unique_ptr for Element, Node and related classes
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (164639 => 164640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2014-02-25 10:05:38 UTC (rev 164639)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2014-02-25 10:16:04 UTC (rev 164640)
</span><span class="lines">@@ -1328,7 +1328,8 @@
</span><span class="cx"> // FIXME: when dropping the -webkit prefix on transform-style, we should also have opacity < 1 cause flattening.
</span><span class="cx"> if (style.preserves3D() && (style.overflowX() != OVISIBLE
</span><span class="cx"> || style.overflowY() != OVISIBLE
</span><del>- || style.hasFilter()))
</del><ins>+ || style.hasFilter()
+ || style.hasBlendMode()))
</ins><span class="cx"> style.setTransformStyle3D(TransformStyle3DFlat);
</span><span class="cx">
</span><span class="cx"> adjustGridItemPosition(style, parentStyle);
</span></span></pre>
</div>
</div>
</body>
</html>