<!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>[168237] trunk/Source/WebCore</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/168237">168237</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-05-03 20:43:19 -0700 (Sat, 03 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>RenderSVGResourcePattern should deal in RenderElement&.
<https://webkit.org/b/132536>
Tweak buildPattern() and buildTileImageTransform() to take RenderElement&
instead of RenderObject* since we know that these functions will always
be called with non-null RenderElement subclasses.
Reviewed by Sam Weinig.
* rendering/svg/RenderSVGResourceContainer.cpp:
(WebCore::RenderSVGResourceContainer::shouldTransformOnTextPainting):
* rendering/svg/RenderSVGResourceContainer.h:
* rendering/svg/RenderSVGResourceGradient.cpp:
(WebCore::RenderSVGResourceGradient::applyResource):
* rendering/svg/RenderSVGResourcePattern.cpp:
(WebCore::RenderSVGResourcePattern::buildPattern):
(WebCore::RenderSVGResourcePattern::applyResource):
(WebCore::RenderSVGResourcePattern::buildTileImageTransform):
* rendering/svg/RenderSVGResourcePattern.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceContainercpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceContainerh">trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceGradientcpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourcePatterncpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourcePatternh">trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168236 => 168237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-04 03:25:56 UTC (rev 168236)
+++ trunk/Source/WebCore/ChangeLog 2014-05-04 03:43:19 UTC (rev 168237)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-05-03 Andreas Kling <akling@apple.com>
+
+ RenderSVGResourcePattern should deal in RenderElement&.
+ <https://webkit.org/b/132536>
+
+ Tweak buildPattern() and buildTileImageTransform() to take RenderElement&
+ instead of RenderObject* since we know that these functions will always
+ be called with non-null RenderElement subclasses.
+
+ Reviewed by Sam Weinig.
+
+ * rendering/svg/RenderSVGResourceContainer.cpp:
+ (WebCore::RenderSVGResourceContainer::shouldTransformOnTextPainting):
+ * rendering/svg/RenderSVGResourceContainer.h:
+ * rendering/svg/RenderSVGResourceGradient.cpp:
+ (WebCore::RenderSVGResourceGradient::applyResource):
+ * rendering/svg/RenderSVGResourcePattern.cpp:
+ (WebCore::RenderSVGResourcePattern::buildPattern):
+ (WebCore::RenderSVGResourcePattern::applyResource):
+ (WebCore::RenderSVGResourcePattern::buildTileImageTransform):
+ * rendering/svg/RenderSVGResourcePattern.h:
+
</ins><span class="cx"> 2014-05-03 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> CSS JIT: optimize direct / indirect adjacent's traversal backtracking
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceContainercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp (168236 => 168237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp 2014-05-04 03:25:56 UTC (rev 168236)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp 2014-05-04 03:43:19 UTC (rev 168237)
</span><span class="lines">@@ -187,20 +187,20 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderSVGResourceContainer::shouldTransformOnTextPainting(RenderObject* object, AffineTransform& resourceTransform)
</del><ins>+bool RenderSVGResourceContainer::shouldTransformOnTextPainting(const RenderElement& renderer, AffineTransform& resourceTransform)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(object, object);
</del><span class="cx"> #if USE(CG)
</span><ins>+ UNUSED_PARAM(renderer);
</ins><span class="cx"> UNUSED_PARAM(resourceTransform);
</span><span class="cx"> return false;
</span><span class="cx"> #else
</span><span class="cx"> // This method should only be called for RenderObjects that deal with text rendering. Cmp. RenderObject.h's is*() methods.
</span><del>- ASSERT(object->isSVGText() || object->isSVGTextPath() || object->isSVGInline());
</del><ins>+ ASSERT(renderer.isSVGText() || renderer.isSVGTextPath() || renderer.isSVGInline());
</ins><span class="cx">
</span><span class="cx"> // In text drawing, the scaling part of the graphics context CTM is removed, compare SVGInlineTextBox::paintTextWithShadows.
</span><span class="cx"> // So, we use that scaling factor here, too, and then push it down to pattern or gradient space
</span><span class="cx"> // in order to keep the pattern or gradient correctly scaled.
</span><del>- float scalingFactor = SVGRenderingContext::calculateScreenFontSizeScalingFactor(*object);
</del><ins>+ float scalingFactor = SVGRenderingContext::calculateScreenFontSizeScalingFactor(renderer);
</ins><span class="cx"> if (scalingFactor == 1)
</span><span class="cx"> return false;
</span><span class="cx"> resourceTransform.scale(scalingFactor);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceContainerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.h (168236 => 168237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.h 2014-05-04 03:25:56 UTC (rev 168236)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.h 2014-05-04 03:43:19 UTC (rev 168237)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> virtual bool isSVGResourceContainer() const override final { return true; }
</span><span class="cx">
</span><del>- static bool shouldTransformOnTextPainting(RenderObject*, AffineTransform&);
</del><ins>+ static bool shouldTransformOnTextPainting(const RenderElement&, AffineTransform&);
</ins><span class="cx"> static AffineTransform transformOnNonScalingStroke(RenderObject*, const AffineTransform& resourceTransform);
</span><span class="cx">
</span><span class="cx"> void idChanged();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceGradientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp (168236 => 168237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp 2014-05-04 03:25:56 UTC (rev 168236)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp 2014-05-04 03:43:19 UTC (rev 168237)
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> // Depending on font scaling factor, we may need to rescale the gradient here since
</span><span class="cx"> // text painting removes the scale factor from the context.
</span><span class="cx"> AffineTransform additionalTextTransform;
</span><del>- if (shouldTransformOnTextPainting(&renderer, additionalTextTransform))
</del><ins>+ if (shouldTransformOnTextPainting(renderer, additionalTextTransform))
</ins><span class="cx"> gradientData->userspaceTransform *= additionalTextTransform;
</span><span class="cx"> }
</span><span class="cx"> gradientData->gradient->setGradientSpaceTransform(gradientData->userspaceTransform);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourcePatterncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp (168236 => 168237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp 2014-05-04 03:25:56 UTC (rev 168236)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp 2014-05-04 03:43:19 UTC (rev 168237)
</span><span class="lines">@@ -56,9 +56,9 @@
</span><span class="cx"> markClientForInvalidation(client, markForInvalidation ? RepaintInvalidation : ParentOnlyInvalidation);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PatternData* RenderSVGResourcePattern::buildPattern(RenderObject* object, unsigned short resourceMode)
</del><ins>+PatternData* RenderSVGResourcePattern::buildPattern(RenderElement& renderer, unsigned short resourceMode)
</ins><span class="cx"> {
</span><del>- PatternData* currentData = m_patternMap.get(object);
</del><ins>+ PatternData* currentData = m_patternMap.get(&renderer);
</ins><span class="cx"> if (currentData && currentData->pattern)
</span><span class="cx"> return currentData;
</span><span class="cx">
</span><span class="lines">@@ -81,11 +81,11 @@
</span><span class="cx"> // Compute all necessary transformations to build the tile image & the pattern.
</span><span class="cx"> FloatRect tileBoundaries;
</span><span class="cx"> AffineTransform tileImageTransform;
</span><del>- if (!buildTileImageTransform(object, m_attributes, patternElement(), tileBoundaries, tileImageTransform))
</del><ins>+ if (!buildTileImageTransform(renderer, m_attributes, patternElement(), tileBoundaries, tileImageTransform))
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> AffineTransform absoluteTransformIgnoringRotation;
</span><del>- SVGRenderingContext::calculateTransformationToOutermostCoordinateSystem(*object, absoluteTransformIgnoringRotation);
</del><ins>+ SVGRenderingContext::calculateTransformationToOutermostCoordinateSystem(renderer, absoluteTransformIgnoringRotation);
</ins><span class="cx">
</span><span class="cx"> // Ignore 2D rotation, as it doesn't affect the size of the tile.
</span><span class="cx"> SVGRenderingContext::clear2DRotation(absoluteTransformIgnoringRotation);
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> // Account for text drawing resetting the context to non-scaled, see SVGInlineTextBox::paintTextWithShadows.
</span><span class="cx"> if (resourceMode & ApplyToTextMode) {
</span><span class="cx"> AffineTransform additionalTextTransformation;
</span><del>- if (shouldTransformOnTextPainting(object, additionalTextTransformation))
</del><ins>+ if (shouldTransformOnTextPainting(renderer, additionalTextTransformation))
</ins><span class="cx"> patternData->transform *= additionalTextTransformation;
</span><span class="cx"> }
</span><span class="cx"> patternData->pattern->setPatternSpaceTransform(patternData->transform);
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> // Various calls above may trigger invalidations in some fringe cases (ImageBuffer allocation
</span><span class="cx"> // failures in the SVG image cache for example). To avoid having our PatternData deleted by
</span><span class="cx"> // removeAllClientsFromCache(), we only make it visible in the cache at the very end.
</span><del>- return m_patternMap.set(object, std::move(patternData)).iterator->value.get();
</del><ins>+ return m_patternMap.set(&renderer, std::move(patternData)).iterator->value.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderSVGResourcePattern::applyResource(RenderElement& renderer, const RenderStyle& style, GraphicsContext*& context, unsigned short resourceMode)
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx"> if (m_attributes.patternUnits() == SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX && objectBoundingBox.isEmpty())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- PatternData* patternData = buildPattern(&renderer, resourceMode);
</del><ins>+ PatternData* patternData = buildPattern(renderer, resourceMode);
</ins><span class="cx"> if (!patternData)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -211,15 +211,13 @@
</span><span class="cx"> return SVGLengthContext::resolveRectangle(&patternElement, attributes.patternUnits(), objectBoundingBox, attributes.x(), attributes.y(), attributes.width(), attributes.height());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderSVGResourcePattern::buildTileImageTransform(RenderObject* renderer,
</del><ins>+bool RenderSVGResourcePattern::buildTileImageTransform(RenderElement& renderer,
</ins><span class="cx"> const PatternAttributes& attributes,
</span><span class="cx"> const SVGPatternElement& patternElement,
</span><span class="cx"> FloatRect& patternBoundaries,
</span><span class="cx"> AffineTransform& tileImageTransform) const
</span><span class="cx"> {
</span><del>- ASSERT(renderer);
-
- FloatRect objectBoundingBox = renderer->objectBoundingBox();
</del><ins>+ FloatRect objectBoundingBox = renderer.objectBoundingBox();
</ins><span class="cx"> patternBoundaries = calculatePatternBoundaries(attributes, objectBoundingBox, patternElement);
</span><span class="cx"> if (patternBoundaries.width() <= 0 || patternBoundaries.height() <= 0)
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourcePatternh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.h (168236 => 168237)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.h 2014-05-04 03:25:56 UTC (rev 168236)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.h 2014-05-04 03:43:19 UTC (rev 168237)
</span><span class="lines">@@ -58,15 +58,15 @@
</span><span class="cx"> void element() const = delete;
</span><span class="cx"> virtual const char* renderName() const override { return "RenderSVGResourcePattern"; }
</span><span class="cx">
</span><del>- bool buildTileImageTransform(RenderObject*, const PatternAttributes&, const SVGPatternElement&, FloatRect& patternBoundaries, AffineTransform& tileImageTransform) const;
</del><ins>+ bool buildTileImageTransform(RenderElement&, const PatternAttributes&, const SVGPatternElement&, FloatRect& patternBoundaries, AffineTransform& tileImageTransform) const;
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<ImageBuffer> createTileImage(const PatternAttributes&, const FloatRect& tileBoundaries, const FloatRect& absoluteTileBoundaries, const AffineTransform& tileImageTransform, FloatRect& clampedAbsoluteTileBoundaries) const;
</span><span class="cx">
</span><del>- PatternData* buildPattern(RenderObject*, unsigned short resourceMode);
</del><ins>+ PatternData* buildPattern(RenderElement&, unsigned short resourceMode);
</ins><span class="cx">
</span><span class="cx"> bool m_shouldCollectPatternAttributes : 1;
</span><span class="cx"> PatternAttributes m_attributes;
</span><del>- HashMap<RenderObject*, std::unique_ptr<PatternData>> m_patternMap;
</del><ins>+ HashMap<RenderElement*, std::unique_ptr<PatternData>> m_patternMap;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>