<!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>[164795] 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/164795">164795</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-27 05:15:25 -0800 (Thu, 27 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Blending] Parse and implement the -webkit-isolation CSS property.
https://bugs.webkit.org/show_bug.cgi?id=128958
Patch by Mihai Tica <mitica@adobe.com> on 2014-02-27
Reviewed by Dirk Schulze.
Source/WebCore:
Parse and implement -webkit-isolation, part of the CSS Blending and Compositing spec.
This patch adds functionality for HTML and SVG.
-webkit-isolation: isolate restricts any child elements from blending with any of the content outside the isolated parent element.
Tests: css3/compositing/isolation-isolate-blended-child.html
css3/compositing/isolation-parsing.html
css3/compositing/svg-isolation-default.html
css3/compositing/svg-isolation-isolated-group.html
css3/compositing/svg-isolation-simple.html
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::ComputedStyleExtractor::propertyValue):
* css/CSSParser.cpp:
(WebCore::isValidKeywordPropertyAndValue):
(WebCore::isKeywordPropertyID):
(WebCore::CSSParser::parseValue):
* css/CSSPrimitiveValueMappings.h:
(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
(WebCore::CSSPrimitiveValue::operator Isolation):
* css/CSSPropertyNames.in: Add -webkit-isolation.
* css/CSSValueKeywords.in: Add the isolate value.
* css/DeprecatedStyleBuilder.cpp:
(WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
* css/StyleResolver.cpp:
(WebCore::StyleResolver::adjustRenderStyle): Explicitly set isolation:isolate to create a stacking context.
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::changeRequiresLayerRepaint): Changing isolation should trigger a repaint.
* rendering/style/RenderStyle.h: Setters and getters for isolation.
* rendering/style/RenderStyleConstants.h: Add Isolation enum.
* rendering/style/StyleRareNonInheritedData.cpp: Add m_isolation.
(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
(WebCore::StyleRareNonInheritedData::operator==):
* rendering/style/StyleRareNonInheritedData.h:
* rendering/svg/SVGRenderingContext.cpp:
(WebCore::SVGRenderingContext::prepareToRenderSVGContent): If isolated, paint in a transparency layer.
LayoutTests:
Test parsing of -webkit-isolation. Test if setting -webkit-isolation: isolate creats a stacking context.
Test for SVG and HTML that blending is restricted to the contents of an isolated parent element.
* css3/compositing/isolation-isolate-blended-child-expected.html: Added.
* css3/compositing/isolation-isolate-blended-child.html: Added.
* css3/compositing/isolation-isolate-simple-expected.txt: Added.
* css3/compositing/isolation-parsing-expected.txt: Added.
* css3/compositing/isolation-parsing.html: Added.
* css3/compositing/svg-isolation-default-expected.html: Added.
* css3/compositing/svg-isolation-default.html: Added.
* css3/compositing/svg-isolation-isolated-group-expected.html: Added.
* css3/compositing/svg-isolation-isolated-group.html: Added.
* css3/compositing/svg-isolation-simple-expected.html: Added.
* css3/compositing/svg-isolation-simple.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="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValueMappingsh">trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSPropertyNamesin">trunk/Source/WebCore/css/CSSPropertyNames.in</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueKeywordsin">trunk/Source/WebCore/css/CSSValueKeywords.in</a></li>
<li><a href="#trunkSourceWebCorecssDeprecatedStyleBuildercpp">trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStylecpp">trunk/Source/WebCore/rendering/style/RenderStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleConstantsh">trunk/Source/WebCore/rendering/style/RenderStyleConstants.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatacpp">trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatah">trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGRenderingContextcpp">trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscss3compositingisolationisolateblendedchildexpectedhtml">trunk/LayoutTests/css3/compositing/isolation-isolate-blended-child-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3compositingisolationisolateblendedchildhtml">trunk/LayoutTests/css3/compositing/isolation-isolate-blended-child.html</a></li>
<li><a href="#trunkLayoutTestscss3compositingisolationisolatesimpleexpectedtxt">trunk/LayoutTests/css3/compositing/isolation-isolate-simple-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3compositingisolationparsingexpectedtxt">trunk/LayoutTests/css3/compositing/isolation-parsing-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3compositingisolationparsinghtml">trunk/LayoutTests/css3/compositing/isolation-parsing.html</a></li>
<li><a href="#trunkLayoutTestscss3compositingsvgisolationdefaultexpectedhtml">trunk/LayoutTests/css3/compositing/svg-isolation-default-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3compositingsvgisolationdefaulthtml">trunk/LayoutTests/css3/compositing/svg-isolation-default.html</a></li>
<li><a href="#trunkLayoutTestscss3compositingsvgisolationisolatedgroupexpectedhtml">trunk/LayoutTests/css3/compositing/svg-isolation-isolated-group-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3compositingsvgisolationisolatedgrouphtml">trunk/LayoutTests/css3/compositing/svg-isolation-isolated-group.html</a></li>
<li><a href="#trunkLayoutTestscss3compositingsvgisolationsimpleexpectedhtml">trunk/LayoutTests/css3/compositing/svg-isolation-simple-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3compositingsvgisolationsimplehtml">trunk/LayoutTests/css3/compositing/svg-isolation-simple.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (164794 => 164795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-27 12:27:52 UTC (rev 164794)
+++ trunk/LayoutTests/ChangeLog 2014-02-27 13:15:25 UTC (rev 164795)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-02-27 Mihai Tica <mitica@adobe.com>
+
+ [CSS Blending] Parse and implement the -webkit-isolation CSS property.
+
+ https://bugs.webkit.org/show_bug.cgi?id=128958
+
+ Reviewed by Dirk Schulze.
+
+ Test parsing of -webkit-isolation. Test if setting -webkit-isolation: isolate creats a stacking context.
+ Test for SVG and HTML that blending is restricted to the contents of an isolated parent element.
+
+ * css3/compositing/isolation-isolate-blended-child-expected.html: Added.
+ * css3/compositing/isolation-isolate-blended-child.html: Added.
+ * css3/compositing/isolation-isolate-simple-expected.txt: Added.
+ * css3/compositing/isolation-parsing-expected.txt: Added.
+ * css3/compositing/isolation-parsing.html: Added.
+ * css3/compositing/svg-isolation-default-expected.html: Added.
+ * css3/compositing/svg-isolation-default.html: Added.
+ * css3/compositing/svg-isolation-isolated-group-expected.html: Added.
+ * css3/compositing/svg-isolation-isolated-group.html: Added.
+ * css3/compositing/svg-isolation-simple-expected.html: Added.
+ * css3/compositing/svg-isolation-simple.html: Added.
+
</ins><span class="cx"> 2014-02-27 Krzysztof Czech <k.czech@samsung.com>
</span><span class="cx">
</span><span class="cx"> [ATK] Utilize AtkTableCell to expose directly AccessibilityTableCell to AT
</span></span></pre></div>
<a id="trunkLayoutTestscss3compositingisolationisolateblendedchildexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/isolation-isolate-blended-child-expected.html (0 => 164795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/isolation-isolate-blended-child-expected.html (rev 0)
+++ trunk/LayoutTests/css3/compositing/isolation-isolate-blended-child-expected.html 2014-02-27 13:15:25 UTC (rev 164795)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+<!DOCTYPE HTML>
+<style>
+ div {
+ margin: 20px;
+ width: 130px;
+ height: 130px;
+ }
+
+ .parent {
+ background: rgb(55, 55, 55);
+ position: fixed;
+ width: 300px;
+ height: 300px;
+ }
+
+ .isolator {
+ position: fixed;
+ z-index: 0;
+ background: violet;
+ }
+
+ .child {
+ margin-top: 0px;
+ -webkit-mix-blend-mode: multiply;
+ background: olive;
+ }
+
+</style>
+<div class="parent"><div class="isolator"><div class="child"></div></div></div>
</ins></span></pre></div>
<a id="trunkLayoutTestscss3compositingisolationisolateblendedchildhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/isolation-isolate-blended-child.html (0 => 164795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/isolation-isolate-blended-child.html (rev 0)
+++ trunk/LayoutTests/css3/compositing/isolation-isolate-blended-child.html 2014-02-27 13:15:25 UTC (rev 164795)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+<!DOCTYPE HTML>
+<!-- Test to ensure that "-webkit-isolation:isolate" creates a stacking context, thus preventing blending with the parent element. -->
+<style>
+ div {
+ margin: 20px;
+ width: 130px;
+ height: 130px;
+ }
+
+ .parent {
+ background: rgb(55, 55, 55);
+ position: fixed;
+ width: 300px;
+ height: 300px;
+ }
+
+ .isolator {
+ -webkit-isolation: isolate;
+ background: violet;
+ }
+
+ .child {
+ -webkit-mix-blend-mode: multiply;
+ background: olive;
+ }
+
+</style>
+<div class="parent"><div class="isolator"><div class="child"></div></div></div>
</ins></span></pre></div>
<a id="trunkLayoutTestscss3compositingisolationisolatesimpleexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/isolation-isolate-simple-expected.txt (0 => 164795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/isolation-isolate-simple-expected.txt (rev 0)
+++ trunk/LayoutTests/css3/compositing/isolation-isolate-simple-expected.txt 2014-02-27 13:15:25 UTC (rev 164795)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+PASS 0 is 0
+PASS 0 is 0
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscss3compositingisolationparsingexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/isolation-parsing-expected.txt (0 => 164795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/isolation-parsing-expected.txt (rev 0)
+++ trunk/LayoutTests/css3/compositing/isolation-parsing-expected.txt 2014-02-27 13:15:25 UTC (rev 164795)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+PASS setProperty("auto") is "auto"
+PASS setProperty("isolate") is "isolate"
+PASS setProperty("") is "auto"
+PASS setProperty("rubbish") is "auto"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscss3compositingisolationparsinghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/isolation-parsing.html (0 => 164795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/isolation-parsing.html (rev 0)
+++ trunk/LayoutTests/css3/compositing/isolation-parsing.html 2014-02-27 13:15:25 UTC (rev 164795)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+ <script src="../../resources/js-test.js"></script>
+ <script>
+ function setProperty(value) {
+ var div = document.createElement('div');
+ document.body.appendChild(div);
+ div.style.setProperty("-webkit-isolation", value);
+
+ var computedValue = getComputedStyle(div).getPropertyValue("-webkit-isolation");
+ document.body.removeChild(div);
+
+ return computedValue;
+ }
+
+ function test(value, expected) {
+ shouldBeEqualToString('setProperty("' + value + '")', expected);
+ }
+
+ test("auto", "auto");
+ test("isolate", "isolate");
+ test("", "auto");
+ test("rubbish", "auto");
+ </script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscss3compositingsvgisolationdefaultexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/svg-isolation-default-expected.html (0 => 164795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/svg-isolation-default-expected.html (rev 0)
+++ trunk/LayoutTests/css3/compositing/svg-isolation-default-expected.html 2014-02-27 13:15:25 UTC (rev 164795)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+<!DOCTYPE HTML>
+<svg xmlns="http://www.w3.org/2000/svg" width="400px" height="400px" style="background: green">
+ <rect x="100" y="100" width="200" height="200" style="fill: blue; -webkit-mix-blend-mode: multiply"/>
+</svg>
</ins></span></pre></div>
<a id="trunkLayoutTestscss3compositingsvgisolationdefaulthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/svg-isolation-default.html (0 => 164795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/svg-isolation-default.html (rev 0)
+++ trunk/LayoutTests/css3/compositing/svg-isolation-default.html 2014-02-27 13:15:25 UTC (rev 164795)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+<!DOCTYPE HTML>
+<!-- Test the default behaviour of isolation with two simple elements. The test passes if the small square is drawn with black (blending is performed since the element is not isolated). -->
+<svg xmlns="http://www.w3.org/2000/svg" width="400px" height="400px" style="background: green">
+ <g style="-webkit-isolation: auto">
+ <rect x="100" y="100" width="200" height="200" style="fill: blue; -webkit-mix-blend-mode: multiply"/>
+ </g>
+</svg>
</ins></span></pre></div>
<a id="trunkLayoutTestscss3compositingsvgisolationisolatedgroupexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/svg-isolation-isolated-group-expected.html (0 => 164795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/svg-isolation-isolated-group-expected.html (rev 0)
+++ trunk/LayoutTests/css3/compositing/svg-isolation-isolated-group-expected.html 2014-02-27 13:15:25 UTC (rev 164795)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<!DOCTYPE HTML>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="400px" height="400px" style="background: green">
+ <g>
+ <rect x="50" y="50" width="200" height="200" style="fill: orange;"/>
+ <rect x="100" y="100" width="250" height="250" style="fill: blue;"/>
+ <rect x="100" y="100" width="150" height="150" style="fill: orange; -webkit-mix-blend-mode: difference;"/>
+ </g>
+</svg>
</ins></span></pre></div>
<a id="trunkLayoutTestscss3compositingsvgisolationisolatedgrouphtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/svg-isolation-isolated-group.html (0 => 164795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/svg-isolation-isolated-group.html (rev 0)
+++ trunk/LayoutTests/css3/compositing/svg-isolation-isolated-group.html 2014-02-27 13:15:25 UTC (rev 164795)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<!DOCTYPE HTML>
+<!-- Test behaviour of isolation for overlapping elements within groups. The test passes if there are no rects drawn with red.
+This implies that the isolation is performed accordingly, meaning the orange rect doesn't blend with the background color. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="400px" height="400px" style="background: green">
+ <g style="-webkit-isolation: isolate;">
+ <rect x="100" y="100" width="250" height="250" style="fill: blue;"/>
+ <rect x="50" y="50" width="200" height="200" style="fill: orange; -webkit-mix-blend-mode: difference;"/>
+ </g>
+</svg>
</ins></span></pre></div>
<a id="trunkLayoutTestscss3compositingsvgisolationsimpleexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/svg-isolation-simple-expected.html (0 => 164795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/svg-isolation-simple-expected.html (rev 0)
+++ trunk/LayoutTests/css3/compositing/svg-isolation-simple-expected.html 2014-02-27 13:15:25 UTC (rev 164795)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+<!DOCTYPE HTML>
+<svg xmlns="http://www.w3.org/2000/svg" width="400px" height="400px" style="background: green">
+ <g>
+ <rect x="100" y="100" width="200" height="200" style="fill: blue;"/>
+ </g>
+</svg>
</ins></span></pre></div>
<a id="trunkLayoutTestscss3compositingsvgisolationsimplehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/compositing/svg-isolation-simple.html (0 => 164795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/compositing/svg-isolation-simple.html (rev 0)
+++ trunk/LayoutTests/css3/compositing/svg-isolation-simple.html 2014-02-27 13:15:25 UTC (rev 164795)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+<!DOCTYPE HTML>
+<!-- Test isolation with two simple elements. The test passes if the small square is drawn with blue (no blending is performed since the element is isolated). -->
+<svg xmlns="http://www.w3.org/2000/svg" width="400px" height="400px" style="background: green">
+ <g style="-webkit-isolation: isolate">
+ <rect x="100" y="100" width="200" height="200" style="fill: blue; -webkit-mix-blend-mode: multiply"/>
+ </g>
+</svg>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164794 => 164795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-27 12:27:52 UTC (rev 164794)
+++ trunk/Source/WebCore/ChangeLog 2014-02-27 13:15:25 UTC (rev 164795)
</span><span class="lines">@@ -1,3 +1,47 @@
</span><ins>+2014-02-27 Mihai Tica <mitica@adobe.com>
+
+ [CSS Blending] Parse and implement the -webkit-isolation CSS property.
+
+ https://bugs.webkit.org/show_bug.cgi?id=128958
+
+ Reviewed by Dirk Schulze.
+
+ Parse and implement -webkit-isolation, part of the CSS Blending and Compositing spec.
+ This patch adds functionality for HTML and SVG.
+ -webkit-isolation: isolate restricts any child elements from blending with any of the content outside the isolated parent element.
+
+ Tests: css3/compositing/isolation-isolate-blended-child.html
+ css3/compositing/isolation-parsing.html
+ css3/compositing/svg-isolation-default.html
+ css3/compositing/svg-isolation-isolated-group.html
+ css3/compositing/svg-isolation-simple.html
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::ComputedStyleExtractor::propertyValue):
+ * css/CSSParser.cpp:
+ (WebCore::isValidKeywordPropertyAndValue):
+ (WebCore::isKeywordPropertyID):
+ (WebCore::CSSParser::parseValue):
+ * css/CSSPrimitiveValueMappings.h:
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+ (WebCore::CSSPrimitiveValue::operator Isolation):
+ * css/CSSPropertyNames.in: Add -webkit-isolation.
+ * css/CSSValueKeywords.in: Add the isolate value.
+ * css/DeprecatedStyleBuilder.cpp:
+ (WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::adjustRenderStyle): Explicitly set isolation:isolate to create a stacking context.
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::changeRequiresLayerRepaint): Changing isolation should trigger a repaint.
+ * rendering/style/RenderStyle.h: Setters and getters for isolation.
+ * rendering/style/RenderStyleConstants.h: Add Isolation enum.
+ * rendering/style/StyleRareNonInheritedData.cpp: Add m_isolation.
+ (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
+ (WebCore::StyleRareNonInheritedData::operator==):
+ * rendering/style/StyleRareNonInheritedData.h:
+ * rendering/svg/SVGRenderingContext.cpp:
+ (WebCore::SVGRenderingContext::prepareToRenderSVGContent): If isolated, paint in a transparency layer.
+
</ins><span class="cx"> 2014-02-27 Krzysztof Czech <k.czech@samsung.com>
</span><span class="cx">
</span><span class="cx"> [ATK] Utilize AtkTableCell to expose directly AccessibilityTableCell to AT
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (164794 => 164795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-02-27 12:27:52 UTC (rev 164794)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-02-27 13:15:25 UTC (rev 164795)
</span><span class="lines">@@ -228,6 +228,7 @@
</span><span class="cx"> CSSPropertyWebkitBackgroundSize,
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> CSSPropertyWebkitMixBlendMode,
</span><ins>+ CSSPropertyWebkitIsolation,
</ins><span class="cx"> #endif
</span><span class="cx"> CSSPropertyWebkitBorderFit,
</span><span class="cx"> CSSPropertyWebkitBorderHorizontalSpacing,
</span><span class="lines">@@ -2849,6 +2850,8 @@
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> case CSSPropertyWebkitMixBlendMode:
</span><span class="cx"> return cssValuePool().createValue(style->blendMode());
</span><ins>+ case CSSPropertyWebkitIsolation:
+ return cssValuePool().createValue(style->isolation());
</ins><span class="cx"> #endif
</span><span class="cx"> case CSSPropertyBackgroundBlendMode: {
</span><span class="cx"> const FillLayer* layers = style->backgroundLayers();
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (164794 => 164795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2014-02-27 12:27:52 UTC (rev 164794)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-02-27 13:15:25 UTC (rev 164795)
</span><span class="lines">@@ -818,6 +818,10 @@
</span><span class="cx"> || valueID == CSSValueLuminosity))
</span><span class="cx"> return true;
</span><span class="cx"> break;
</span><ins>+ case CSSPropertyWebkitIsolation:
+ if (parserContext.isCSSCompositingEnabled && (valueID == CSSValueAuto || valueID == CSSValueIsolate))
+ return true;
+ break;
</ins><span class="cx"> #endif
</span><span class="cx"> case CSSPropertyWebkitBorderFit:
</span><span class="cx"> if (valueID == CSSValueBorder || valueID == CSSValueLines)
</span><span class="lines">@@ -1089,6 +1093,7 @@
</span><span class="cx"> case CSSPropertyWebkitAppearance:
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> case CSSPropertyWebkitMixBlendMode:
</span><ins>+ case CSSPropertyWebkitIsolation:
</ins><span class="cx"> #endif
</span><span class="cx"> case CSSPropertyWebkitBackfaceVisibility:
</span><span class="cx"> case CSSPropertyWebkitBorderAfterStyle:
</span><span class="lines">@@ -2427,6 +2432,10 @@
</span><span class="cx"> if (cssCompositingEnabled())
</span><span class="cx"> validPrimitive = true;
</span><span class="cx"> break;
</span><ins>+ case CSSPropertyWebkitIsolation:
+ if (cssCompositingEnabled())
+ validPrimitive = true;
+ break;
</ins><span class="cx"> #endif
</span><span class="cx"> case CSSPropertyWebkitFlex: {
</span><span class="cx"> ShorthandScope scope(this, propId);
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValueMappingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (164794 => 164795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2014-02-27 12:27:52 UTC (rev 164794)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2014-02-27 13:15:25 UTC (rev 164795)
</span><span class="lines">@@ -4157,6 +4157,38 @@
</span><span class="cx"> return BlendModeNormal;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<> inline CSSPrimitiveValue::CSSPrimitiveValue(Isolation isolation)
+ : CSSValue(PrimitiveClass)
+{
+ m_primitiveUnitType = CSS_VALUE_ID;
+ switch (isolation) {
+ case IsolationAuto:
+ m_value.valueID = CSSValueAuto;
+ break;
+ case IsolationIsolate:
+ m_value.valueID = CSSValueIsolate;
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ }
+}
+
+template<> inline CSSPrimitiveValue::operator Isolation() const
+{
+ ASSERT(isValueID());
+ switch (m_value.valueID) {
+ case CSSValueAuto:
+ return IsolationAuto;
+ case CSSValueIsolate:
+ return IsolationIsolate;
+ default:
+ break;
+ }
+
+ ASSERT_NOT_REACHED();
+ return IsolationAuto;
+}
+
</ins><span class="cx"> template<> inline CSSPrimitiveValue::CSSPrimitiveValue(LineCap e)
</span><span class="cx"> : CSSValue(PrimitiveClass)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (164794 => 164795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2014-02-27 12:27:52 UTC (rev 164794)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2014-02-27 13:15:25 UTC (rev 164795)
</span><span class="lines">@@ -283,6 +283,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> #if defined(ENABLE_CSS_COMPOSITING) && ENABLE_CSS_COMPOSITING
</span><span class="cx"> -webkit-mix-blend-mode
</span><ins>+-webkit-isolation
</ins><span class="cx"> #endif
</span><span class="cx"> #if defined(ENABLE_CSS_FILTERS) && ENABLE_CSS_FILTERS
</span><span class="cx"> -webkit-filter
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueKeywordsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (164794 => 164795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValueKeywords.in 2014-02-27 12:27:52 UTC (rev 164794)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2014-02-27 13:15:25 UTC (rev 164795)
</span><span class="lines">@@ -1024,6 +1024,10 @@
</span><span class="cx"> color
</span><span class="cx"> luminosity
</span><span class="cx">
</span><ins>+// isolation
+// auto
+isolate
+
</ins><span class="cx"> // object-fit
</span><span class="cx"> // fill
</span><span class="cx"> // contain
</span></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedStyleBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (164794 => 164795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-02-27 12:27:52 UTC (rev 164794)
+++ trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-02-27 13:15:25 UTC (rev 164795)
</span><span class="lines">@@ -2488,6 +2488,7 @@
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitBackgroundSize, CSSPropertyBackgroundSize);
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitMixBlendMode, ApplyPropertyDefault<BlendMode, &RenderStyle::blendMode, BlendMode, &RenderStyle::setBlendMode, BlendMode, &RenderStyle::initialBlendMode>::createHandler());
</span><ins>+ setPropertyHandler(CSSPropertyWebkitIsolation, ApplyPropertyDefault<Isolation, &RenderStyle::isolation, Isolation, &RenderStyle::setIsolation, Isolation, &RenderStyle::initialIsolation>::createHandler());
</ins><span class="cx"> #endif
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitBorderFit, ApplyPropertyDefault<EBorderFit, &RenderStyle::borderFit, EBorderFit, &RenderStyle::setBorderFit, EBorderFit, &RenderStyle::initialBorderFit>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitBorderHorizontalSpacing, ApplyPropertyComputeLength<short, &RenderStyle::horizontalBorderSpacing, &RenderStyle::setHorizontalBorderSpacing, &RenderStyle::initialHorizontalBorderSpacing>::createHandler());
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (164794 => 164795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2014-02-27 12:27:52 UTC (rev 164794)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2014-02-27 13:15:25 UTC (rev 164795)
</span><span class="lines">@@ -1245,6 +1245,7 @@
</span><span class="cx"> || style.boxReflect()
</span><span class="cx"> || style.hasFilter()
</span><span class="cx"> || style.hasBlendMode()
</span><ins>+ || style.hasIsolation()
</ins><span class="cx"> || style.position() == StickyPosition
</span><span class="cx"> || (style.position() == FixedPosition && e && e->document().page() && e->document().page()->settings().fixedPositionCreatesStackingContext())
</span><span class="cx"> || style.hasFlowFrom()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (164794 => 164795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2014-02-27 12:27:52 UTC (rev 164794)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2014-02-27 13:15:25 UTC (rev 164795)
</span><span class="lines">@@ -681,6 +681,9 @@
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> if (rareNonInheritedData->m_effectiveBlendMode != other->rareNonInheritedData->m_effectiveBlendMode)
</span><span class="cx"> return true;
</span><ins>+
+ if (rareNonInheritedData->m_isolation != other->rareNonInheritedData->m_isolation)
+ return true;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (rareNonInheritedData->opacity != other->rareNonInheritedData->opacity) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (164794 => 164795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-02-27 12:27:52 UTC (rev 164794)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-02-27 13:15:25 UTC (rev 164795)
</span><span class="lines">@@ -972,11 +972,18 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> BlendMode blendMode() const { return static_cast<BlendMode>(rareNonInheritedData->m_effectiveBlendMode); }
</span><del>- void setBlendMode(BlendMode v) { rareNonInheritedData.access()->m_effectiveBlendMode = v; }
</del><ins>+ void setBlendMode(BlendMode blendMode) { SET_VAR(rareNonInheritedData, m_effectiveBlendMode, blendMode); }
</ins><span class="cx"> bool hasBlendMode() const { return static_cast<BlendMode>(rareNonInheritedData->m_effectiveBlendMode) != BlendModeNormal; }
</span><ins>+
+ Isolation isolation() const { return static_cast<Isolation>(rareNonInheritedData->m_isolation); }
+ void setIsolation(Isolation isolation) { SET_VAR(rareNonInheritedData, m_isolation, isolation); }
+ bool hasIsolation() const { return rareNonInheritedData->m_isolation != IsolationAuto; }
</ins><span class="cx"> #else
</span><span class="cx"> BlendMode blendMode() const { return BlendModeNormal; }
</span><span class="cx"> bool hasBlendMode() const { return false; }
</span><ins>+
+ Isolation isolation() const { return IsolationAuto; }
+ bool hasIsolation() const { return false; }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(RTL_SCROLLBAR)
</span><span class="lines">@@ -1825,6 +1832,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> static BlendMode initialBlendMode() { return BlendModeNormal; }
</span><ins>+ static Isolation initialIsolation() { return IsolationAuto; }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleConstantsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (164794 => 164795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2014-02-27 12:27:52 UTC (rev 164794)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2014-02-27 13:15:25 UTC (rev 164795)
</span><span class="lines">@@ -554,6 +554,8 @@
</span><span class="cx"> enum TextIndentType { TextIndentNormal, TextIndentHanging };
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+enum Isolation { IsolationAuto, IsolationIsolate };
+
</ins><span class="cx"> // Fill, Stroke, ViewBox are just used for SVG.
</span><span class="cx"> enum LayoutBox { BoxMissing = 0, MarginBox, BorderBox, PaddingBox, ContentBox, Fill, Stroke, ViewBox };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp (164794 => 164795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2014-02-27 12:27:52 UTC (rev 164794)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2014-02-27 13:15:25 UTC (rev 164795)
</span><span class="lines">@@ -94,6 +94,7 @@
</span><span class="cx"> , m_aspectRatioType(RenderStyle::initialAspectRatioType())
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> , m_effectiveBlendMode(RenderStyle::initialBlendMode())
</span><ins>+ , m_isolation(RenderStyle::initialIsolation())
</ins><span class="cx"> #endif
</span><span class="cx"> , m_objectFit(RenderStyle::initialObjectFit())
</span><span class="cx"> {
</span><span class="lines">@@ -176,6 +177,7 @@
</span><span class="cx"> , m_aspectRatioType(o.m_aspectRatioType)
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> , m_effectiveBlendMode(o.m_effectiveBlendMode)
</span><ins>+ , m_isolation(o.m_isolation)
</ins><span class="cx"> #endif
</span><span class="cx"> , m_objectFit(o.m_objectFit)
</span><span class="cx"> {
</span><span class="lines">@@ -268,6 +270,7 @@
</span><span class="cx"> && !m_runningAcceleratedAnimation && !o.m_runningAcceleratedAnimation
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> && m_effectiveBlendMode == o.m_effectiveBlendMode
</span><ins>+ && m_isolation == o.m_isolation
</ins><span class="cx"> #endif
</span><span class="cx"> && m_aspectRatioType == o.m_aspectRatioType
</span><span class="cx"> && m_objectFit == o.m_objectFit;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h (164794 => 164795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2014-02-27 12:27:52 UTC (rev 164794)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2014-02-27 13:15:25 UTC (rev 164795)
</span><span class="lines">@@ -198,6 +198,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> unsigned m_effectiveBlendMode: 5; // EBlendMode
</span><ins>+ unsigned m_isolation : 1; // Isolation
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> unsigned m_objectFit : 3; // ObjectFit
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp (164794 => 164795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp 2014-02-27 12:27:52 UTC (rev 164794)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp 2014-02-27 13:15:25 UTC (rev 164795)
</span><span class="lines">@@ -104,6 +104,7 @@
</span><span class="cx"> float opacity = isRenderingMask ? 1 : style.opacity();
</span><span class="cx"> const ShadowData* shadow = svgStyle.shadow();
</span><span class="cx"> bool hasBlendMode = style.hasBlendMode();
</span><ins>+ bool hasIsolation = style.hasIsolation();
</ins><span class="cx"> bool isolateMaskForBlending = false;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="lines">@@ -113,11 +114,11 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (opacity < 1 || shadow || hasBlendMode || isolateMaskForBlending) {
</del><ins>+ if (opacity < 1 || shadow || hasBlendMode || isolateMaskForBlending || hasIsolation) {
</ins><span class="cx"> FloatRect repaintRect = m_renderer->repaintRectInLocalCoordinates();
</span><span class="cx"> m_paintInfo->context->clip(repaintRect);
</span><span class="cx">
</span><del>- if (opacity < 1 || hasBlendMode || isolateMaskForBlending) {
</del><ins>+ if (opacity < 1 || hasBlendMode || isolateMaskForBlending || hasIsolation) {
</ins><span class="cx">
</span><span class="cx"> if (hasBlendMode)
</span><span class="cx"> m_paintInfo->context->setCompositeOperation(m_paintInfo->context->compositeOperation(), style.blendMode());
</span></span></pre>
</div>
</div>
</body>
</html>