<!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>[177155] 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/177155">177155</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-12-11 09:54:38 -0800 (Thu, 11 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[SVG Masking] Enable the use of <mask> elements for -webkit-mask-image
https://bugs.webkit.org/show_bug.cgi?id=139294
Patch by Radu Stavila <stavila@adobe.com> on 2014-12-11
Reviewed by Simon Fraser.
Source/WebCore:
This patch links together all parts required for the functionality which improves
the -webkit-mask-image property by allowing it to reference a <mask> element defined
in an inline or external SVG document.
Support for this new functionality has been added in a previous patch, under issue
https://bugs.webkit.org/show_bug.cgi?id=139092. A more detailed description of how
the new functionality works can be found in the ChangeLog for that commit.
The containsSVGDocument in ScrollView has been removed because it was added in the
previous patch but is no longer required.
Tests: css3/masking/mask-base64.html
css3/masking/mask-multiple-values.html
css3/masking/mask-svg-clipped-fragmentId.html
css3/masking/mask-svg-fragmentId.html
css3/masking/mask-svg-inline-fragmentId.html
css3/masking/mask-svg-inline-invalid-fragmentId.html
css3/masking/mask-svg-invalid-fragmentId.html
css3/masking/mask-svg-no-fragmentId-tiled.html
css3/masking/mask-svg-no-fragmentId.html
css3/masking/mask-svg-script-entire-svg-to-mask.html
css3/masking/mask-svg-script-mask-to-entire-svg.html
css3/masking/mask-svg-script-mask-to-none.html
css3/masking/mask-svg-script-mask-to-png.html
css3/masking/mask-svg-script-none-to-mask.html
css3/masking/mask-svg-script-none-to-png.html
css3/masking/mask-svg-script-png-to-mask.html
css3/masking/mask-svg-script-png-to-none.html
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::ComputedStyleExtractor::propertyValue):
* css/CSSParser.cpp:
(WebCore::CSSParser::parseFillShorthand):
(WebCore::CSSParser::parseFillProperty):
(WebCore::CSSParser::parseMaskImage):
* css/CSSParser.h:
* css/DeprecatedStyleBuilder.cpp:
(WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
* css/StyleResolver.cpp:
(WebCore::StyleResolver::adjustStyleForMaskImages):
(WebCore::StyleResolver::applyProperty):
(WebCore::StyleResolver::loadPendingSVGDocuments):
(WebCore::StyleResolver::createMaskImageOperations):
(WebCore::StyleResolver::loadPendingImages):
* page/animation/CSSPropertyAnimation.cpp:
(WebCore::blendFunc):
(WebCore::MaskImagePropertyWrapper::MaskImagePropertyWrapper):
(WebCore::MaskImagePropertyWrapper::equals):
(WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
* platform/graphics/MaskImageOperation.cpp:
(WebCore::MaskImageOperation::~MaskImageOperation):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::maskClipRect):
* rendering/RenderBox.h:
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::paintFillLayerExtended):
(WebCore::RenderBoxModelObject::calculateFillTileSize):
(WebCore::RenderBoxModelObject::calculateBackgroundImageGeometry):
* rendering/RenderElement.cpp:
(WebCore::RenderElement::~RenderElement):
(WebCore::RenderElement::updateFillImages):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::calculateClipRects):
* rendering/RenderLayer.h:
* rendering/style/FillLayer.h:
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::setMaskImage):
* rendering/style/RenderStyle.h:
LayoutTests:
Added tests for different situations using URLs with fragment id
for the -webkit-mask-image property.
* css3/masking/mask-base64-expected.html: Added.
* css3/masking/mask-base64.html: Added.
* css3/masking/mask-multiple-values-expected.html: Added.
* css3/masking/mask-multiple-values.html: Added.
* css3/masking/mask-repeat-space-padding-expected.html:
* css3/masking/mask-repeat-space-padding.html:
* css3/masking/mask-svg-clipped-fragmentId-expected.html: Added.
* css3/masking/mask-svg-clipped-fragmentId.html: Added.
* css3/masking/mask-svg-fragmentId-expected.html: Added.
* css3/masking/mask-svg-fragmentId.html: Added.
* css3/masking/mask-svg-inline-fragmentId-expected.html: Added.
* css3/masking/mask-svg-inline-fragmentId.html: Added.
* css3/masking/mask-svg-inline-invalid-fragmentId-expected.html: Added.
* css3/masking/mask-svg-inline-invalid-fragmentId.html: Added.
* css3/masking/mask-svg-invalid-fragmentId-expected.html: Added.
* css3/masking/mask-svg-invalid-fragmentId.html: Added.
* css3/masking/mask-svg-no-fragmentId-expected.html: Added.
* css3/masking/mask-svg-no-fragmentId-tiled-expected.html: Added.
* css3/masking/mask-svg-no-fragmentId-tiled.html: Added.
* css3/masking/mask-svg-no-fragmentId.html: Added.
* css3/masking/mask-svg-script-entire-svg-to-mask-expected.html: Added.
* css3/masking/mask-svg-script-entire-svg-to-mask.html: Added.
* css3/masking/mask-svg-script-mask-to-entire-svg-expected.html: Added.
* css3/masking/mask-svg-script-mask-to-entire-svg.html: Added.
* css3/masking/mask-svg-script-mask-to-none-expected.html: Added.
* css3/masking/mask-svg-script-mask-to-none.html: Added.
* css3/masking/mask-svg-script-mask-to-png-expected.html: Added.
* css3/masking/mask-svg-script-mask-to-png.html: Added.
* css3/masking/mask-svg-script-none-to-mask-expected.html: Added.
* css3/masking/mask-svg-script-none-to-mask.html: Added.
* css3/masking/mask-svg-script-none-to-png-expected.html: Added.
* css3/masking/mask-svg-script-none-to-png.html: Added.
* css3/masking/mask-svg-script-png-to-mask-expected.html: Added.
* css3/masking/mask-svg-script-png-to-mask.html: Added.
* css3/masking/mask-svg-script-png-to-none-expected.html: Added.
* css3/masking/mask-svg-script-png-to-none.html: Added.
* css3/masking/resources/masks.svg: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestscss3maskingmaskrepeatspacepaddingexpectedhtml">trunk/LayoutTests/css3/masking/mask-repeat-space-padding-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingmaskrepeatspacepaddinghtml">trunk/LayoutTests/css3/masking/mask-repeat-space-padding.html</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="#trunkSourceWebCorecssCSSParserh">trunk/Source/WebCore/css/CSSParser.h</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="#trunkSourceWebCorecssStyleResolverh">trunk/Source/WebCore/css/StyleResolver.h</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewh">trunk/Source/WebCore/page/FrameView.h</a></li>
<li><a href="#trunkSourceWebCorepageanimationCSSPropertyAnimationcpp">trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollViewh">trunk/Source/WebCore/platform/ScrollView.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMaskImageOperationcpp">trunk/Source/WebCore/platform/graphics/MaskImageOperation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMaskImageOperationh">trunk/Source/WebCore/platform/graphics/MaskImageOperation.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxh">trunk/Source/WebCore/rendering/RenderBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxModelObjectcpp">trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerh">trunk/Source/WebCore/rendering/RenderLayer.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerMaskImageInfocpp">trunk/Source/WebCore/rendering/RenderLayerMaskImageInfo.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerMaskImageInfoh">trunk/Source/WebCore/rendering/RenderLayerMaskImageInfo.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleFillLayercpp">trunk/Source/WebCore/rendering/style/FillLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleFillLayerh">trunk/Source/WebCore/rendering/style/FillLayer.h</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>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscss3maskingmaskbase64expectedhtml">trunk/LayoutTests/css3/masking/mask-base64-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingmaskbase64html">trunk/LayoutTests/css3/masking/mask-base64.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingmaskmultiplevaluesexpectedhtml">trunk/LayoutTests/css3/masking/mask-multiple-values-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingmaskmultiplevalueshtml">trunk/LayoutTests/css3/masking/mask-multiple-values.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingmasksvgclippedfragmentIdexpectedhtml">trunk/LayoutTests/css3/masking/mask-svg-clipped-fragmentId-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingmasksvgclippedfragmentIdhtml">trunk/LayoutTests/css3/masking/mask-svg-clipped-fragmentId.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingmasksvgfragmentIdexpectedhtml">trunk/LayoutTests/css3/masking/mask-svg-fragmentId-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingmasksvgfragmentIdhtml">trunk/LayoutTests/css3/masking/mask-svg-fragmentId.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingmasksvginlinefragmentIdexpectedhtml">trunk/LayoutTests/css3/masking/mask-svg-inline-fragmentId-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingmasksvginlinefragmentIdhtml">trunk/LayoutTests/css3/masking/mask-svg-inline-fragmentId.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingmasksvginlineinvalidfragmentIdexpectedhtml">trunk/LayoutTests/css3/masking/mask-svg-inline-invalid-fragmentId-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingmasksvginlineinvalidfragmentIdhtml">trunk/LayoutTests/css3/masking/mask-svg-inline-invalid-fragmentId.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingmasksvginvalidfragmentIdexpectedhtml">trunk/LayoutTests/css3/masking/mask-svg-invalid-fragmentId-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingmasksvginvalidfragmentIdhtml">trunk/LayoutTests/css3/masking/mask-svg-invalid-fragmentId.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingmasksvgnofragmentIdexpectedhtml">trunk/LayoutTests/css3/masking/mask-svg-no-fragmentId-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingmasksvgnofragmentIdtiledexpectedhtml">trunk/LayoutTests/css3/masking/mask-svg-no-fragmentId-tiled-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingmasksvgnofragmentIdtiledhtml">trunk/LayoutTests/css3/masking/mask-svg-no-fragmentId-tiled.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingmasksvgnofragmentIdhtml">trunk/LayoutTests/css3/masking/mask-svg-no-fragmentId.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingmasksvgscriptentiresvgtomaskexpectedhtml">trunk/LayoutTests/css3/masking/mask-svg-script-entire-svg-to-mask-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingmasksvgscriptentiresvgtomaskhtml">trunk/LayoutTests/css3/masking/mask-svg-script-entire-svg-to-mask.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingmasksvgscriptmasktoentiresvgexpectedhtml">trunk/LayoutTests/css3/masking/mask-svg-script-mask-to-entire-svg-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingmasksvgscriptmasktoentiresvghtml">trunk/LayoutTests/css3/masking/mask-svg-script-mask-to-entire-svg.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingmasksvgscriptmasktononeexpectedhtml">trunk/LayoutTests/css3/masking/mask-svg-script-mask-to-none-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingmasksvgscriptmasktononehtml">trunk/LayoutTests/css3/masking/mask-svg-script-mask-to-none.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingmasksvgscriptmasktopngexpectedhtml">trunk/LayoutTests/css3/masking/mask-svg-script-mask-to-png-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingmasksvgscriptmasktopnghtml">trunk/LayoutTests/css3/masking/mask-svg-script-mask-to-png.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingmasksvgscriptnonetomaskexpectedhtml">trunk/LayoutTests/css3/masking/mask-svg-script-none-to-mask-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingmasksvgscriptnonetomaskhtml">trunk/LayoutTests/css3/masking/mask-svg-script-none-to-mask.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingmasksvgscriptnonetopngexpectedhtml">trunk/LayoutTests/css3/masking/mask-svg-script-none-to-png-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingmasksvgscriptnonetopnghtml">trunk/LayoutTests/css3/masking/mask-svg-script-none-to-png.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingmasksvgscriptpngtomaskexpectedhtml">trunk/LayoutTests/css3/masking/mask-svg-script-png-to-mask-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingmasksvgscriptpngtomaskhtml">trunk/LayoutTests/css3/masking/mask-svg-script-png-to-mask.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingmasksvgscriptpngtononeexpectedhtml">trunk/LayoutTests/css3/masking/mask-svg-script-png-to-none-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingmasksvgscriptpngtononehtml">trunk/LayoutTests/css3/masking/mask-svg-script-png-to-none.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingresourcesmaskssvg">trunk/LayoutTests/css3/masking/resources/masks.svg</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (177154 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-12-11 17:51:25 UTC (rev 177154)
+++ trunk/LayoutTests/ChangeLog 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -1,3 +1,51 @@
</span><ins>+2014-12-11 Radu Stavila <stavila@adobe.com>
+
+ [SVG Masking] Enable the use of <mask> elements for -webkit-mask-image
+ https://bugs.webkit.org/show_bug.cgi?id=139294
+
+ Reviewed by Simon Fraser.
+
+ Added tests for different situations using URLs with fragment id
+ for the -webkit-mask-image property.
+
+ * css3/masking/mask-base64-expected.html: Added.
+ * css3/masking/mask-base64.html: Added.
+ * css3/masking/mask-multiple-values-expected.html: Added.
+ * css3/masking/mask-multiple-values.html: Added.
+ * css3/masking/mask-repeat-space-padding-expected.html:
+ * css3/masking/mask-repeat-space-padding.html:
+ * css3/masking/mask-svg-clipped-fragmentId-expected.html: Added.
+ * css3/masking/mask-svg-clipped-fragmentId.html: Added.
+ * css3/masking/mask-svg-fragmentId-expected.html: Added.
+ * css3/masking/mask-svg-fragmentId.html: Added.
+ * css3/masking/mask-svg-inline-fragmentId-expected.html: Added.
+ * css3/masking/mask-svg-inline-fragmentId.html: Added.
+ * css3/masking/mask-svg-inline-invalid-fragmentId-expected.html: Added.
+ * css3/masking/mask-svg-inline-invalid-fragmentId.html: Added.
+ * css3/masking/mask-svg-invalid-fragmentId-expected.html: Added.
+ * css3/masking/mask-svg-invalid-fragmentId.html: Added.
+ * css3/masking/mask-svg-no-fragmentId-expected.html: Added.
+ * css3/masking/mask-svg-no-fragmentId-tiled-expected.html: Added.
+ * css3/masking/mask-svg-no-fragmentId-tiled.html: Added.
+ * css3/masking/mask-svg-no-fragmentId.html: Added.
+ * css3/masking/mask-svg-script-entire-svg-to-mask-expected.html: Added.
+ * css3/masking/mask-svg-script-entire-svg-to-mask.html: Added.
+ * css3/masking/mask-svg-script-mask-to-entire-svg-expected.html: Added.
+ * css3/masking/mask-svg-script-mask-to-entire-svg.html: Added.
+ * css3/masking/mask-svg-script-mask-to-none-expected.html: Added.
+ * css3/masking/mask-svg-script-mask-to-none.html: Added.
+ * css3/masking/mask-svg-script-mask-to-png-expected.html: Added.
+ * css3/masking/mask-svg-script-mask-to-png.html: Added.
+ * css3/masking/mask-svg-script-none-to-mask-expected.html: Added.
+ * css3/masking/mask-svg-script-none-to-mask.html: Added.
+ * css3/masking/mask-svg-script-none-to-png-expected.html: Added.
+ * css3/masking/mask-svg-script-none-to-png.html: Added.
+ * css3/masking/mask-svg-script-png-to-mask-expected.html: Added.
+ * css3/masking/mask-svg-script-png-to-mask.html: Added.
+ * css3/masking/mask-svg-script-png-to-none-expected.html: Added.
+ * css3/masking/mask-svg-script-png-to-none.html: Added.
+ * css3/masking/resources/masks.svg: Added.
+
</ins><span class="cx"> 2014-12-10 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Mac test expectations gardening.
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingmaskbase64expectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-base64-expected.html (0 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-base64-expected.html (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-base64-expected.html 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+<!DOCTYPE html>
+<html lang="en">
+ <head>
+ <style>
+ p {
+ margin: 0px;
+ }
+ #front {
+ width: 200px;
+ height: 160px;
+ background-color: green;
+ -webkit-mask-repeat: no-repeat;
+ -webkit-mask-origin: content-box;
+ -webkit-mask-clip: content-box;
+ }
+ </style>
+ <script>
+ var sizeX = 50, sizeY = 40, spaceX = 0, spaceY = 0, width = 200, height = 160;
+
+ var urls = Array(), size = Array(), position = Array();
+
+ function addMasks() {
+ for (var x = 0; x < width; x += sizeX + spaceX) {
+ for (var y = 0; y < height; y += sizeY + spaceY) {
+ urls.push("url(resources/circle.svg)");
+ size.push(sizeX + "px " + sizeY + "px");
+ position.push(x + "px " + y + "px");
+ }
+ }
+
+ div = document.getElementById("front");
+
+ div.style.cssText += "-webkit-mask-image: " + urls.join(", ") + ";" +
+ "-webkit-mask-size: " + size.join(", ") + ";" +
+ "-webkit-mask-position: " + position.join(", ") + ";";
+ }
+ </script>
+ </head>
+
+ <body onload="addMasks()">
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=129682">Bug 129682</a> - On success, you should see a 4x4 grid of green circles.</p>
+ <p>This test sets the mask-image value using base64.</p>
+ <div id="front"></div>
+ </body>
+</html>
+
</ins></span></pre></div>
<a id="trunkLayoutTestscss3maskingmaskbase64html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-base64.html (0 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-base64.html (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-base64.html 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ p {
+ margin: 0px;
+ }
+ #maskedElement {
+ width: 200px;
+ height: 160px;
+ background-color: green;
+ -webkit-mask-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZlcnNpb249IjEuMSIgd2lkdGg9IjM2MCIgaGVpZ2h0PSIyODgiPgogICAgPGNpcmNsZSBjeD0iMTgwIiBjeT0iMTQ0IiByPSI4MCIgLz4KPC9zdmc+Cgo=);
+ -webkit-mask-size: 50px 40px;
+ }
+ </style>
+ </head>
+
+ <body>
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=129682">Bug 129682</a> - On success, you should see a 4x4 grid of green circles.</p>
+ <p>This test sets the mask-image value using base64.</p>
+ <div id="maskedElement"></div>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingmaskmultiplevaluesexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-multiple-values-expected.html (0 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-multiple-values-expected.html (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-multiple-values-expected.html 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -0,0 +1,57 @@
</span><ins>+<!DOCTYPE html>
+<html lang="en">
+ <head>
+ <style>
+ p {
+ margin: 0px;
+ }
+ #back {
+ width: 500px;
+ height: 500px;
+ background-color: green;
+ }
+ .front {
+ position: absolute;
+ width: 300px;
+ height: 300px;
+ background-color: black;
+ border: 50px solid blue;
+ padding: 50px;
+ -webkit-mask-repeat: no-repeat;
+ -webkit-mask-origin: content-box;
+ -webkit-mask-clip: border-box;
+ }
+ #front1 {
+ -webkit-mask-image: url('resources/circle.png');
+ -webkit-mask-size: 150px 120px;
+ -webkit-mask-position: -120px -110px;
+ }
+ #front2 {
+ -webkit-mask-image: url('resources/masks.svg#lowerHalf');
+ -webkit-mask-size: 300px 240px;
+ -webkit-mask-position: 50px 0px;
+ }
+ #front3 {
+ -webkit-mask-image: url('resources/masks.svg#upperHalf');
+ -webkit-mask-size: 300px 240px;
+ -webkit-mask-position: 50px 0px;
+ }
+ #front4 {
+ -webkit-mask-image: url('resources/masks.svg#invalidId');
+ -webkit-mask-size: 225px 180px;
+ -webkit-mask-position: 160px 220px;
+ }
+ </style>
+ </head>
+
+ <body>
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=129682">Bug 129682</a> - This test uses multiple masks from multiple resources.</p>
+ <div id="back">
+ <div class="front" id="front1"></div>
+ <div class="front" id="front2"></div>
+ <div class="front" id="front3"></div>
+ <div class="front" id="front4"></div>
+ </div>
+ </body>
+</html>
+
</ins></span></pre></div>
<a id="trunkLayoutTestscss3maskingmaskmultiplevalueshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-multiple-values.html (0 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-multiple-values.html (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-multiple-values.html 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+<!DOCTYPE html>
+<html lang="en">
+ <head>
+ <style>
+ p {
+ margin: 0px;
+ }
+ #back {
+ width: 500px;
+ height: 500px;
+ background-color: green;
+ }
+ #front {
+ width: 300px;
+ height: 300px;
+ background-color: black;
+ border: 50px solid blue;
+ padding: 50px;
+ -webkit-mask-image: url('resources/circle.png'), url('resources/masks.svg#lowerHalf'), url('resources/masks.svg#upperHalf'), url('resources/masks.svg#invalidId');
+ -webkit-mask-size: 150px 120px, 300px 240px, 300px 240px, 225px 180px;
+ -webkit-mask-position: -120px -110px, 50px 0px, 50px 0px, 160px 220px;
+ -webkit-mask-repeat: no-repeat;
+ -webkit-mask-origin: content-box;
+ -webkit-mask-clip: border-box;
+ }
+ </style>
+ </head>
+
+ <body>
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=129682">Bug 129682</a> - This test uses multiple masks from multiple resources.</p>
+ <div id="back">
+ <div id="front"></div>
+ </div>
+ </body>
+</html>
+
</ins></span></pre></div>
<a id="trunkLayoutTestscss3maskingmaskrepeatspacepaddingexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/masking/mask-repeat-space-padding-expected.html (177154 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-repeat-space-padding-expected.html 2014-12-11 17:51:25 UTC (rev 177154)
+++ trunk/LayoutTests/css3/masking/mask-repeat-space-padding-expected.html 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> function addMasks() {
</span><span class="cx"> for (var x = 0; x < width; x += sizeX + spaceX) {
</span><span class="cx"> for (var y = 0; y < height; y += sizeY + spaceY) {
</span><del>- urls.push("url(resources/circle.png)");
</del><ins>+ urls.push("url(resources/circle.svg)");
</ins><span class="cx"> size.push(sizeX + "px " + sizeY + "px");
</span><span class="cx"> position.push(x + "px " + y + "px");
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingmaskrepeatspacepaddinghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/masking/mask-repeat-space-padding.html (177154 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-repeat-space-padding.html 2014-12-11 17:51:25 UTC (rev 177154)
+++ trunk/LayoutTests/css3/masking/mask-repeat-space-padding.html 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> background-color: red;
</span><span class="cx"> border: 50px solid blue;
</span><span class="cx"> padding: 50px;
</span><del>- -webkit-mask-image: url("resources/circle.png");
</del><ins>+ -webkit-mask-image: url("resources/circle.svg");
</ins><span class="cx"> -webkit-mask-size: 100px;
</span><span class="cx"> -webkit-mask-repeat: space;
</span><span class="cx"> -webkit-mask-origin: padding-box;
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingmasksvgclippedfragmentIdexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-svg-clipped-fragmentId-expected.html (0 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-svg-clipped-fragmentId-expected.html (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-svg-clipped-fragmentId-expected.html 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+<!DOCTYPE html>
+<html lang="en">
+ <head>
+ <style>
+ p {
+ margin: 0px;
+ }
+ #back {
+ width: 320px;
+ height: 420px;
+ background-color: green;
+ overflow: hidden;
+ }
+ #blackSVG {
+ position: relative;
+ left: 60px;
+ top: -35px;
+ }
+ #blueSVG {
+ position: relative;
+ left: 70px;
+ top: -474px;
+ }
+ </style>
+ </head>
+
+ <body>
+
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=129682">Bug 129682</a> - This test used a &lt;mask&gt; element and paints it at the side of the masked element, causing it to be clipped.</p>
+ <div id="back">
+ <svg id="blackSVG" width="320px" height="420px">
+ <path fill="black" d="M80,20 L280,20 L280,380 L240,380 L240,60 L80,60 L80,20"/>
+ </svg>
+ <svg id="blueSVG" width="320px" height="420px">
+ <path fill="blue" d="M70,20 L280,20 L280,395 L240,395 L240,60 L70,60 L70,20"/>
+ </svg>
+ </div>
+ </body>
+</html>
+
</ins></span></pre></div>
<a id="trunkLayoutTestscss3maskingmasksvgclippedfragmentIdhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-svg-clipped-fragmentId.html (0 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-svg-clipped-fragmentId.html (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-svg-clipped-fragmentId.html 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+<!DOCTYPE html>
+<html lang="en">
+ <head>
+ <style>
+ p {
+ margin: 0px;
+ }
+ #back {
+ width: 320px;
+ height: 420px;
+ background-color: green;
+ }
+ #front {
+ width: 300px;
+ height: 400px;
+ background-color: black;
+ border: 10px solid blue;
+ -webkit-mask-image: url('resources/masks.svg#upperHalf');
+ -webkit-mask-size: 320px 420px;
+ -webkit-mask-position: 50px -45px;
+ -webkit-mask-repeat: no-repeat;
+ -webkit-mask-origin: content-box;
+ -webkit-mask-clip: border-box;
+ }
+ </style>
+ </head>
+
+ <body>
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=129682">Bug 129682</a> - This test used a &lt;mask&gt; element and paints it at the side of the masked element, causing it to be clipped.</p>
+ <div id="back">
+ <div id="front"></div>
+ </div>
+ </body>
+</html>
+
</ins></span></pre></div>
<a id="trunkLayoutTestscss3maskingmasksvgfragmentIdexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-svg-fragmentId-expected.html (0 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-svg-fragmentId-expected.html (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-svg-fragmentId-expected.html 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ p {
+ margin: 0px;
+ }
+ </style>
+ </head>
+ <body>
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=129682">Bug 129682</a> - On success, you should see a green inverted-L shape and no red.</p>
+ <p>This test references a &lt;mask&gt; element from an external SVG</p>
+ <svg width="300px" height="400px">
+ <path fill="green" d="M80,20 L280,20 L280,380 L240,380 L240,60 L80,60 L80,20"/>
+ </svg>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingmasksvgfragmentIdhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-svg-fragmentId.html (0 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-svg-fragmentId.html (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-svg-fragmentId.html 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ p {
+ margin: 0px;
+ }
+ #maskedElement {
+ width: 300px;
+ height: 400px;
+ background-color: green;
+ -webkit-mask-image:url('resources/masks.svg#upperHalf');
+ }
+ #redSvg {
+ position: absolute;
+ }
+ </style>
+ </head>
+
+ <body>
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=129682">Bug 129682</a> - On success, you should see a green inverted-L shape and no red.</p>
+ <p>This test references a &lt;mask&gt; element from an external SVG</p>
+ <svg id="redSvg" width="300px" height="400px">
+ <path fill="red" d="M80,20 L280,20 L280,380 L240,380 L240,60 L80,60 L80,20"/>
+ </svg>
+ <div id="maskedElement"></div>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingmasksvginlinefragmentIdexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-svg-inline-fragmentId-expected.html (0 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-svg-inline-fragmentId-expected.html (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-svg-inline-fragmentId-expected.html 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ p {
+ margin: 0px;
+ }
+ </style>
+ </head>
+ <body>
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=129682">Bug 129682</a> - On success, you should see a green L shape and no red.</p>
+ <p>This test references a &lt;mask&gt; element defined in the main HTML document</p>
+ <svg width="300px" height="400px">
+ <path fill="green" d="M20,20 L60,20 L60,340 L220,340 L220,380 L20,380 L20,20"/>
+ </svg>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingmasksvginlinefragmentIdhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-svg-inline-fragmentId.html (0 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-svg-inline-fragmentId.html (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-svg-inline-fragmentId.html 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ p {
+ margin: 0px;
+ }
+ #maskedElement {
+ width: 300px;
+ height: 400px;
+ background-color: green;
+ -webkit-mask-image:url('#lowerHalf');
+ }
+ #redSvg {
+ position: absolute;
+ }
+ </style>
+ </head>
+
+ <body>
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=129682">Bug 129682</a> - On success, you should see a green L shape and no red.</p>
+ <p>This test references a &lt;mask&gt; element defined in the main HTML document</p>
+ <svg id="redSvg" width="300px" height="400px">
+ <path fill="red" d="M20,20 L60,20 L60,340 L220,340 L220,380 L20,380 L20,20"/>
+ <mask id="lowerHalf" maskUnits="objectBoundingBox">
+ <path fill="#FFFFFF" d="M20,20 L60,20 L60,340 L220,340 L220,380 L20,380 L20,20"/>
+ </mask>
+ </svg>
+ <div id="maskedElement"></div>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingmasksvginlineinvalidfragmentIdexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-svg-inline-invalid-fragmentId-expected.html (0 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-svg-inline-invalid-fragmentId-expected.html (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-svg-inline-invalid-fragmentId-expected.html 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ p {
+ margin: 0px;
+ }
+ #elementToNotBeCovered {
+ width: 300px;
+ height: 400px;
+ background-color: #2222FF;
+ position: absolute;
+ left: 10px;
+ top: 50px;
+ }
+ </style>
+ </head>
+ <body>
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=129682">Bug 129682</a> - On success, you should see a blue rectangle and no red.</p>
+ <p>This test references an invalid fragment identifier.</p>
+ <div id="elementToNotBeCovered"></div>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingmasksvginlineinvalidfragmentIdhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-svg-inline-invalid-fragmentId.html (0 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-svg-inline-invalid-fragmentId.html (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-svg-inline-invalid-fragmentId.html 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ p {
+ margin: 0px;
+ }
+ #maskedElement {
+ width: 300px;
+ height: 400px;
+ background-color: red;
+ -webkit-mask-image:url('#invalidId');
+ position: absolute;
+ left: 10px;
+ top: 50px;
+ }
+ #elementToNotBeCovered {
+ width: 300px;
+ height: 400px;
+ background-color: #2222FF;
+ position: absolute;
+ left: 10px;
+ top: 50px;
+ }
+ </style>
+ </head>
+
+ <body>
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=129682">Bug 129682</a> - On success, you should see a blue rectangle and no red.</p>
+ <p>This test references an invalid fragment identifier.</p>
+ <div id="elementToNotBeCovered"></div>
+ <div id="maskedElement"></div>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingmasksvginvalidfragmentIdexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-svg-invalid-fragmentId-expected.html (0 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-svg-invalid-fragmentId-expected.html (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-svg-invalid-fragmentId-expected.html 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ p {
+ margin: 0px;
+ }
+ </style>
+ </head>
+
+ <body>
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=129682">Bug 129682</a> - On success, you should see 4 green rectangles and no red.</p>
+ <p>This test references an invalid fragment identifier from an external SVG</p>
+ <svg width="300px" height="400px">
+ <rect x="5px" y="45px" width="140px" height="140px" fill="green"/>
+ <rect x="155px" y="45px" width="140px" height="140px" fill="green"/>
+ <rect x="155px" y="215px" width="140px" height="140px" fill="green"/>
+ <rect x="5px" y="215px" width="140px" height="140px" fill="green"/>
+ </svg>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingmasksvginvalidfragmentIdhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-svg-invalid-fragmentId.html (0 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-svg-invalid-fragmentId.html (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-svg-invalid-fragmentId.html 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ p {
+ margin: 0px;
+ }
+ #maskedElement {
+ width: 300px;
+ height: 400px;
+ background-color: green;
+ -webkit-mask-image:url('resources/masks.svg#invalidId');
+ }
+ #redSvg {
+ position: absolute;
+ }
+ </style>
+ </head>
+
+ <body>
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=129682">Bug 129682</a> - On success, you should see 4 green rectangles and no red.</p>
+ <p>This test references an invalid fragment identifier from an external SVG</p>
+ <svg id="redSvg" width="300px" height="400px">
+ <rect x="5px" y="45px" width="140px" height="140px" fill="red"/>
+ <rect x="155px" y="45px" width="140px" height="140px" fill="red"/>
+ <rect x="155px" y="215px" width="140px" height="140px" fill="red"/>
+ <rect x="5px" y="215px" width="140px" height="140px" fill="red"/>
+ </svg>
+ <div id="maskedElement"></div>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingmasksvgnofragmentIdexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-svg-no-fragmentId-expected.html (0 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-svg-no-fragmentId-expected.html (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-svg-no-fragmentId-expected.html 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ p {
+ margin: 0px;
+ }
+ </style>
+ </head>
+
+ <body>
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=129682">Bug 129682</a> - On success, you should see 4 green rectangles and no red.</p>
+ <p>This test references an external SVG without specifying a fragment id.</p>
+ <svg width="300px" height="400px">
+ <rect x="5px" y="45px" width="140px" height="140px" fill="green"/>
+ <rect x="155px" y="45px" width="140px" height="140px" fill="green"/>
+ <rect x="155px" y="215px" width="140px" height="140px" fill="green"/>
+ <rect x="5px" y="215px" width="140px" height="140px" fill="green"/>
+ </svg>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingmasksvgnofragmentIdtiledexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-svg-no-fragmentId-tiled-expected.html (0 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-svg-no-fragmentId-tiled-expected.html (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-svg-no-fragmentId-tiled-expected.html 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ p {
+ margin: 0px;
+ }
+ #background {
+ width: 400px;
+ height: 500px;
+ background-color: lightblue;
+ }
+ </style>
+ </head>
+
+ <body>
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=129682">Bug 129682</a> - On success, you should see a 4-rectangle green image painted tiled and no red.</p>
+ <p>This test references an external SVG without specifying a fragment id and paints using multiple tiles.</p>
+
+ <div id="background">
+ <svg id="redSvg" width="400px" height="500px">
+ <rect x="5px" y="45px" width="140px" height="140px" fill="green"/>
+ <rect x="155px" y="45px" width="140px" height="140px" fill="green"/>
+ <rect x="305px" y="45px" width="95px" height="140px" fill="green"/>
+ <rect x="155px" y="215px" width="140px" height="140px" fill="green"/>
+ <rect x="305px" y="215px" width="95px" height="140px" fill="green"/>
+ <rect x="5px" y="215px" width="140px" height="140px" fill="green"/>
+ <rect x="5px" y="445px" width="140px" height="55px" fill="green"/>
+ <rect x="155px" y="445px" width="140px" height="55px" fill="green"/>
+ <rect x="305px" y="445px" width="95px" height="55px" fill="green"/>
+ </svg>
+ </div>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingmasksvgnofragmentIdtiledhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-svg-no-fragmentId-tiled.html (0 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-svg-no-fragmentId-tiled.html (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-svg-no-fragmentId-tiled.html 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ p {
+ margin: 0px;
+ }
+ #background {
+ width: 400px;
+ height: 500px;
+ background-color: lightblue;
+ }
+ #maskedElement {
+ width: 400px;
+ height: 500px;
+ background-color: green;
+ -webkit-mask-image:url('resources/masks.svg');
+ }
+ #redSvg {
+ position: absolute;
+ }
+ </style>
+ </head>
+
+ <body>
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=129682">Bug 129682</a> - On success, you should see a 4-rectangle green image painted tiled and no red.</p>
+ <p>This test references an external SVG without specifying a fragment id and paints using multiple tiles.</p>
+ <svg id="redSvg" width="400px" height="500px">
+ <rect x="5px" y="45px" width="140px" height="140px" fill="red"/>
+ <rect x="155px" y="45px" width="140px" height="140px" fill="red"/>
+ <rect x="305px" y="45px" width="95px" height="140px" fill="red"/>
+ <rect x="155px" y="215px" width="140px" height="140px" fill="red"/>
+ <rect x="305px" y="215px" width="95px" height="140px" fill="red"/>
+ <rect x="5px" y="215px" width="140px" height="140px" fill="red"/>
+ <rect x="5px" y="445px" width="140px" height="55px" fill="red"/>
+ <rect x="155px" y="445px" width="140px" height="55px" fill="red"/>
+ <rect x="305px" y="445px" width="95px" height="55px" fill="red"/>
+ </svg>
+ <div id="background">
+ <div id="maskedElement"></div>
+ </div>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingmasksvgnofragmentIdhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-svg-no-fragmentId.html (0 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-svg-no-fragmentId.html (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-svg-no-fragmentId.html 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ p {
+ margin: 0px;
+ }
+ #maskedElement {
+ width: 300px;
+ height: 400px;
+ background-color: green;
+ -webkit-mask-image:url('resources/masks.svg');
+ }
+ #redSvg {
+ position: absolute;
+ }
+ </style>
+ </head>
+
+ <body>
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=129682">Bug 129682</a> - On success, you should see 4 green rectangles and no red.</p>
+ <p>This test references an external SVG without specifying a fragment id.</p>
+ <svg id="redSvg" width="300px" height="400px">
+ <rect x="5px" y="45px" width="140px" height="140px" fill="red"/>
+ <rect x="155px" y="45px" width="140px" height="140px" fill="red"/>
+ <rect x="155px" y="215px" width="140px" height="140px" fill="red"/>
+ <rect x="5px" y="215px" width="140px" height="140px" fill="red"/>
+ </svg>
+ <div id="maskedElement"></div>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingmasksvgscriptentiresvgtomaskexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-svg-script-entire-svg-to-mask-expected.html (0 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-svg-script-entire-svg-to-mask-expected.html (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-svg-script-entire-svg-to-mask-expected.html 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ p {
+ margin: 0px;
+ }
+ </style>
+ </head>
+ <body>
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=129682">Bug 129682</a> - On success, you should see a blue inverted-L shape and no red.</p>
+ <p>This test sets the mask-image via CSS to the entire SVG and then changes it to a &lt;mask&gt; element from the SVG via a script.</p>
+ <svg width="300px" height="400px">
+ <path fill="blue" d="M80,20 L280,20 L280,380 L240,380 L240,60 L80,60 L80,20"/>
+ </svg>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingmasksvgscriptentiresvgtomaskhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-svg-script-entire-svg-to-mask.html (0 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-svg-script-entire-svg-to-mask.html (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-svg-script-entire-svg-to-mask.html 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ p {
+ margin: 0px;
+ }
+ #maskedElement {
+ width: 300px;
+ height: 400px;
+ background-color: green;
+ -webkit-mask-image:url('resources/masks.svg');
+ }
+ #redSvg {
+ position: absolute;
+ }
+ </style>
+ </head>
+
+ <body>
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=129682">Bug 129682</a> - On success, you should see a blue inverted-L shape and no red.</p>
+ <p>This test sets the mask-image via CSS to the entire SVG and then changes it to a &lt;mask&gt; element from the SVG via a script.</p>
+ <svg id="redSvg" width="300px" height="400px">
+ <path fill="red" d="M80,20 L280,20 L280,380 L240,380 L240,60 L80,60 L80,20"/>
+ </svg>
+ <div id="maskedElement"></div>
+
+ <script>
+ var maskedElement = document.getElementById("maskedElement");
+ maskedElement.style.cssText += "-webkit-mask-image:url('resources/masks.svg#upperHalf');background-color: blue";
+ </script>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingmasksvgscriptmasktoentiresvgexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-svg-script-mask-to-entire-svg-expected.html (0 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-svg-script-mask-to-entire-svg-expected.html (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-svg-script-mask-to-entire-svg-expected.html 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ p {
+ margin: 0px;
+ }
+ #maskedElement {
+ width: 300px;
+ height: 400px;
+ background-color: blue;
+ -webkit-mask-image:url('resources/masks.svg');
+ }
+ </style>
+ </head>
+ <body>
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=129682">Bug 129682</a> - On success, you should see four blue squares and no red.</p>
+ <p>This test sets the mask-image via CSS to a &lt;mask&gt; element from an SVG file and then changes it to the entire SVG file via a script.</p>
+ <div id="maskedElement"></div>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingmasksvgscriptmasktoentiresvghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-svg-script-mask-to-entire-svg.html (0 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-svg-script-mask-to-entire-svg.html (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-svg-script-mask-to-entire-svg.html 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ p {
+ margin: 0px;
+ }
+ #maskedElement {
+ width: 300px;
+ height: 400px;
+ background-color: green;
+ -webkit-mask-image:url('resources/masks.svg#lowerHalf');
+ }
+ #redSvg {
+ position: absolute;
+ }
+ </style>
+ </head>
+
+ <body>
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=129682">Bug 129682</a> - On success, you should see four blue squares and no red.</p>
+ <p>This test sets the mask-image via CSS to a &lt;mask&gt; element from an SVG file and then changes it to the entire SVG file via a script.</p>
+ <svg id="redSvg" width="300px" height="400px">
+ <rect x="5px" y="45px" width="140px" height="140px" fill="red"/>
+ <rect x="155px" y="45px" width="140px" height="140px" fill="red"/>
+ <rect x="155px" y="215px" width="140px" height="140px" fill="red"/>
+ <rect x="5px" y="215px" width="140px" height="140px" fill="red"/>
+ </svg>
+ <div id="maskedElement"></div>
+
+ <script>
+ var maskedElement = document.getElementById("maskedElement");
+ maskedElement.style.cssText += "-webkit-mask-image:url('resources/masks.svg');background-color:blue";
+ </script>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingmasksvgscriptmasktononeexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-svg-script-mask-to-none-expected.html (0 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-svg-script-mask-to-none-expected.html (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-svg-script-mask-to-none-expected.html 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ p {
+ margin: 0px;
+ }
+ #maskedElement {
+ width: 400px;
+ height: 400px;
+ background-color: blue;
+ }
+ </style>
+ </head>
+ <body>
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=129682">Bug 129682</a> - On success, you should see a blue rectangle and no red.</p>
+ <p>This test sets the mask-image via CSS to a &lt;mask&gt; element from an external SVG file and then changes it to 'none' via a script.</p>
+ <div id="maskedElement"></div>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingmasksvgscriptmasktononehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-svg-script-mask-to-none.html (0 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-svg-script-mask-to-none.html (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-svg-script-mask-to-none.html 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ p {
+ margin: 0px;
+ }
+ #maskedElement {
+ width: 400px;
+ height: 400px;
+ background-color: green;
+ -webkit-mask-image:url('resources/masks.svg#lowerHalf');
+ }
+ #redElement {
+ width: 400px;
+ height: 400px;
+ background-color: red;
+ position: absolute;
+ z-index: -1;
+ }
+ </style>
+ </head>
+
+ <body>
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=129682">Bug 129682</a> - On success, you should see a blue rectangle and no red.</p>
+ <p>This test sets the mask-image via CSS to a &lt;mask&gt; element from an external SVG file and then changes it to 'none' via a script.</p>
+ <div id="redElement"></div>
+ <div id="maskedElement"></div>
+ <script>
+ var maskedElement = document.getElementById("maskedElement");
+ maskedElement.style.cssText += "-webkit-mask-image:none;background-color: blue";
+ </script>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingmasksvgscriptmasktopngexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-svg-script-mask-to-png-expected.html (0 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-svg-script-mask-to-png-expected.html (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-svg-script-mask-to-png-expected.html 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ p {
+ margin: 0px;
+ }
+ #maskedElement {
+ width: 360px;
+ height: 288px;
+ background-color: blue;
+ -webkit-mask-image:url('resources/circle.png');
+ }
+ </style>
+ </head>
+ <body>
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=129682">Bug 129682</a> - On success, you should see a blue circle and no red.</p>
+ <p>This test sets the mask-image via CSS to a &lt;mask&gt; element from an SVG file and then changes it to a PNG via a script.</p>
+ <div id="maskedElement"></div>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingmasksvgscriptmasktopnghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-svg-script-mask-to-png.html (0 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-svg-script-mask-to-png.html (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-svg-script-mask-to-png.html 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ p {
+ margin: 0px;
+ }
+ #maskedElement {
+ width: 360px;
+ height: 288px;
+ background-color: red;
+ -webkit-mask-image:url('resources/masks.svg#lowerHalf');
+ }
+ #redElement {
+ position: absolute;
+ width: 360px;
+ height: 288px;
+ background-color: red;
+ -webkit-transform: scale(0.95, 0.95);
+ -webkit-mask-image: url('resources/circle.png');
+ }
+ </style>
+ </head>
+
+ <body>
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=129682">Bug 129682</a> - On success, you should see a blue circle and no red.</p>
+ <p>This test sets the mask-image via CSS to a &lt;mask&gt; element from an SVG file and then changes it to a PNG via a script.</p>
+ <div id="redElement"></div>
+ <div id="maskedElement"></div>
+
+ <script>
+ var maskedElement = document.getElementById("maskedElement");
+ maskedElement.style.cssText += "-webkit-mask-image:url('resources/circle.png');background-color: blue";
+ </script>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingmasksvgscriptnonetomaskexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-svg-script-none-to-mask-expected.html (0 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-svg-script-none-to-mask-expected.html (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-svg-script-none-to-mask-expected.html 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ p {
+ margin: 0px;
+ }
+ #maskedElement {
+ width: 400px;
+ height: 400px;
+ background-color: blue;
+ -webkit-mask-image:url('resources/masks.svg#upperHalf');
+ }
+ </style>
+ </head>
+ <body>
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=129682">Bug 129682</a> - On success, you should see a blue inverted-L shape and no red.</p>
+ <p>This test sets the mask-image value to a &lt;mask&gt; element from an external SVG via a script.</p>
+ <div id="maskedElement"></div>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingmasksvgscriptnonetomaskhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-svg-script-none-to-mask.html (0 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-svg-script-none-to-mask.html (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-svg-script-none-to-mask.html 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ p {
+ margin: 0px;
+ }
+ #maskedElement {
+ width: 400px;
+ height: 400px;
+ background-color: red;
+ }
+ #redSvg {
+ position: absolute;
+ }
+ </style>
+ </head>
+
+ <body>
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=129682">Bug 129682</a> - On success, you should see a blue inverted-L shape and no red.</p>
+ <p>This test sets the mask-image value to a &lt;mask&gt; element from an external SVG via a script.</p>
+ <svg id="redSvg" width="300px" height="400px">
+ <path fill="red" d="M80,20 L280,20 L280,380 L240,380 L240,60 L80,60 L80,20"/>
+ </svg>
+ <div id="maskedElement"></div>
+
+ <script>
+ var maskedElement = document.getElementById("maskedElement");
+ maskedElement.style.cssText += "-webkit-mask-image:url('resources/masks.svg#upperHalf');background-color: blue";
+ </script>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingmasksvgscriptnonetopngexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-svg-script-none-to-png-expected.html (0 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-svg-script-none-to-png-expected.html (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-svg-script-none-to-png-expected.html 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ p {
+ margin: 0px;
+ }
+ #maskedElement {
+ width: 280px;
+ height: 210px;
+ background-color: blue;
+ -webkit-mask-image:url('resources/dice.png');
+ -webkit-mask-source-type:luminance;
+ }
+ </style>
+ </head>
+ <body>
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=129682">Bug 129682</a> - On success, you should see a blue-tinted image of 3 dice.</p>
+ <p>This test sets the mask-image to a PNG image via a script.</p>
+ <div id="maskedElement"></div>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingmasksvgscriptnonetopnghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-svg-script-none-to-png.html (0 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-svg-script-none-to-png.html (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-svg-script-none-to-png.html 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ p {
+ margin: 0px;
+ }
+ #maskedElement {
+ width: 280px;
+ height: 210px;
+ background-color: green;
+ }
+ </style>
+ </head>
+
+ <body>
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=129682">Bug 129682</a> - On success, you should see a blue-tinted image of 3 dice.</p>
+ <p>This test sets the mask-image to a PNG image via a script.</p>
+ <div id="maskedElement"></div>
+ <script>
+ var maskedElement = document.getElementById("maskedElement");
+ maskedElement.style.cssText += "-webkit-mask-image:url('resources/dice.png');-webkit-mask-source-type:luminance;background-color:blue";
+ </script>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingmasksvgscriptpngtomaskexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-svg-script-png-to-mask-expected.html (0 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-svg-script-png-to-mask-expected.html (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-svg-script-png-to-mask-expected.html 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ p {
+ margin: 0px;
+ }
+ </style>
+ </head>
+ <body>
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=129682">Bug 129682</a> - On success, you should see a blue inverted-L shape and no red.</p>
+ <p>This test sets the mask-image via CSS to a PNG and then changes it to a &lt;mask&gt; element from an SVG file via a script.</p>
+ <svg width="300px" height="400px">
+ <path fill="blue" d="M80,20 L280,20 L280,380 L240,380 L240,60 L80,60 L80,20"/>
+ </svg>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingmasksvgscriptpngtomaskhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-svg-script-png-to-mask.html (0 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-svg-script-png-to-mask.html (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-svg-script-png-to-mask.html 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ p {
+ margin: 0px;
+ }
+ #maskedElement {
+ width: 300px;
+ height: 400px;
+ background-color: green;
+ -webkit-mask-image:url('resources/circle.png');
+ }
+ #redSvg {
+ position: absolute;
+ }
+ </style>
+ </head>
+
+ <body>
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=129682">Bug 129682</a> - On success, you should see a blue inverted-L shape and no red.</p>
+ <p>This test sets the mask-image via CSS to a PNG and then changes it to a &lt;mask&gt; element from an SVG file via a script.</p>
+ <svg id="redSvg" width="300px" height="400px">
+ <path fill="red" d="M80,20 L280,20 L280,380 L240,380 L240,60 L80,60 L80,20"/>
+ </svg>
+ <div id="maskedElement"></div>
+
+ <script>
+ var maskedElement = document.getElementById("maskedElement");
+ maskedElement.style.cssText += "-webkit-mask-image:url('resources/masks.svg#upperHalf');background-color: blue";
+ </script>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingmasksvgscriptpngtononeexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-svg-script-png-to-none-expected.html (0 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-svg-script-png-to-none-expected.html (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-svg-script-png-to-none-expected.html 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ p {
+ margin: 0px;
+ }
+ #maskedElement {
+ width: 280px;
+ height: 210px;
+ background-color: blue;
+ }
+ </style>
+ </head>
+ <body>
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=129682">Bug 129682</a> - On success, you should see a simple blue rectangle.</p>
+ <p>This test sets the mask-image via CSS to a PNG image and then changes it to 'none' via a script.</p>
+ <div id="maskedElement"></div>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingmasksvgscriptpngtononehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-svg-script-png-to-none.html (0 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-svg-script-png-to-none.html (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-svg-script-png-to-none.html 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ p {
+ margin: 0px;
+ }
+ #maskedElement {
+ width: 280px;
+ height: 210px;
+ background-color: green;
+ -webkit-mask-image:url('resources/dice.png');
+ -webkit-mask-source-type: luminance;
+ }
+ </style>
+ </head>
+
+ <body>
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=129682">Bug 129682</a> - On success, you should see a simple blue rectangle.</p>
+ <p>This test sets the mask-image via CSS to a PNG image and then changes it to 'none' via a script.</p>
+ <div id="maskedElement"></div>
+ <script>
+ var maskedElement = document.getElementById("maskedElement");
+ maskedElement.style.cssText += "-webkit-mask-image:none;background-color: blue";
+ </script>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingresourcesmaskssvg"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/resources/masks.svg (0 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/resources/masks.svg (rev 0)
+++ trunk/LayoutTests/css3/masking/resources/masks.svg 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ width="300px" height="400px" viewBox="0 0 300 400" enable-background="new 0 0 300 400" xml:space="preserve">
+<defs>
+ <mask id="upperHalf" maskUnits="objectBoundingBox">
+ <path fill="#FFFFFF" d="M80,20 L280,20 L280,380 L240,380 L240,60 L80,60 L80,20"/>
+ </mask>
+ <mask id="lowerHalf" maskUnits="objectBoundingBox">
+ <path fill="#FFFFFF" d="M20,20 L60,20 L60,340 L220,340 L220,380 L20,380 L20,20"/>
+ </mask>
+ <mask id="animatedCircle" maskUnits="objectBoundingBox">
+ <circle cx="150" cy="150" r="40" fill="white">
+ <animate attributeName="r" from="40" to="120" dur="10s" repeatCount="indefinite"/>
+ </circle>
+ </mask>
+</defs>
+
+<g>
+ <rect x="5px" y="45px" width="140px" height="140px" fill="#C1553B"/>
+ <rect x="155px" y="45px" width="140px" height="140px" fill="#71E5FF"/>
+ <rect x="155px" y="215px" width="140px" height="140px" fill="#404041"/>
+ <rect x="5px" y="215px" width="140px" height="140px" fill="#77D091"/>
+</g>
+
+</svg>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177154 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-11 17:51:25 UTC (rev 177154)
+++ trunk/Source/WebCore/ChangeLog 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -1,3 +1,77 @@
</span><ins>+2014-12-11 Radu Stavila <stavila@adobe.com>
+
+ [SVG Masking] Enable the use of <mask> elements for -webkit-mask-image
+ https://bugs.webkit.org/show_bug.cgi?id=139294
+
+ Reviewed by Simon Fraser.
+
+ This patch links together all parts required for the functionality which improves
+ the -webkit-mask-image property by allowing it to reference a <mask> element defined
+ in an inline or external SVG document.
+ Support for this new functionality has been added in a previous patch, under issue
+ https://bugs.webkit.org/show_bug.cgi?id=139092. A more detailed description of how
+ the new functionality works can be found in the ChangeLog for that commit.
+ The containsSVGDocument in ScrollView has been removed because it was added in the
+ previous patch but is no longer required.
+
+ Tests: css3/masking/mask-base64.html
+ css3/masking/mask-multiple-values.html
+ css3/masking/mask-svg-clipped-fragmentId.html
+ css3/masking/mask-svg-fragmentId.html
+ css3/masking/mask-svg-inline-fragmentId.html
+ css3/masking/mask-svg-inline-invalid-fragmentId.html
+ css3/masking/mask-svg-invalid-fragmentId.html
+ css3/masking/mask-svg-no-fragmentId-tiled.html
+ css3/masking/mask-svg-no-fragmentId.html
+ css3/masking/mask-svg-script-entire-svg-to-mask.html
+ css3/masking/mask-svg-script-mask-to-entire-svg.html
+ css3/masking/mask-svg-script-mask-to-none.html
+ css3/masking/mask-svg-script-mask-to-png.html
+ css3/masking/mask-svg-script-none-to-mask.html
+ css3/masking/mask-svg-script-none-to-png.html
+ css3/masking/mask-svg-script-png-to-mask.html
+ css3/masking/mask-svg-script-png-to-none.html
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::ComputedStyleExtractor::propertyValue):
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseFillShorthand):
+ (WebCore::CSSParser::parseFillProperty):
+ (WebCore::CSSParser::parseMaskImage):
+ * css/CSSParser.h:
+ * css/DeprecatedStyleBuilder.cpp:
+ (WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::adjustStyleForMaskImages):
+ (WebCore::StyleResolver::applyProperty):
+ (WebCore::StyleResolver::loadPendingSVGDocuments):
+ (WebCore::StyleResolver::createMaskImageOperations):
+ (WebCore::StyleResolver::loadPendingImages):
+ * page/animation/CSSPropertyAnimation.cpp:
+ (WebCore::blendFunc):
+ (WebCore::MaskImagePropertyWrapper::MaskImagePropertyWrapper):
+ (WebCore::MaskImagePropertyWrapper::equals):
+ (WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
+ * platform/graphics/MaskImageOperation.cpp:
+ (WebCore::MaskImageOperation::~MaskImageOperation):
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::maskClipRect):
+ * rendering/RenderBox.h:
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::RenderBoxModelObject::paintFillLayerExtended):
+ (WebCore::RenderBoxModelObject::calculateFillTileSize):
+ (WebCore::RenderBoxModelObject::calculateBackgroundImageGeometry):
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::~RenderElement):
+ (WebCore::RenderElement::updateFillImages):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::calculateClipRects):
+ * rendering/RenderLayer.h:
+ * rendering/style/FillLayer.h:
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::setMaskImage):
+ * rendering/style/RenderStyle.h:
+
</ins><span class="cx"> 2014-12-09 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> Restore interface state when stopping optimized fullscreen.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (177154 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-12-11 17:51:25 UTC (rev 177154)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -1794,9 +1794,8 @@
</span><span class="cx">
</span><span class="cx"> case CSSPropertyBackgroundColor:
</span><span class="cx"> return cssValuePool().createColorValue(m_allowVisitedStyle? style->visitedDependentColor(CSSPropertyBackgroundColor).rgb() : style->backgroundColor().rgb());
</span><del>- case CSSPropertyBackgroundImage:
- case CSSPropertyWebkitMaskImage: {
- const FillLayer* layers = propertyID == CSSPropertyWebkitMaskImage ? style->maskLayers() : style->backgroundLayers();
</del><ins>+ case CSSPropertyBackgroundImage: {
+ const FillLayer* layers = style->backgroundLayers();
</ins><span class="cx"> if (!layers)
</span><span class="cx"> return cssValuePool().createIdentifierValue(CSSValueNone);
</span><span class="cx">
</span><span class="lines">@@ -1816,6 +1815,27 @@
</span><span class="cx"> }
</span><span class="cx"> return list.release();
</span><span class="cx"> }
</span><ins>+ case CSSPropertyWebkitMaskImage: {
+ const FillLayer* layers = style->maskLayers();
+ if (!layers)
+ return cssValuePool().createIdentifierValue(CSSValueNone);
+
+ if (!layers->next()) {
+ if (layers->maskImage().get())
+ return layers->maskImage()->cssValue();
+
+ return cssValuePool().createIdentifierValue(CSSValueNone);
+ }
+
+ RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
+ for (const FillLayer* currLayer = layers; currLayer; currLayer = currLayer->next()) {
+ if (currLayer->maskImage().get())
+ list->append(*currLayer->maskImage()->cssValue());
+ else
+ list->append(cssValuePool().createIdentifierValue(CSSValueNone));
+ }
+ return list.release();
+ }
</ins><span class="cx"> case CSSPropertyBackgroundSize:
</span><span class="cx"> case CSSPropertyWebkitBackgroundSize:
</span><span class="cx"> case CSSPropertyWebkitMaskSize: {
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (177154 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2014-12-11 17:51:25 UTC (rev 177154)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -83,6 +83,7 @@
</span><span class="cx"> #include "TextEncoding.h"
</span><span class="cx"> #include "WebKitCSSFilterValue.h"
</span><span class="cx"> #include "WebKitCSSRegionRule.h"
</span><ins>+#include "WebKitCSSResourceValue.h"
</ins><span class="cx"> #include "WebKitCSSTransformValue.h"
</span><span class="cx"> #include <bitset>
</span><span class="cx"> #include <limits.h>
</span><span class="lines">@@ -3358,6 +3359,7 @@
</span><span class="cx"> RefPtr<CSSValue> val2;
</span><span class="cx"> CSSPropertyID propId1, propId2;
</span><span class="cx"> CSSParserValue& parserValue = *m_valueList->current();
</span><ins>+
</ins><span class="cx"> if (parseFillProperty(properties[i], propId1, propId2, val1, val2)) {
</span><span class="cx"> parsedProperty[i] = found = true;
</span><span class="cx"> addFillValue(values[i], val1.releaseNonNull());
</span><span class="lines">@@ -4446,10 +4448,13 @@
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case CSSPropertyBackgroundImage:
</span><del>- case CSSPropertyWebkitMaskImage:
</del><span class="cx"> if (parseFillImage(*m_valueList, currValue))
</span><span class="cx"> m_valueList->next();
</span><span class="cx"> break;
</span><ins>+ case CSSPropertyWebkitMaskImage:
+ if (parseMaskImage(*m_valueList, currValue))
+ m_valueList->next();
+ break;
</ins><span class="cx"> case CSSPropertyWebkitBackgroundClip:
</span><span class="cx"> case CSSPropertyWebkitBackgroundOrigin:
</span><span class="cx"> case CSSPropertyWebkitMaskClip:
</span><span class="lines">@@ -9427,6 +9432,23 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool CSSParser::parseMaskImage(CSSParserValueList& valueList, RefPtr<CSSValue>& outValue)
+{
+ outValue = nullptr;
+ CSSParserValue* value = valueList.current();
+ if (value->id == CSSValueNone)
+ outValue = WebKitCSSResourceValue::create(cssValuePool().createIdentifierValue(CSSValueNone));
+ else if (value->unit == CSSPrimitiveValue::CSS_URI)
+ outValue = WebKitCSSResourceValue::create(CSSPrimitiveValue::create(completeURL(value->string), CSSPrimitiveValue::CSS_URI));
+ else {
+ RefPtr<CSSValue> fillImageValue;
+ if (parseFillImage(valueList, fillImageValue))
+ outValue = WebKitCSSResourceValue::create(fillImageValue);
+ }
+
+ return outValue.get();
+}
+
</ins><span class="cx"> #if ENABLE(CSS_REGIONS)
</span><span class="cx"> static bool validFlowName(const String& flowName)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.h (177154 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.h 2014-12-11 17:51:25 UTC (rev 177154)
+++ trunk/Source/WebCore/css/CSSParser.h 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -117,6 +117,8 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<CSSValue> parseBackgroundColor();
</span><span class="cx">
</span><ins>+ // FIXME: Maybe these two methods could be combined into one.
+ bool parseMaskImage(CSSParserValueList&, RefPtr<CSSValue>&);
</ins><span class="cx"> bool parseFillImage(CSSParserValueList&, RefPtr<CSSValue>&);
</span><span class="cx">
</span><span class="cx"> enum FillPositionFlag { InvalidFillPosition = 0, AmbiguousFillPosition = 1, XFillPosition = 2, YFillPosition = 4 };
</span></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedStyleBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (177154 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-12-11 17:51:25 UTC (rev 177154)
+++ trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -928,7 +928,6 @@
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitFontVariantLigatures, ApplyPropertyFontVariantLigatures::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitMaskClip, ApplyPropertyFillLayer<EFillBox, CSSPropertyWebkitMaskClip, MaskFillLayer, &RenderStyle::accessMaskLayers, &RenderStyle::maskLayers, &FillLayer::isClipSet, &FillLayer::clip, &FillLayer::setClip, &FillLayer::clearClip, &FillLayer::initialFillClip, &CSSToStyleMap::mapFillClip>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitMaskComposite, ApplyPropertyFillLayer<CompositeOperator, CSSPropertyWebkitMaskComposite, MaskFillLayer, &RenderStyle::accessMaskLayers, &RenderStyle::maskLayers, &FillLayer::isCompositeSet, &FillLayer::composite, &FillLayer::setComposite, &FillLayer::clearComposite, &FillLayer::initialFillComposite, &CSSToStyleMap::mapFillComposite>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyWebkitMaskImage, ApplyPropertyFillLayer<StyleImage*, CSSPropertyWebkitMaskImage, MaskFillLayer, &RenderStyle::accessMaskLayers, &RenderStyle::maskLayers, &FillLayer::isImageSet, &FillLayer::image, &FillLayer::setImage, &FillLayer::clearImage, &FillLayer::initialFillImage, &CSSToStyleMap::mapFillImage>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyWebkitMaskOrigin, ApplyPropertyFillLayer<EFillBox, CSSPropertyWebkitMaskOrigin, MaskFillLayer, &RenderStyle::accessMaskLayers, &RenderStyle::maskLayers, &FillLayer::isOriginSet, &FillLayer::origin, &FillLayer::setOrigin, &FillLayer::clearOrigin, &FillLayer::initialFillOrigin, &CSSToStyleMap::mapFillOrigin>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitMaskPositionX, ApplyPropertyFillLayer<Length, CSSPropertyWebkitMaskPositionX, MaskFillLayer, &RenderStyle::accessMaskLayers, &RenderStyle::maskLayers, &FillLayer::isXPositionSet, &FillLayer::xPosition, &FillLayer::setXPosition, &FillLayer::clearXPosition, &FillLayer::initialFillXPosition, &CSSToStyleMap::mapFillXPosition>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitMaskPositionY, ApplyPropertyFillLayer<Length, CSSPropertyWebkitMaskPositionY, MaskFillLayer, &RenderStyle::accessMaskLayers, &RenderStyle::maskLayers, &FillLayer::isYPositionSet, &FillLayer::yPosition, &FillLayer::setYPosition, &FillLayer::clearYPosition, &FillLayer::initialFillYPosition, &CSSToStyleMap::mapFillYPosition>::createHandler());
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (177154 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2014-12-11 17:51:25 UTC (rev 177154)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -1157,6 +1157,61 @@
</span><span class="cx"> style->setWritingMode(LeftToRightWritingMode);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void StyleResolver::adjustStyleForMaskImages()
+{
+ // If we already have the same mask image objects loaded on the old style,
+ // use the old ones instead of loading new ones.
+ RenderStyle* newStyle = m_state.style();
+ RenderStyle* oldStyle = (m_state.element() ? m_state.element()->renderStyle() : nullptr);
+
+ if (newStyle && oldStyle) {
+ Vector<RefPtr<MaskImageOperation>> removedExternalResources;
+
+ // Get all mask objects from the old style in a vector
+ // so we can remove them as we match them, making the following steps faster.
+ Vector<RefPtr<MaskImageOperation>> oldStyleMaskImages;
+ const FillLayer* oldMaskLayer = oldStyle->maskLayers();
+ while (oldMaskLayer) {
+ RefPtr<MaskImageOperation> oldMaskImage = oldMaskLayer->maskImage();
+ if (oldMaskImage.get())
+ oldStyleMaskImages.append(oldMaskImage);
+
+ oldMaskLayer = oldMaskLayer->next();
+ }
+
+ // Try to match the new mask objects through the list from the old style.
+ // This should work perfectly and optimal when the list of masks remained
+ // the same and also work correctly (but slower) when they were reordered.
+ FillLayer* newMaskLayer = newStyle->accessMaskLayers();
+ int countOldStyleMaskImages = oldStyleMaskImages.size();
+ while (newMaskLayer && countOldStyleMaskImages) {
+ RefPtr<MaskImageOperation> newMaskImage = newMaskLayer->maskImage();
+ if (newMaskImage.get()) {
+ for (int i = 0; i < countOldStyleMaskImages; i++) {
+ RefPtr<MaskImageOperation> oldMaskImage = oldStyleMaskImages[i];
+ if (*oldMaskImage == *newMaskImage) {
+ newMaskLayer->setMaskImage(oldMaskImage);
+ if (newMaskImage->isExternalDocument())
+ removedExternalResources.append(newMaskImage);
+
+ oldStyleMaskImages.remove(i);
+ countOldStyleMaskImages--;
+ break;
+ }
+ }
+ }
+
+ newMaskLayer = newMaskLayer->next();
+ }
+
+ Vector<RefPtr<MaskImageOperation>>& pendingResources = m_state.maskImagesWithPendingSVGDocuments();
+ for (int i = pendingResources.size() - 1; i >= 0; i--) {
+ if (removedExternalResources.contains(pendingResources[i]))
+ pendingResources.remove(i);
+ }
+ }
+}
+
</ins><span class="cx"> void StyleResolver::adjustRenderStyle(RenderStyle& style, const RenderStyle& parentStyle, Element *e)
</span><span class="cx"> {
</span><span class="cx"> // Cache our original display.
</span><span class="lines">@@ -1763,6 +1818,8 @@
</span><span class="cx"> // There are some CSS properties that affect the same RenderStyle values,
</span><span class="cx"> // so to preserve behavior, we queue them up during cascade and flush here.
</span><span class="cx"> cascade.applyDeferredProperties(*this);
</span><ins>+
+ adjustStyleForMaskImages();
</ins><span class="cx">
</span><span class="cx"> // Start loading resources referenced by this style.
</span><span class="cx"> loadPendingResources();
</span><span class="lines">@@ -2540,6 +2597,14 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ case CSSPropertyWebkitMaskImage: {
+ Vector<RefPtr<MaskImageOperation>> operations;
+ if (createMaskImageOperations(value, operations))
+ state.style()->setMaskImage(operations);
+
+ return;
+ }
+
</ins><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> case CSSPropertyWebkitGridAutoColumns: {
</span><span class="cx"> HANDLE_INHERIT_AND_INITIAL(gridAutoColumns, GridAutoColumns);
</span><span class="lines">@@ -2966,7 +3031,6 @@
</span><span class="cx"> case CSSPropertyWebkitMaskBoxImageWidth:
</span><span class="cx"> case CSSPropertyWebkitMaskClip:
</span><span class="cx"> case CSSPropertyWebkitMaskComposite:
</span><del>- case CSSPropertyWebkitMaskImage:
</del><span class="cx"> case CSSPropertyWebkitMaskOrigin:
</span><span class="cx"> case CSSPropertyWebkitMaskPositionX:
</span><span class="cx"> case CSSPropertyWebkitMaskPositionY:
</span><span class="lines">@@ -3317,14 +3381,30 @@
</span><span class="cx"> // style is NULL. We don't know exactly why this happens. Our guess is
</span><span class="cx"> // reentering styleForElement().
</span><span class="cx"> ASSERT(state.style());
</span><del>- if (!state.style() || !state.style()->hasFilter() || state.filtersWithPendingSVGDocuments().isEmpty())
</del><ins>+ if (!state.style())
</ins><span class="cx"> return;
</span><ins>+
+ bool hasFilters = (state.style()->hasFilter() && !state.filtersWithPendingSVGDocuments().isEmpty());
+ bool hasMasks = (state.style()->hasMask() && !state.maskImagesWithPendingSVGDocuments().isEmpty());
+
+ if (!hasFilters && !hasMasks)
+ return;
</ins><span class="cx">
</span><span class="cx"> CachedResourceLoader* cachedResourceLoader = state.document().cachedResourceLoader();
</span><del>- for (auto& filterOperation : state.filtersWithPendingSVGDocuments())
- filterOperation->getOrCreateCachedSVGDocumentReference()->load(cachedResourceLoader);
</del><ins>+
+ if (hasFilters) {
+ for (auto& filterOperation : state.filtersWithPendingSVGDocuments())
+ filterOperation->getOrCreateCachedSVGDocumentReference()->load(cachedResourceLoader);
</ins><span class="cx">
</span><del>- state.filtersWithPendingSVGDocuments().clear();
</del><ins>+ state.filtersWithPendingSVGDocuments().clear();
+ }
+
+ if (hasMasks) {
+ for (auto& maskImageOperation : state.maskImagesWithPendingSVGDocuments())
+ maskImageOperation->ensureCachedSVGDocumentReference()->load(cachedResourceLoader);
+
+ state.maskImagesWithPendingSVGDocuments().clear();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool StyleResolver::createFilterOperations(CSSValue* inValue, FilterOperations& outOperations)
</span><span class="lines">@@ -3472,16 +3552,22 @@
</span><span class="cx"> if (!inValue)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- ASSERT(is<CSSValueList>(*inValue));
</del><ins>+ RefPtr<WebKitCSSResourceValue> maskImageValue;
+ RefPtr<CSSValueList> maskImagesList;
+ CSSValueList::iterator listIterator;
+ if (is<WebKitCSSResourceValue>(*inValue))
+ maskImageValue = downcast<WebKitCSSResourceValue>(inValue);
+ else if (is<CSSValueList>(*inValue)) {
+ maskImagesList = downcast<CSSValueList>(inValue);
+ listIterator = maskImagesList->begin();
+ if (listIterator != maskImagesList->end())
+ maskImageValue = &downcast<WebKitCSSResourceValue>(listIterator->get());
+ }
</ins><span class="cx">
</span><del>- for (auto& currValue : downcast<CSSValueList>(*inValue)) {
- if (!is<WebKitCSSResourceValue>(currValue.get()))
- continue;
-
- WebKitCSSResourceValue& maskImageValue = downcast<WebKitCSSResourceValue>(currValue.get());
- RefPtr<CSSValue> maskInnerValue = maskImageValue.innerValue();
</del><ins>+ while (maskImageValue.get()) {
+ RefPtr<CSSValue> maskInnerValue = maskImageValue->innerValue();
</ins><span class="cx"> RefPtr<MaskImageOperation> newMaskImage;
</span><del>-
</del><ins>+
</ins><span class="cx"> if (is<CSSPrimitiveValue>(maskInnerValue.get())) {
</span><span class="cx"> RefPtr<CSSPrimitiveValue> primitiveValue = downcast<CSSPrimitiveValue>(maskInnerValue.get());
</span><span class="cx"> if (primitiveValue->isValueID() && primitiveValue->getValueID() == CSSValueNone)
</span><span class="lines">@@ -3491,7 +3577,7 @@
</span><span class="cx"> URL url = m_state.document().completeURL(cssUrl);
</span><span class="cx">
</span><span class="cx"> bool isExternalDocument = (SVGURIReference::isExternalURIReference(cssUrl, m_state.document()));
</span><del>- newMaskImage = MaskImageOperation::create(&maskImageValue, cssUrl, url.fragmentIdentifier(), isExternalDocument, m_state.document().cachedResourceLoader());
</del><ins>+ newMaskImage = MaskImageOperation::create(maskImageValue, cssUrl, url.fragmentIdentifier(), isExternalDocument, m_state.document().cachedResourceLoader());
</ins><span class="cx"> if (isExternalDocument)
</span><span class="cx"> m_state.maskImagesWithPendingSVGDocuments().append(newMaskImage);
</span><span class="cx"> }
</span><span class="lines">@@ -3506,6 +3592,12 @@
</span><span class="cx"> newMaskImage = MaskImageOperation::create();
</span><span class="cx">
</span><span class="cx"> outOperations.append(newMaskImage);
</span><ins>+
+ if (maskImagesList.get()) {
+ listIterator++;
+ maskImageValue = (listIterator != maskImagesList->end() ? &downcast<WebKitCSSResourceValue>(listIterator->get()) : nullptr);
+ } else
+ maskImageValue = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="lines">@@ -3629,9 +3721,10 @@
</span><span class="cx"> }
</span><span class="cx"> case CSSPropertyWebkitMaskImage: {
</span><span class="cx"> for (FillLayer* maskLayer = m_state.style()->accessMaskLayers(); maskLayer; maskLayer = maskLayer->next()) {
</span><del>- auto* styleImage = maskLayer->image();
</del><ins>+ RefPtr<MaskImageOperation> maskImage = maskLayer->maskImage();
+ auto* styleImage = maskImage.get() ? maskImage->image() : nullptr;
</ins><span class="cx"> if (is<StylePendingImage>(styleImage))
</span><del>- maskLayer->setImage(loadPendingImage(downcast<StylePendingImage>(*styleImage)));
</del><ins>+ maskImage->setImage(loadPendingImage(downcast<StylePendingImage>(*styleImage)));
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.h (177154 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.h 2014-12-11 17:51:25 UTC (rev 177154)
+++ trunk/Source/WebCore/css/StyleResolver.h 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -301,6 +301,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void adjustStyleForInterCharacterRuby();
</span><ins>+ void adjustStyleForMaskImages();
</ins><span class="cx">
</span><span class="cx"> bool fastRejectSelector(const RuleData&) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (177154 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2014-12-11 17:51:25 UTC (rev 177154)
+++ trunk/Source/WebCore/page/FrameView.cpp 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -4390,14 +4390,6 @@
</span><span class="cx"> return renderView->style().isFlippedBlocksWritingMode();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool FrameView::containsSVGDocument() const
-{
- if (frame().document())
- return frame().document()->isSVGDocument();
-
- return false;
-}
-
</del><span class="cx"> void FrameView::notifyWidgetsInAllFrames(WidgetNotification notification)
</span><span class="cx"> {
</span><span class="cx"> for (Frame* frame = m_frame.get(); frame; frame = frame->tree().traverseNext(m_frame.get())) {
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (177154 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h 2014-12-11 17:51:25 UTC (rev 177154)
+++ trunk/Source/WebCore/page/FrameView.h 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -527,7 +527,6 @@
</span><span class="cx">
</span><span class="cx"> virtual bool isVerticalDocument() const override;
</span><span class="cx"> virtual bool isFlippedDocument() const override;
</span><del>- virtual bool containsSVGDocument() const override;
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit FrameView(Frame&);
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationCSSPropertyAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp (177154 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2014-12-11 17:51:25 UTC (rev 177154)
+++ trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> #include "ClipPathOperation.h"
</span><span class="cx"> #include "FloatConversion.h"
</span><span class="cx"> #include "IdentityTransformOperation.h"
</span><ins>+#include "MaskImageOperation.h"
</ins><span class="cx"> #include "Matrix3DTransformOperation.h"
</span><span class="cx"> #include "MatrixTransformOperation.h"
</span><span class="cx"> #include "RenderBox.h"
</span><span class="lines">@@ -341,6 +342,19 @@
</span><span class="cx"> return to;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline PassRefPtr<MaskImageOperation> blendFunc(const AnimationBase* anim, const RefPtr<MaskImageOperation> from, const RefPtr<MaskImageOperation> to, double progress)
+{
+ if (!from.get() || !to.get())
+ return to;
+
+ // Only animates between masks using images (PNG, entire SVG, generated image).
+ // It does not animate between <mask> elements (file.svg#identifier).
+ if (from->image() && to->image())
+ return MaskImageOperation::create(blendFunc(anim, from->image(), to->image(), progress));
+
+ return to;
+}
+
</ins><span class="cx"> static inline NinePieceImage blendFunc(const AnimationBase* anim, const NinePieceImage& from, const NinePieceImage& to, double progress)
</span><span class="cx"> {
</span><span class="cx"> if (!from.hasImage() || !to.hasImage())
</span><span class="lines">@@ -500,6 +514,30 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+class MaskImagePropertyWrapper : public PropertyWrapper<const RefPtr<MaskImageOperation>> {
+public:
+ MaskImagePropertyWrapper()
+ : PropertyWrapper<const RefPtr<MaskImageOperation>>(CSSPropertyWebkitMaskImage, &RenderStyle::maskImage, &RenderStyle::setMaskImage)
+ {
+ }
+
+ virtual bool equals(const RenderStyle* a, const RenderStyle* b) const
+ {
+ // If the style pointers are the same, don't bother doing the test.
+ // If either is null, return false. If both are null, return true.
+ if (a == b)
+ return true;
+ if (!a || !b)
+ return false;
+
+ const RefPtr<MaskImageOperation> maskImageA = (a->*m_getter)();
+ const RefPtr<MaskImageOperation> maskImageB = (b->*m_getter)();
+ StyleImage* styleImageA = (maskImageA ? maskImageA->image() : nullptr);
+ StyleImage* styleImageB = (maskImageB ? maskImageB->image() : nullptr);
+ return StyleImage::imagesEquivalent(styleImageA, styleImageB);
+ }
+};
+
</ins><span class="cx"> class PropertyWrapperColor : public PropertyWrapperGetter<Color> {
</span><span class="cx"> public:
</span><span class="cx"> PropertyWrapperColor(CSSPropertyID prop, Color (RenderStyle::*getter)() const, void (RenderStyle::*setter)(const Color&))
</span><span class="lines">@@ -1152,7 +1190,7 @@
</span><span class="cx">
</span><span class="cx"> new FillLayersPropertyWrapper(CSSPropertyBackgroundImage, &RenderStyle::backgroundLayers, &RenderStyle::accessBackgroundLayers),
</span><span class="cx"> new StyleImagePropertyWrapper(CSSPropertyListStyleImage, &RenderStyle::listStyleImage, &RenderStyle::setListStyleImage),
</span><del>- new StyleImagePropertyWrapper(CSSPropertyWebkitMaskImage, &RenderStyle::maskImage, &RenderStyle::setMaskImage),
</del><ins>+ new MaskImagePropertyWrapper(),
</ins><span class="cx">
</span><span class="cx"> new StyleImagePropertyWrapper(CSSPropertyBorderImageSource, &RenderStyle::borderImageSource, &RenderStyle::setBorderImageSource),
</span><span class="cx"> new LengthPropertyWrapper<LengthBox>(CSSPropertyBorderImageSlice, &RenderStyle::borderImageSlices, &RenderStyle::setBorderImageSlices),
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollView.h (177154 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollView.h 2014-12-11 17:51:25 UTC (rev 177154)
+++ trunk/Source/WebCore/platform/ScrollView.h 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -410,7 +410,6 @@
</span><span class="cx"> // Subclassed by FrameView to check the writing-mode of the document.
</span><span class="cx"> virtual bool isVerticalDocument() const { return true; }
</span><span class="cx"> virtual bool isFlippedDocument() const { return false; }
</span><del>- virtual bool containsSVGDocument() const { return false; }
</del><span class="cx">
</span><span class="cx"> // Called to update the scrollbars to accurately reflect the state of the view.
</span><span class="cx"> void updateScrollbars(const IntSize& desiredOffset);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMaskImageOperationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MaskImageOperation.cpp (177154 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MaskImageOperation.cpp 2014-12-11 17:51:25 UTC (rev 177154)
+++ trunk/Source/WebCore/platform/graphics/MaskImageOperation.cpp 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -82,8 +82,17 @@
</span><span class="cx">
</span><span class="cx"> MaskImageOperation::~MaskImageOperation()
</span><span class="cx"> {
</span><ins>+ setRenderLayerImageClient(nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+bool MaskImageOperation::operator==(const MaskImageOperation& other) const
+{
+ if (m_url.length())
+ return (m_url == other.m_url && m_fragment == other.m_fragment && m_isExternalDocument == other.m_isExternalDocument);
+
+ return m_styleImage.get() == other.m_styleImage.get();
+}
+
</ins><span class="cx"> bool MaskImageOperation::isCSSValueNone() const
</span><span class="cx"> {
</span><span class="cx"> if (image())
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMaskImageOperationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MaskImageOperation.h (177154 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MaskImageOperation.h 2014-12-11 17:51:25 UTC (rev 177154)
+++ trunk/Source/WebCore/platform/graphics/MaskImageOperation.h 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -57,9 +57,13 @@
</span><span class="cx"> PassRefPtr<CSSValue> cssValue();
</span><span class="cx">
</span><span class="cx"> virtual ~MaskImageOperation();
</span><ins>+
+ bool operator==(const MaskImageOperation&) const;
+ inline bool operator!=(const MaskImageOperation& other) const { return !operator==(other); }
</ins><span class="cx">
</span><span class="cx"> const String& url() const { return m_url; }
</span><span class="cx"> const String& fragment() const { return m_fragment; }
</span><ins>+ bool isExternalDocument() const { return m_isExternalDocument; }
</ins><span class="cx"> StyleImage* image() const { return m_styleImage.get(); }
</span><span class="cx"> void setImage(PassRefPtr<StyleImage> image) { m_styleImage = image; }
</span><span class="cx"> void setRenderLayerImageClient(CachedImageClient*);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (177154 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2014-12-11 17:51:25 UTC (rev 177154)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -1530,7 +1530,7 @@
</span><span class="cx"> LayoutRect result;
</span><span class="cx"> LayoutRect borderBox = borderBoxRect();
</span><span class="cx"> for (const FillLayer* maskLayer = style().maskLayers(); maskLayer; maskLayer = maskLayer->next()) {
</span><del>- if (maskLayer->image()) {
</del><ins>+ if (maskLayer->maskImage()) {
</ins><span class="cx"> BackgroundImageGeometry geometry;
</span><span class="cx"> // Masks should never have fixed attachment, so it's OK for paintContainer to be null.
</span><span class="cx"> calculateBackgroundImageGeometry(0, maskLayer, borderBox, geometry);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.h (177154 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.h 2014-12-11 17:51:25 UTC (rev 177154)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -175,6 +175,9 @@
</span><span class="cx"> // Bounds of the outline box in absolute coords. Respects transforms
</span><span class="cx"> virtual LayoutRect outlineBoundsForRepaint(const RenderLayerModelObject* /*repaintContainer*/, const RenderGeometryMap*) const override final;
</span><span class="cx"> virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) override;
</span><ins>+
+ virtual FloatRect repaintRectInLocalCoordinates() const override { return borderBoxRect(); }
+ virtual FloatRect objectBoundingBox() const override { return borderBoxRect(); }
</ins><span class="cx">
</span><span class="cx"> // Use this with caution! No type checking is done!
</span><span class="cx"> RenderBox* previousSiblingBox() const;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (177154 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2014-12-11 17:51:25 UTC (rev 177154)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -27,6 +27,8 @@
</span><span class="cx"> #include "RenderBoxModelObject.h"
</span><span class="cx">
</span><span class="cx"> #include "BorderEdge.h"
</span><ins>+#include "CachedImage.h"
+#include "CachedSVGDocument.h"
</ins><span class="cx"> #include "FloatRoundedRect.h"
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "FrameView.h"
</span><span class="lines">@@ -47,13 +49,17 @@
</span><span class="cx"> #include "RenderNamedFlowFragment.h"
</span><span class="cx"> #include "RenderNamedFlowThread.h"
</span><span class="cx"> #include "RenderRegion.h"
</span><ins>+#include "RenderSVGResourceMasker.h"
</ins><span class="cx"> #include "RenderTable.h"
</span><span class="cx"> #include "RenderTableRow.h"
</span><span class="cx"> #include "RenderText.h"
</span><span class="cx"> #include "RenderTextFragment.h"
</span><span class="cx"> #include "RenderView.h"
</span><ins>+#include "SVGImageForContainer.h"
+#include "SVGSVGElement.h"
</ins><span class="cx"> #include "ScrollingConstraints.h"
</span><span class="cx"> #include "Settings.h"
</span><ins>+#include "StyleCachedImage.h"
</ins><span class="cx"> #include "TransformState.h"
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><span class="lines">@@ -676,7 +682,7 @@
</span><span class="cx"> FloatRect pixelSnappedRect = snapRectToDevicePixels(rect, deviceScaleFactor);
</span><span class="cx">
</span><span class="cx"> // Fast path for drawing simple color backgrounds.
</span><del>- if (!isRoot && !clippedWithLocalScrolling && !shouldPaintBackgroundImage && isBorderFill && !bgLayer->next()) {
</del><ins>+ if (!isRoot && !clippedWithLocalScrolling && !shouldPaintBackgroundImage && isBorderFill && !bgLayer->hasMaskImage() && !bgLayer->next()) {
</ins><span class="cx"> if (!colorVisible)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -837,19 +843,26 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // no progressive loading of the background image
</span><del>- if (!baseBgColorOnly && shouldPaintBackgroundImage) {
</del><ins>+ if (!baseBgColorOnly && (shouldPaintBackgroundImage || bgLayer->hasMaskImage())) {
</ins><span class="cx"> BackgroundImageGeometry geometry;
</span><span class="cx"> calculateBackgroundImageGeometry(paintInfo.paintContainer, bgLayer, scrolledPaintRect, geometry, backgroundObject);
</span><span class="cx"> geometry.clip(LayoutRect(pixelSnappedRect));
</span><ins>+
</ins><span class="cx"> if (!geometry.destRect().isEmpty()) {
</span><ins>+ bool didPaintCustomMask = false;
</ins><span class="cx"> CompositeOperator compositeOp = op == CompositeSourceOver ? bgLayer->composite() : op;
</span><span class="cx"> auto clientForBackgroundImage = backgroundObject ? backgroundObject : this;
</span><del>- RefPtr<Image> image = bgImage->image(clientForBackgroundImage, geometry.tileSize());
- context->setDrawLuminanceMask(bgLayer->maskSourceType() == MaskLuminance);
- bool useLowQualityScaling = shouldPaintAtLowQuality(context, image.get(), bgLayer, geometry.tileSize());
- if (image.get())
- image->setSpaceSize(geometry.spaceSize());
- context->drawTiledImage(image.get(), style().colorSpace(), geometry.destRect(), geometry.relativePhase(), geometry.tileSize(), ImagePaintingOptions(compositeOp, bgLayer->blendMode(), ImageOrientationDescription(), useLowQualityScaling));
</del><ins>+ RefPtr<Image> image = (bgImage ? bgImage->image(clientForBackgroundImage, geometry.tileSize()) : nullptr);
+ if (!image.get() && bgLayer->hasMaskImage())
+ didPaintCustomMask = bgLayer->maskImage()->drawMask(*this, geometry, context, compositeOp);
+
+ if (!didPaintCustomMask && shouldPaintBackgroundImage) {
+ context->setDrawLuminanceMask(bgLayer->maskSourceType() == MaskLuminance);
+ bool useLowQualityScaling = shouldPaintAtLowQuality(context, image.get(), bgLayer, geometry.tileSize());
+ if (image.get())
+ image->setSpaceSize(geometry.spaceSize());
+ context->drawTiledImage(image.get(), style().colorSpace(), geometry.destRect(), geometry.relativePhase(), geometry.tileSize(), ImagePaintingOptions(compositeOp, bgLayer->blendMode(), ImageOrientationDescription(), useLowQualityScaling));
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -954,8 +967,13 @@
</span><span class="cx"> StyleImage* image = fillLayer->image();
</span><span class="cx"> EFillSizeType type = fillLayer->size().type;
</span><span class="cx">
</span><del>- LayoutSize imageIntrinsicSize = calculateImageIntrinsicDimensions(image, positioningAreaSize, ScaleByEffectiveZoom);
- imageIntrinsicSize.scale(1 / image->imageScaleFactor(), 1 / image->imageScaleFactor());
</del><ins>+ LayoutSize imageIntrinsicSize;
+ if (image) {
+ imageIntrinsicSize = calculateImageIntrinsicDimensions(image, positioningAreaSize, ScaleByEffectiveZoom);
+ imageIntrinsicSize.scale(1 / image->imageScaleFactor(), 1 / image->imageScaleFactor());
+ } else
+ imageIntrinsicSize = positioningAreaSize;
+
</ins><span class="cx"> switch (type) {
</span><span class="cx"> case SizeLength: {
</span><span class="cx"> LayoutSize tileSize = positioningAreaSize;
</span><span class="lines">@@ -1151,7 +1169,9 @@
</span><span class="cx">
</span><span class="cx"> auto clientForBackgroundImage = backgroundObject ? backgroundObject : this;
</span><span class="cx"> LayoutSize fillTileSize = calculateFillTileSize(fillLayer, positioningAreaSize);
</span><del>- fillLayer->image()->setContainerSizeForRenderer(clientForBackgroundImage, fillTileSize, style().effectiveZoom());
</del><ins>+ if (StyleImage* layerImage = fillLayer->image())
+ layerImage->setContainerSizeForRenderer(clientForBackgroundImage, fillTileSize, style().effectiveZoom());
+
</ins><span class="cx"> geometry.setTileSize(fillTileSize);
</span><span class="cx">
</span><span class="cx"> EFillRepeat backgroundRepeatX = fillLayer->repeatX();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (177154 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2014-12-11 17:51:25 UTC (rev 177154)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -116,6 +116,8 @@
</span><span class="cx"> for (const FillLayer* maskLayer = m_style->maskLayers(); maskLayer; maskLayer = maskLayer->next()) {
</span><span class="cx"> if (StyleImage* maskImage = maskLayer->image())
</span><span class="cx"> maskImage->removeClient(this);
</span><ins>+ else if (maskLayer->maskImage().get())
+ maskLayer->maskImage()->removeRendererImageClient(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (StyleImage* borderImage = m_style->borderImage().image())
</span><span class="lines">@@ -321,18 +323,22 @@
</span><span class="cx"> void RenderElement::updateFillImages(const FillLayer* oldLayers, const FillLayer* newLayers)
</span><span class="cx"> {
</span><span class="cx"> // Optimize the common case
</span><del>- if (oldLayers && !oldLayers->next() && newLayers && !newLayers->next() && (oldLayers->image() == newLayers->image()))
</del><ins>+ if (oldLayers && !oldLayers->next() && newLayers && !newLayers->next() && oldLayers->image() == newLayers->image() && oldLayers->maskImage() == newLayers->maskImage())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Go through the new layers and addClients first, to avoid removing all clients of an image.
</span><span class="cx"> for (const FillLayer* currNew = newLayers; currNew; currNew = currNew->next()) {
</span><del>- if (currNew->image())
- currNew->image()->addClient(this);
</del><ins>+ if (StyleImage* image = currNew->image())
+ image->addClient(this);
+ else if (currNew->maskImage().get())
+ currNew->maskImage()->addRendererImageClient(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (const FillLayer* currOld = oldLayers; currOld; currOld = currOld->next()) {
</span><del>- if (currOld->image())
- currOld->image()->removeClient(this);
</del><ins>+ if (StyleImage* image = currOld->image())
+ image->removeClient(this);
+ else if (currOld->maskImage().get())
+ currOld->maskImage()->removeRendererImageClient(this);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (177154 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-12-11 17:51:25 UTC (rev 177154)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -6499,6 +6499,7 @@
</span><span class="cx"> updateBlendMode();
</span><span class="cx"> #endif
</span><span class="cx"> updateOrRemoveFilterClients();
</span><ins>+ updateOrRemoveMaskImageClients(oldStyle);
</ins><span class="cx">
</span><span class="cx"> updateNeedsCompositedScrolling();
</span><span class="cx">
</span><span class="lines">@@ -6653,6 +6654,19 @@
</span><span class="cx"> filterInfo->removeReferenceFilterClients();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderLayer::updateOrRemoveMaskImageClients(const RenderStyle* oldStyle)
+{
+ if (oldStyle && oldStyle->maskImage().get()) {
+ if (MaskImageInfo* maskImageInfo = MaskImageInfo::getIfExists(*this))
+ maskImageInfo->removeMaskImageClients(*oldStyle);
+ }
+
+ if (renderer().style().maskImage().get())
+ MaskImageInfo::get(*this).updateMaskImageClients();
+ else if (MaskImageInfo* maskImageInfo = MaskImageInfo::getIfExists(*this))
+ maskImageInfo->removeMaskImageClients(renderer().style());
+}
+
</ins><span class="cx"> void RenderLayer::updateOrRemoveFilterEffectRenderer()
</span><span class="cx"> {
</span><span class="cx"> // FilterEffectRenderer is only used to render the filters in software mode,
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.h (177154 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.h 2014-12-11 17:51:25 UTC (rev 177154)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -1127,6 +1127,8 @@
</span><span class="cx"> void updateOrRemoveFilterClients();
</span><span class="cx"> void updateOrRemoveFilterEffectRenderer();
</span><span class="cx">
</span><ins>+ void updateOrRemoveMaskImageClients(const RenderStyle* oldStyle);
+
</ins><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> void updateAncestorChainHasBlendingDescendants();
</span><span class="cx"> void dirtyAncestorChainHasBlendingDescendants();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerMaskImageInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerMaskImageInfo.cpp (177154 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerMaskImageInfo.cpp 2014-12-11 17:51:25 UTC (rev 177154)
+++ trunk/Source/WebCore/rendering/RenderLayerMaskImageInfo.cpp 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx">
</span><span class="cx"> RenderLayer::MaskImageInfo::~MaskImageInfo()
</span><span class="cx"> {
</span><del>- removeMaskImageClients();
</del><ins>+ removeMaskImageClients(m_layer.renderer().style());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderLayer::MaskImageInfo::notifyFinished(CachedResource*)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderLayer::MaskImageInfo::updateMaskImageClients()
</span><span class="cx"> {
</span><del>- removeMaskImageClients();
</del><ins>+ removeMaskImageClients(m_layer.renderer().style());
</ins><span class="cx">
</span><span class="cx"> const FillLayer* maskLayer = m_layer.renderer().style().maskLayers();
</span><span class="cx"> while (maskLayer) {
</span><span class="lines">@@ -119,9 +119,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderLayer::MaskImageInfo::removeMaskImageClients()
</del><ins>+void RenderLayer::MaskImageInfo::removeMaskImageClients(const RenderStyle& oldStyle)
</ins><span class="cx"> {
</span><del>- const FillLayer* maskLayer = m_layer.renderer().style().maskLayers();
</del><ins>+ const FillLayer* maskLayer = oldStyle.maskLayers();
</ins><span class="cx"> while (maskLayer) {
</span><span class="cx"> if (maskLayer->maskImage())
</span><span class="cx"> maskLayer->maskImage()->setRenderLayerImageClient(nullptr);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerMaskImageInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerMaskImageInfo.h (177154 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerMaskImageInfo.h 2014-12-11 17:51:25 UTC (rev 177154)
+++ trunk/Source/WebCore/rendering/RenderLayerMaskImageInfo.h 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> ~MaskImageInfo();
</span><span class="cx">
</span><span class="cx"> void updateMaskImageClients();
</span><del>- void removeMaskImageClients();
</del><ins>+ void removeMaskImageClients(const RenderStyle& oldStyle);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> friend void WTF::deleteOwnedPtr<MaskImageInfo>(MaskImageInfo*);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleFillLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/FillLayer.cpp (177154 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/FillLayer.cpp 2014-12-11 17:51:25 UTC (rev 177154)
+++ trunk/Source/WebCore/rendering/style/FillLayer.cpp 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -378,7 +378,7 @@
</span><span class="cx"> bool FillLayer::hasImage() const
</span><span class="cx"> {
</span><span class="cx"> for (auto* layer = this; layer; layer = layer->m_next.get()) {
</span><del>- if (layer->m_image)
</del><ins>+ if (layer->image())
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleFillLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/FillLayer.h (177154 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/FillLayer.h 2014-12-11 17:51:25 UTC (rev 177154)
+++ trunk/Source/WebCore/rendering/style/FillLayer.h 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -68,9 +68,8 @@
</span><span class="cx"> explicit FillLayer(EFillLayerType);
</span><span class="cx"> ~FillLayer();
</span><span class="cx">
</span><ins>+ StyleImage* image() const { return hasMaskImage() ? maskImage()->image() : m_image.get(); }
</ins><span class="cx"> const RefPtr<MaskImageOperation>& maskImage() const { return m_maskImageOperation; }
</span><del>- StyleImage* image() const { return m_image.get(); }
- StyleImage* imageOrMaskImage() const { return hasMaskImage() ? maskImage()->image() : image(); }
</del><span class="cx"> const Length& xPosition() const { return m_xPosition; }
</span><span class="cx"> const Length& yPosition() const { return m_yPosition; }
</span><span class="cx"> BackgroundEdgeOrigin backgroundXOrigin() const { return static_cast<BackgroundEdgeOrigin>(m_backgroundXOrigin); }
</span><span class="lines">@@ -182,6 +181,8 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<FillLayer> m_next;
</span><span class="cx">
</span><ins>+ // FIXME: A FillLayer will always have at least one of these pointers null.
+ // Maybe we could group them together somehow and decrease the size of FillLayer.
</ins><span class="cx"> RefPtr<MaskImageOperation> m_maskImageOperation;
</span><span class="cx"> RefPtr<StyleImage> m_image;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (177154 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2014-12-11 17:51:25 UTC (rev 177154)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -830,7 +830,29 @@
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><ins>+
+void RenderStyle::setMaskImage(const Vector<RefPtr<MaskImageOperation>>& ops)
+{
+ FillLayer* curLayer = &rareNonInheritedData.access()->m_mask;
+ while (curLayer) {
+ curLayer->setMaskImage(nullptr);
+ curLayer = curLayer->next();
+ }
</ins><span class="cx">
</span><ins>+ curLayer = &rareNonInheritedData.access()->m_mask;
+ FillLayer* prevLayer = nullptr;
+ for (auto& maskImage : ops) {
+ if (!curLayer) {
+ prevLayer->setNext(std::make_unique<FillLayer>(MaskFillLayer));
+ curLayer = prevLayer->next();
+ }
+
+ curLayer->setMaskImage(maskImage);
+ prevLayer = curLayer;
+ curLayer = curLayer->next();
+ }
+}
+
</ins><span class="cx"> void RenderStyle::setClip(Length top, Length right, Length bottom, Length left)
</span><span class="cx"> {
</span><span class="cx"> StyleVisualData* data = visual.access();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (177154 => 177155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-12-11 17:51:25 UTC (rev 177154)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-12-11 17:54:38 UTC (rev 177155)
</span><span class="lines">@@ -108,6 +108,7 @@
</span><span class="cx"> class Font;
</span><span class="cx"> class FontMetrics;
</span><span class="cx"> class IntRect;
</span><ins>+class MaskImageOperation;
</ins><span class="cx"> class Pair;
</span><span class="cx"> class ShadowData;
</span><span class="cx"> class StyleImage;
</span><span class="lines">@@ -798,7 +799,6 @@
</span><span class="cx"> FillLayer* accessBackgroundLayers() { return &(m_background.access()->m_background); }
</span><span class="cx"> const FillLayer* backgroundLayers() const { return &(m_background->background()); }
</span><span class="cx">
</span><del>- StyleImage* maskImage() const { return rareNonInheritedData->m_mask.image(); }
</del><span class="cx"> EFillRepeat maskRepeatX() const { return static_cast<EFillRepeat>(rareNonInheritedData->m_mask.repeatX()); }
</span><span class="cx"> EFillRepeat maskRepeatY() const { return static_cast<EFillRepeat>(rareNonInheritedData->m_mask.repeatY()); }
</span><span class="cx"> CompositeOperator maskComposite() const { return static_cast<CompositeOperator>(rareNonInheritedData->m_mask.composite()); }
</span><span class="lines">@@ -1025,7 +1025,7 @@
</span><span class="cx"> void applyTransform(TransformationMatrix&, const FloatRect& boundingBox, ApplyTransformOrigin = IncludeTransformOrigin) const;
</span><span class="cx"> void setPageScaleTransform(float);
</span><span class="cx">
</span><del>- bool hasMask() const { return rareNonInheritedData->m_mask.hasImage() || rareNonInheritedData->m_maskBoxImage.hasImage(); }
</del><ins>+ bool hasMask() const { return rareNonInheritedData->m_mask.hasNonEmptyMaskImage() || rareNonInheritedData->m_mask.hasImage() || rareNonInheritedData->m_maskBoxImage.hasImage(); }
</ins><span class="cx">
</span><span class="cx"> TextCombine textCombine() const { return static_cast<TextCombine>(rareNonInheritedData->m_textCombine); }
</span><span class="cx"> bool hasTextCombine() const { return textCombine() != TextCombineNone; }
</span><span class="lines">@@ -1126,6 +1126,9 @@
</span><span class="cx"> FilterOperations& mutableFilter() { return rareNonInheritedData.access()->m_filter.access()->m_operations; }
</span><span class="cx"> const FilterOperations& filter() const { return rareNonInheritedData->m_filter->m_operations; }
</span><span class="cx"> bool hasFilter() const { return !rareNonInheritedData->m_filter->m_operations.operations().isEmpty(); }
</span><ins>+
+ RefPtr<MaskImageOperation>& mutableMaskImage() { return rareNonInheritedData.access()->m_mask.m_maskImageOperation; }
+ const RefPtr<MaskImageOperation> maskImage() const { return rareNonInheritedData->m_mask.maskImage(); }
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(FILTERS_LEVEL_2)
</span><span class="cx"> FilterOperations& mutableBackdropFilter() { return rareNonInheritedData.access()->m_backdropFilter.access()->m_operations; }
</span><span class="lines">@@ -1377,8 +1380,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void setMaskImage(PassRefPtr<StyleImage> v) { rareNonInheritedData.access()->m_mask.setImage(v); }
-
</del><span class="cx"> void setMaskBoxImage(const NinePieceImage& b) { SET_VAR(rareNonInheritedData, m_maskBoxImage, b); }
</span><span class="cx"> void setMaskBoxImageSource(PassRefPtr<StyleImage> v) { rareNonInheritedData.access()->m_maskBoxImage.setImage(v); }
</span><span class="cx"> void setMaskXPosition(Length length) { SET_VAR(rareNonInheritedData, m_mask.m_xPosition, WTF::move(length)); }
</span><span class="lines">@@ -1569,6 +1570,9 @@
</span><span class="cx"> void setBackdropFilter(const FilterOperations& ops) { SET_VAR(rareNonInheritedData.access()->m_backdropFilter, m_operations, ops); }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ void setMaskImage(const Vector<RefPtr<MaskImageOperation>>&);
+ void setMaskImage(const RefPtr<MaskImageOperation> maskImage) { Vector<RefPtr<MaskImageOperation>> vectMask; vectMask.append(maskImage); setMaskImage(vectMask); }
+
</ins><span class="cx"> void setTabSize(unsigned size) { SET_VAR(rareInheritedData, m_tabSize, size); }
</span><span class="cx">
</span><span class="cx"> // End CSS3 Setters
</span></span></pre>
</div>
</div>
</body>
</html>