<!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>[180685] 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/180685">180685</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-02-26 10:37:14 -0800 (Thu, 26 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cleanup RenderSVGResourceClipper class.
https://bugs.webkit.org/show_bug.cgi?id=142032.
Patch by Said Abou-Hallawa <sabouhallawa@apple.com> on 2015-02-26
Reviewed by Darin Adler.
Source/WebCore:
This is a follow up for <a href="http://trac.webkit.org/projects/webkit/changeset/180643">r180643</a>: <http://trac.webkit.org/changeset/180643>.
It includes cleanup for RenderSVGResourceClipper class.
* rendering/svg/RenderSVGResourceClipper.cpp:
(WebCore::RenderSVGResourceClipper::applyClippingToContext):
(WebCore::RenderSVGResourceClipper::drawContentIntoMaskImage):
* rendering/svg/RenderSVGResourceClipper.h: Change ClipperData to be a
typedef instead of a class and rename it to ClipperMaskImage. The purpose
of having it a class even though it includes only one member was because
we wanted it to be WTF_MAKE_FAST_ALLOCATED. We do not need to allocate it
as a separate object on the heap anymore.
(WebCore::RenderSVGResourceClipper::addRendererToClipper): Instead of doing
double hash table lookups by calling HashMap::contains() and then HashMap::get(),
we can use HashMap::add() instead.
LayoutTests:
* svg/clip-path/clip-path-line-use-before-defined-expected.svg:
* svg/clip-path/clip-path-line-use-before-defined.svg: Simplify the test
and make separate drawings for different cases.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestssvgclippathclippathlineusebeforedefinedexpectedsvg">trunk/LayoutTests/svg/clip-path/clip-path-line-use-before-defined-expected.svg</a></li>
<li><a href="#trunkLayoutTestssvgclippathclippathlineusebeforedefinedsvg">trunk/LayoutTests/svg/clip-path/clip-path-line-use-before-defined.svg</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceClippercpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceClipperh">trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (180684 => 180685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-02-26 18:36:43 UTC (rev 180684)
+++ trunk/LayoutTests/ChangeLog 2015-02-26 18:37:14 UTC (rev 180685)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2015-02-26 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><ins>+ Cleanup RenderSVGResourceClipper class.
+ https://bugs.webkit.org/show_bug.cgi?id=142032.
+
+ Reviewed by Darin Adler.
+
+ * svg/clip-path/clip-path-line-use-before-defined-expected.svg:
+ * svg/clip-path/clip-path-line-use-before-defined.svg: Simplify the test
+ and make separate drawings for different cases.
+
+2015-02-26 Said Abou-Hallawa <sabouhallawa@apple.com>
+
</ins><span class="cx"> Setting any of the <object> element plugin controlling attributes does not have any affect.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=141936.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestssvgclippathclippathlineusebeforedefinedexpectedsvg"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/clip-path/clip-path-line-use-before-defined-expected.svg (180684 => 180685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/clip-path/clip-path-line-use-before-defined-expected.svg 2015-02-26 18:36:43 UTC (rev 180684)
+++ trunk/LayoutTests/svg/clip-path/clip-path-line-use-before-defined-expected.svg 2015-02-26 18:37:14 UTC (rev 180685)
</span><span class="lines">@@ -1,33 +1,44 @@
</span><del>-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200">
</del><ins>+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
</ins><span class="cx"> <defs>
</span><span class="cx"> <style>
</span><span class="cx"> line, path {
</span><span class="cx"> stroke: black;
</span><ins>+ stroke-width: 3;
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <clipPath id="clip-circle">
</span><del>- <circle cx="50%" cy="50%" r="25%"/>
</del><ins>+ <circle cx="75" cy="75" r="50"/>
</ins><span class="cx"> </clipPath>
</span><ins>+ <g id="circle-in-rect">
+ <rect x="0" y="0" width="150" height="150" fill="lime"/>
+ <rect x="0" y="0" width="150" height="150" fill="white" clip-path="url(#clip-circle)"/>
+ </g>
</ins><span class="cx"> </defs>
</span><del>-
- <rect x="0" y="0" width="100%" height="100%" fill="lime"/>
- <rect x="0" y="0" width="100%" height="100%" fill="white" clip-path="url(#clip-circle)"/>
</del><span class="cx">
</span><del>- <!-- diagonal -->
- <line x1="170" y1="30" x2="30" y2="170" clip-path="url(#clip-circle)"/>
</del><ins>+ <use xlink:href="#circle-in-rect" transform="translate(10, 10)">
+ <g clip-path="url(#clip-circle)">
+ <!-- center lines -->
+ <path d="M0 75 L150 75"/>
+ <line x1="75" y1="0" x2="75" y2="150"/>
+ </g>
+ </use>
</ins><span class="cx">
</span><del>- <!-- top and left lines -->
- <path d="M30 75 L170 75" clip-path="url(#clip-circle)"/>
- <line x1="75" y1="30" x2="75" y2="170" clip-path="url(#clip-circle)"/>
</del><ins>+ <use xlink:href="#circle-in-rect" transform="translate(170, 10)">
+ <g clip-path="url(#clip-circle)">
+ <!-- diagonal lines -->
+ <path d="M0 0 L150 150"/>
+ <line x1="0" y1="150" x2="150" y2="0"/>
+ </g>
+ </use>
</ins><span class="cx">
</span><del>- <!-- right and bottom lines -->
- <g clip-path="url(#clip-circle)">
- <path d="M30 125 L170 125"/>
- <line x1="125" y1="30" x2="125" y2="170"/>
- </g>
-
- <!-- center lines -->
- <path d="M30 100 L170 100" clip-path="url(#clip-circle)"/>
- <line x1="100" y1="30" x2="100" y2="170" clip-path="url(#clip-circle)"/>
-
</del><ins>+ <use xlink:href="#circle-in-rect" transform="translate(330, 10)">
+ <g clip-path="url(#clip-circle)">
+ <!-- top and left lines -->
+ <path d="M0 50 L150 50"/>
+ <line x1="50" y1="0" x2="50" y2="150"/>
+ <!-- bottom and right lines -->
+ <path d="M0 100 L150 100"/>
+ <line x1="100" y1="0" x2="100" y2="150"/>
+ </g>
+ </use>
</ins><span class="cx"> </svg>
</span></span></pre></div>
<a id="trunkLayoutTestssvgclippathclippathlineusebeforedefinedsvg"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/clip-path/clip-path-line-use-before-defined.svg (180684 => 180685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/clip-path/clip-path-line-use-before-defined.svg 2015-02-26 18:36:43 UTC (rev 180684)
+++ trunk/LayoutTests/svg/clip-path/clip-path-line-use-before-defined.svg 2015-02-26 18:37:14 UTC (rev 180685)
</span><span class="lines">@@ -1,38 +1,46 @@
</span><del>-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200">
</del><ins>+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
</ins><span class="cx"> <defs>
</span><span class="cx"> <style>
</span><span class="cx"> line, path {
</span><span class="cx"> stroke: black;
</span><ins>+ stroke-width: 3;
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><ins>+ <g id="circle-in-rect">
+ <rect x="0" y="0" width="150" height="150" fill="lime"/>
+ <rect x="0" y="0" width="150" height="150" fill="white" clip-path="url(#clip-circle)"/>
+ </g>
</ins><span class="cx"> </defs>
</span><del>-
- <rect x="0" y="0" width="100%" height="100%" fill="lime"/>
- <rect x="0" y="0" width="100%" height="100%" fill="white" clip-path="url(#clip-circle)"/>
</del><span class="cx">
</span><del>- <!-- diagonal -->
- <line x1="170" y1="30" x2="30" y2="170" clip-path="url(#clip-circle)"/>
</del><ins>+ <use xlink:href="#circle-in-rect" transform="translate(10, 10)">
+ <!-- center lines -->
+ <path d="M0 75 L150 75" clip-path="url(#clip-circle)"/>
+ <line x1="75" y1="0" x2="75" y2="150" clip-path="url(#clip-circle)"/>
+ </use>
</ins><span class="cx">
</span><del>- <!-- top and left lines -->
- <path d="M30 75 L170 75" clip-path="url(#clip-circle)"/>
- <line x1="75" y1="30" x2="75" y2="170" clip-path="url(#clip-circle)"/>
</del><ins>+ <use xlink:href="#circle-in-rect" transform="translate(170, 10)">
+ <!-- diagonal lines -->
+ <path d="M0 0 L150 150" clip-path="url(#clip-circle)"/>
+ <line x1="0" y1="150" x2="150" y2="0" clip-path="url(#clip-circle)"/>
+ </use>
</ins><span class="cx">
</span><del>- <!-- bottom and right lines -->
- <g clip-path="url(#clip-circle)">
- <path d="M30 125 L170 125"/>
- <line x1="125" y1="30" x2="125" y2="170"/>
- </g>
</del><ins>+ <use xlink:href="#circle-in-rect" transform="translate(330, 10)">
+ <!-- top and left lines -->
+ <path d="M0 50 L150 50" clip-path="url(#clip-circle)"/>
+ <line x1="50" y1="0" x2="50" y2="150" clip-path="url(#clip-circle)"/>
+ <g clip-path="url(#clip-circle)">
+ <!-- bottom and right lines -->
+ <path d="M0 100 L150 100"/>
+ <line x1="100" y1="0" x2="100" y2="150"/>
+ </g>
+ </use>
</ins><span class="cx">
</span><span class="cx"> <defs>
</span><span class="cx"> <clipPath id="clip-circle">
</span><del>- <circle cx="50%" cy="50%" r="50%" clip-path="url(#clip-small-circle)"/>
</del><ins>+ <circle cx="75" cy="75" r="75" clip-path="url(#clip-small-circle)"/>
</ins><span class="cx"> </clipPath>
</span><span class="cx"> <clipPath id="clip-small-circle">
</span><del>- <circle cx="50%" cy="50%" r="25%"/>
</del><ins>+ <circle cx="75" cy="75" r="50"/>
</ins><span class="cx"> </clipPath>
</span><span class="cx"> </defs>
</span><del>-
- <!-- center lines -->
- <path d="M30 100 L170 100" clip-path="url(#clip-circle)"/>
- <line x1="100" y1="30" x2="100" y2="170" clip-path="url(#clip-circle)"/>
</del><span class="cx"> </svg>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180684 => 180685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-26 18:36:43 UTC (rev 180684)
+++ trunk/Source/WebCore/ChangeLog 2015-02-26 18:37:14 UTC (rev 180685)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2015-02-26 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><ins>+ Cleanup RenderSVGResourceClipper class.
+ https://bugs.webkit.org/show_bug.cgi?id=142032.
+
+ Reviewed by Darin Adler.
+
+ This is a follow up for r180643: <http://trac.webkit.org/changeset/180643>.
+ It includes cleanup for RenderSVGResourceClipper class.
+
+ * rendering/svg/RenderSVGResourceClipper.cpp:
+ (WebCore::RenderSVGResourceClipper::applyClippingToContext):
+ (WebCore::RenderSVGResourceClipper::drawContentIntoMaskImage):
+ * rendering/svg/RenderSVGResourceClipper.h: Change ClipperData to be a
+ typedef instead of a class and rename it to ClipperMaskImage. The purpose
+ of having it a class even though it includes only one member was because
+ we wanted it to be WTF_MAKE_FAST_ALLOCATED. We do not need to allocate it
+ as a separate object on the heap anymore.
+
+ (WebCore::RenderSVGResourceClipper::addRendererToClipper): Instead of doing
+ double hash table lookups by calling HashMap::contains() and then HashMap::get(),
+ we can use HashMap::add() instead.
+
+2015-02-26 Said Abou-Hallawa <sabouhallawa@apple.com>
+
</ins><span class="cx"> Setting any of the <object> element plugin controlling attributes does not have any affect.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=141936.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceClippercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp (180684 => 180685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp 2015-02-26 18:36:43 UTC (rev 180684)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp 2015-02-26 18:37:14 UTC (rev 180685)
</span><span class="lines">@@ -130,23 +130,22 @@
</span><span class="cx"> bool RenderSVGResourceClipper::applyClippingToContext(RenderElement& renderer, const FloatRect& objectBoundingBox,
</span><span class="cx"> const FloatRect& repaintRect, GraphicsContext* context)
</span><span class="cx"> {
</span><del>- ClipperData* clipperData = addRendererToClipper(renderer);
- ASSERT(clipperData);
- bool shouldCreateClipData = !clipperData->clipMaskImage;
</del><ins>+ ClipperMaskImage& clipperMaskImage = addRendererToClipper(renderer);
+ bool shouldCreateClipperMaskImage = !clipperMaskImage;
</ins><span class="cx">
</span><span class="cx"> AffineTransform animatedLocalTransform = clipPathElement().animatedLocalTransform();
</span><span class="cx">
</span><del>- if (shouldCreateClipData && pathOnlyClipping(context, animatedLocalTransform, objectBoundingBox))
</del><ins>+ if (shouldCreateClipperMaskImage && pathOnlyClipping(context, animatedLocalTransform, objectBoundingBox))
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> AffineTransform absoluteTransform;
</span><span class="cx"> SVGRenderingContext::calculateTransformationToOutermostCoordinateSystem(renderer, absoluteTransform);
</span><span class="cx">
</span><del>- if (shouldCreateClipData && !repaintRect.isEmpty()) {
- if (!SVGRenderingContext::createImageBuffer(repaintRect, absoluteTransform, clipperData->clipMaskImage, ColorSpaceDeviceRGB, Unaccelerated))
</del><ins>+ if (shouldCreateClipperMaskImage && !repaintRect.isEmpty()) {
+ if (!SVGRenderingContext::createImageBuffer(repaintRect, absoluteTransform, clipperMaskImage, ColorSpaceDeviceRGB, Unaccelerated))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- GraphicsContext* maskContext = clipperData->clipMaskImage->context();
</del><ins>+ GraphicsContext* maskContext = clipperMaskImage->context();
</ins><span class="cx"> ASSERT(maskContext);
</span><span class="cx">
</span><span class="cx"> maskContext->concatCTM(animatedLocalTransform);
</span><span class="lines">@@ -161,28 +160,27 @@
</span><span class="cx"> if (!clipper->applyClippingToContext(*this, objectBoundingBox, repaintRect, maskContext))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- succeeded = drawContentIntoMaskImage(clipperData, objectBoundingBox);
</del><ins>+ succeeded = drawContentIntoMaskImage(clipperMaskImage, objectBoundingBox);
</ins><span class="cx"> // The context restore applies the clipping on non-CG platforms.
</span><span class="cx"> } else
</span><del>- succeeded = drawContentIntoMaskImage(clipperData, objectBoundingBox);
</del><ins>+ succeeded = drawContentIntoMaskImage(clipperMaskImage, objectBoundingBox);
</ins><span class="cx">
</span><span class="cx"> if (!succeeded)
</span><del>- clipperData->clipMaskImage.reset();
</del><ins>+ clipperMaskImage.reset();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (!clipperData->clipMaskImage)
</del><ins>+ if (!clipperMaskImage)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- SVGRenderingContext::clipToImageBuffer(context, absoluteTransform, repaintRect, clipperData->clipMaskImage, shouldCreateClipData);
</del><ins>+ SVGRenderingContext::clipToImageBuffer(context, absoluteTransform, repaintRect, clipperMaskImage, shouldCreateClipperMaskImage);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderSVGResourceClipper::drawContentIntoMaskImage(ClipperData* clipperData, const FloatRect& objectBoundingBox)
</del><ins>+bool RenderSVGResourceClipper::drawContentIntoMaskImage(const ClipperMaskImage& clipperMaskImage, const FloatRect& objectBoundingBox)
</ins><span class="cx"> {
</span><del>- ASSERT(clipperData);
- ASSERT(clipperData->clipMaskImage);
</del><ins>+ ASSERT(clipperMaskImage);
</ins><span class="cx">
</span><del>- GraphicsContext* maskContext = clipperData->clipMaskImage->context();
</del><ins>+ GraphicsContext* maskContext = clipperMaskImage->context();
</ins><span class="cx"> ASSERT(maskContext);
</span><span class="cx">
</span><span class="cx"> AffineTransform maskContentTransformation;
</span><span class="lines">@@ -233,7 +231,7 @@
</span><span class="cx"> // In the case of a <use> element, we obtained its renderere above, to retrieve its clipRule.
</span><span class="cx"> // We have to pass the <use> renderer itself to renderSubtreeToImageBuffer() to apply it's x/y/transform/etc. values when rendering.
</span><span class="cx"> // So if isUseElement is true, refetch the childNode->renderer(), as renderer got overriden above.
</span><del>- SVGRenderingContext::renderSubtreeToImageBuffer(clipperData->clipMaskImage.get(), isUseElement ? *child.renderer() : *renderer, maskContentTransformation);
</del><ins>+ SVGRenderingContext::renderSubtreeToImageBuffer(clipperMaskImage.get(), isUseElement ? *child.renderer() : *renderer, maskContentTransformation);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> view().frameView().setPaintBehavior(oldBehavior);
</span><span class="lines">@@ -257,11 +255,9 @@
</span><span class="cx"> m_clipBoundaries = clipPathElement().animatedLocalTransform().mapRect(m_clipBoundaries);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ClipperData* RenderSVGResourceClipper::addRendererToClipper(const RenderObject& object)
</del><ins>+ClipperMaskImage& RenderSVGResourceClipper::addRendererToClipper(const RenderObject& object)
</ins><span class="cx"> {
</span><del>- if (!m_clipper.contains(&object))
- m_clipper.set(&object, std::make_unique<ClipperData>());
- return m_clipper.get(&object);
</del><ins>+ return m_clipper.add(&object, ClipperMaskImage()).iterator->value;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderSVGResourceClipper::hitTestClipContent(const FloatRect& objectBoundingBox, const FloatPoint& nodeAtPoint)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceClipperh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h (180684 => 180685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h 2015-02-26 18:36:43 UTC (rev 180684)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h 2015-02-26 18:37:14 UTC (rev 180685)
</span><span class="lines">@@ -31,11 +31,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-struct ClipperData {
- WTF_MAKE_FAST_ALLOCATED;
-public:
- std::unique_ptr<ImageBuffer> clipMaskImage;
-};
</del><ins>+typedef std::unique_ptr<ImageBuffer> ClipperMaskImage;
</ins><span class="cx">
</span><span class="cx"> class RenderSVGResourceClipper final : public RenderSVGResourceContainer {
</span><span class="cx"> public:
</span><span class="lines">@@ -69,12 +65,12 @@
</span><span class="cx"> virtual const char* renderName() const override { return "RenderSVGResourceClipper"; }
</span><span class="cx">
</span><span class="cx"> bool pathOnlyClipping(GraphicsContext*, const AffineTransform&, const FloatRect&);
</span><del>- bool drawContentIntoMaskImage(ClipperData*, const FloatRect& objectBoundingBox);
</del><ins>+ bool drawContentIntoMaskImage(const ClipperMaskImage&, const FloatRect& objectBoundingBox);
</ins><span class="cx"> void calculateClipContentRepaintRect();
</span><del>- ClipperData* addRendererToClipper(const RenderObject&);
</del><ins>+ ClipperMaskImage& addRendererToClipper(const RenderObject&);
</ins><span class="cx">
</span><span class="cx"> FloatRect m_clipBoundaries;
</span><del>- HashMap<const RenderObject*, std::unique_ptr<ClipperData>> m_clipper;
</del><ins>+ HashMap<const RenderObject*, ClipperMaskImage> m_clipper;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>