<!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>[163283] 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/163283">163283</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-02-02 20:50:00 -0800 (Sun, 02 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modernize the toRenderSVGResourceContainer() helper.
<https://webkit.org/b/128091>
Make toRenderSVGResourceContainer() a free function like all the
other casting helpers. Use references instead of pointers where
applicable.
Reviewed by Anders Carlsson.
* rendering/RenderLayerFilterInfo.cpp:
(WebCore::RenderLayer::FilterInfo::updateReferenceFilterClients):
(WebCore::RenderLayer::FilterInfo::removeReferenceFilterClients):
* rendering/RenderObject.cpp:
* rendering/RenderObject.h:
* rendering/svg/RenderSVGGradientStop.cpp:
(WebCore::RenderSVGGradientStop::styleDidChange):
* rendering/svg/RenderSVGResource.cpp:
(WebCore::RenderSVGResource::markForLayoutAndParentResourceInvalidation):
* rendering/svg/RenderSVGResourceContainer.cpp:
(WebCore::RenderSVGResourceContainer::markAllClientsForInvalidation):
* rendering/svg/RenderSVGResourceContainer.h:
* rendering/svg/RenderSVGResourceFilter.cpp:
(WebCore::RenderSVGResourceFilter::buildPrimitives):
* rendering/svg/RenderSVGResourceFilter.h:
* rendering/svg/SVGRenderTreeAsText.cpp:
(WebCore::writeSVGResourceContainer):
* rendering/svg/SVGResourcesCycleSolver.cpp:
(WebCore::SVGResourcesCycleSolver::resolveCycles):
* svg/SVGElement.cpp:
(WebCore::SVGElement::svgAttributeChanged):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerFilterInfocpp">trunk/Source/WebCore/rendering/RenderLayerFilterInfo.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjecth">trunk/Source/WebCore/rendering/RenderObject.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGGradientStopcpp">trunk/Source/WebCore/rendering/svg/RenderSVGGradientStop.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourcecpp">trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp</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="#trunkSourceWebCorerenderingsvgRenderSVGResourceFiltercpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceFilterh">trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGRenderTreeAsTextcpp">trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGResourcesCycleSolvercpp">trunk/Source/WebCore/rendering/svg/SVGResourcesCycleSolver.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGElementcpp">trunk/Source/WebCore/svg/SVGElement.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163282 => 163283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-03 04:44:10 UTC (rev 163282)
+++ trunk/Source/WebCore/ChangeLog 2014-02-03 04:50:00 UTC (rev 163283)
</span><span class="lines">@@ -1,5 +1,38 @@
</span><span class="cx"> 2014-02-02 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><ins>+ Modernize the toRenderSVGResourceContainer() helper.
+ <https://webkit.org/b/128091>
+
+ Make toRenderSVGResourceContainer() a free function like all the
+ other casting helpers. Use references instead of pointers where
+ applicable.
+
+ Reviewed by Anders Carlsson.
+
+ * rendering/RenderLayerFilterInfo.cpp:
+ (WebCore::RenderLayer::FilterInfo::updateReferenceFilterClients):
+ (WebCore::RenderLayer::FilterInfo::removeReferenceFilterClients):
+ * rendering/RenderObject.cpp:
+ * rendering/RenderObject.h:
+ * rendering/svg/RenderSVGGradientStop.cpp:
+ (WebCore::RenderSVGGradientStop::styleDidChange):
+ * rendering/svg/RenderSVGResource.cpp:
+ (WebCore::RenderSVGResource::markForLayoutAndParentResourceInvalidation):
+ * rendering/svg/RenderSVGResourceContainer.cpp:
+ (WebCore::RenderSVGResourceContainer::markAllClientsForInvalidation):
+ * rendering/svg/RenderSVGResourceContainer.h:
+ * rendering/svg/RenderSVGResourceFilter.cpp:
+ (WebCore::RenderSVGResourceFilter::buildPrimitives):
+ * rendering/svg/RenderSVGResourceFilter.h:
+ * rendering/svg/SVGRenderTreeAsText.cpp:
+ (WebCore::writeSVGResourceContainer):
+ * rendering/svg/SVGResourcesCycleSolver.cpp:
+ (WebCore::SVGResourcesCycleSolver::resolveCycles):
+ * svg/SVGElement.cpp:
+ (WebCore::SVGElement::svgAttributeChanged):
+
+2014-02-02 Andreas Kling <akling@apple.com>
+
</ins><span class="cx"> Minor SVGRootInlineBox cleanup.
</span><span class="cx"> <https://webkit.org/b/128094>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerFilterInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerFilterInfo.cpp (163282 => 163283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerFilterInfo.cpp 2014-02-03 04:44:10 UTC (rev 163282)
+++ trunk/Source/WebCore/rendering/RenderLayerFilterInfo.cpp 2014-02-03 04:50:00 UTC (rev 163283)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> Element* filter = m_layer.renderer().element()->document().getElementById(referenceFilterOperation->fragment());
</span><span class="cx"> if (!filter || !filter->renderer() || !filter->renderer()->isSVGResourceFilter())
</span><span class="cx"> continue;
</span><del>- filter->renderer()->toRenderSVGResourceContainer()->addClientRenderLayer(&m_layer);
</del><ins>+ toRenderSVGResourceContainer(*filter->renderer()).addClientRenderLayer(&m_layer);
</ins><span class="cx"> m_internalSVGReferences.append(filter);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> Element* filter = m_internalSVGReferences[i].get();
</span><span class="cx"> if (!filter->renderer())
</span><span class="cx"> continue;
</span><del>- filter->renderer()->toRenderSVGResourceContainer()->removeClientRenderLayer(&m_layer);
</del><ins>+ toRenderSVGResourceContainer(*filter->renderer()).removeClientRenderLayer(&m_layer);
</ins><span class="cx"> }
</span><span class="cx"> m_internalSVGReferences.clear();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (163282 => 163283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2014-02-03 04:44:10 UTC (rev 163282)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2014-02-03 04:50:00 UTC (rev 163283)
</span><span class="lines">@@ -2414,12 +2414,6 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SVG)
</span><span class="cx">
</span><del>-RenderSVGResourceContainer* RenderObject::toRenderSVGResourceContainer()
-{
- ASSERT_NOT_REACHED();
- return 0;
-}
-
</del><span class="cx"> void RenderObject::setNeedsBoundariesUpdate()
</span><span class="cx"> {
</span><span class="cx"> if (auto renderer = parent())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.h (163282 => 163283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.h 2014-02-03 04:44:10 UTC (rev 163282)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2014-02-03 04:50:00 UTC (rev 163283)
</span><span class="lines">@@ -441,8 +441,6 @@
</span><span class="cx"> virtual bool isSVGResourceFilter() const { return false; }
</span><span class="cx"> virtual bool isSVGResourceFilterPrimitive() const { return false; }
</span><span class="cx">
</span><del>- virtual RenderSVGResourceContainer* toRenderSVGResourceContainer();
-
</del><span class="cx"> // FIXME: Those belong into a SVG specific base-class for all renderers (see above)
</span><span class="cx"> // Unfortunately we don't have such a class yet, because it's not possible for all renderers
</span><span class="cx"> // to inherit from RenderSVGObject -> RenderObject (some need RenderBlock inheritance for instance)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGGradientStopcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGGradientStop.cpp (163282 => 163283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGGradientStop.cpp 2014-02-03 04:44:10 UTC (rev 163282)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGGradientStop.cpp 2014-02-03 04:50:00 UTC (rev 163283)
</span><span class="lines">@@ -58,9 +58,7 @@
</span><span class="cx"> if (!renderer)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ASSERT(renderer->isSVGResourceContainer());
- RenderSVGResourceContainer* container = renderer->toRenderSVGResourceContainer();
- container->removeAllClientsFromCache();
</del><ins>+ toRenderSVGResourceContainer(*renderer).removeAllClientsFromCache();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderSVGGradientStop::layout()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp (163282 => 163283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp 2014-02-03 04:44:10 UTC (rev 163282)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp 2014-02-03 04:50:00 UTC (rev 163283)
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx">
</span><span class="cx"> if (current->isSVGResourceContainer()) {
</span><span class="cx"> // This will process the rest of the ancestors.
</span><del>- current->toRenderSVGResourceContainer()->removeAllClientsFromCache();
</del><ins>+ toRenderSVGResourceContainer(*current).removeAllClientsFromCache();
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceContainercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp (163282 => 163283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp 2014-02-03 04:44:10 UTC (rev 163282)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp 2014-02-03 04:50:00 UTC (rev 163283)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx">
</span><span class="cx"> for (auto client : m_clients) {
</span><span class="cx"> if (client->isSVGResourceContainer()) {
</span><del>- client->toRenderSVGResourceContainer()->removeAllClientsFromCache(markForInvalidation);
</del><ins>+ toRenderSVGResourceContainer(*client).removeAllClientsFromCache(markForInvalidation);
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceContainerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.h (163282 => 163283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.h 2014-02-03 04:44:10 UTC (rev 163282)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.h 2014-02-03 04:50:00 UTC (rev 163283)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx"> virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override final;
</span><span class="cx">
</span><span class="cx"> virtual bool isSVGResourceContainer() const override final { return true; }
</span><del>- virtual RenderSVGResourceContainer* toRenderSVGResourceContainer() override final { return this; }
</del><span class="cx">
</span><span class="cx"> static bool shouldTransformOnTextPainting(RenderObject*, AffineTransform&);
</span><span class="cx"> static AffineTransform transformOnNonScalingStroke(RenderObject*, const AffineTransform& resourceTransform);
</span><span class="lines">@@ -77,6 +76,8 @@
</span><span class="cx"> HashSet<RenderLayer*> m_clientLayers;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+RENDER_OBJECT_TYPE_CASTS(RenderSVGResourceContainer, isSVGResourceContainer())
+
</ins><span class="cx"> inline RenderSVGResourceContainer* getRenderSVGResourceContainerById(Document& document, const AtomicString& id)
</span><span class="cx"> {
</span><span class="cx"> if (id.isEmpty())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceFiltercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp (163282 => 163283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp 2014-02-03 04:44:10 UTC (rev 163282)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp 2014-02-03 04:50:00 UTC (rev 163283)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> markClientForInvalidation(client, markForInvalidation ? BoundariesInvalidation : ParentOnlyInvalidation);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::unique_ptr<SVGFilterBuilder> RenderSVGResourceFilter::buildPrimitives(SVGFilter* filter)
</del><ins>+std::unique_ptr<SVGFilterBuilder> RenderSVGResourceFilter::buildPrimitives(SVGFilter* filter) const
</ins><span class="cx"> {
</span><span class="cx"> FloatRect targetBoundingBox = filter->targetBoundingBox();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceFilterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.h (163282 => 163283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.h 2014-02-03 04:44:10 UTC (rev 163282)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.h 2014-02-03 04:50:00 UTC (rev 163283)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">
</span><span class="cx"> virtual FloatRect resourceBoundingBox(const RenderObject&) override;
</span><span class="cx">
</span><del>- std::unique_ptr<SVGFilterBuilder> buildPrimitives(SVGFilter*);
</del><ins>+ std::unique_ptr<SVGFilterBuilder> buildPrimitives(SVGFilter*) const;
</ins><span class="cx">
</span><span class="cx"> SVGUnitTypes::SVGUnitType filterUnits() const { return filterElement().filterUnits(); }
</span><span class="cx"> SVGUnitTypes::SVGUnitType primitiveUnits() const { return filterElement().primitiveUnits(); }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGRenderTreeAsTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp (163282 => 163283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp 2014-02-03 04:44:10 UTC (rev 163282)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp 2014-02-03 04:50:00 UTC (rev 163283)
</span><span class="lines">@@ -476,48 +476,47 @@
</span><span class="cx"> const AtomicString& id = element->getIdAttribute();
</span><span class="cx"> writeNameAndQuotedValue(ts, "id", id);
</span><span class="cx">
</span><del>- RenderSVGResourceContainer* resource = const_cast<RenderObject&>(object).toRenderSVGResourceContainer();
- ASSERT(resource);
</del><ins>+ const auto& resource = toRenderSVGResourceContainer(object);
</ins><span class="cx">
</span><del>- if (resource->resourceType() == MaskerResourceType) {
- RenderSVGResourceMasker* masker = static_cast<RenderSVGResourceMasker*>(resource);
- writeNameValuePair(ts, "maskUnits", masker->maskUnits());
- writeNameValuePair(ts, "maskContentUnits", masker->maskContentUnits());
</del><ins>+ if (resource.resourceType() == MaskerResourceType) {
+ const auto& masker = static_cast<const RenderSVGResourceMasker&>(resource);
+ writeNameValuePair(ts, "maskUnits", masker.maskUnits());
+ writeNameValuePair(ts, "maskContentUnits", masker.maskContentUnits());
</ins><span class="cx"> ts << "\n";
</span><span class="cx"> #if ENABLE(FILTERS)
</span><del>- } else if (resource->resourceType() == FilterResourceType) {
- RenderSVGResourceFilter* filter = static_cast<RenderSVGResourceFilter*>(resource);
- writeNameValuePair(ts, "filterUnits", filter->filterUnits());
- writeNameValuePair(ts, "primitiveUnits", filter->primitiveUnits());
</del><ins>+ } else if (resource.resourceType() == FilterResourceType) {
+ const auto& filter = static_cast<const RenderSVGResourceFilter&>(resource);
+ writeNameValuePair(ts, "filterUnits", filter.filterUnits());
+ writeNameValuePair(ts, "primitiveUnits", filter.primitiveUnits());
</ins><span class="cx"> ts << "\n";
</span><span class="cx"> // Creating a placeholder filter which is passed to the builder.
</span><span class="cx"> FloatRect dummyRect;
</span><span class="cx"> RefPtr<SVGFilter> dummyFilter = SVGFilter::create(AffineTransform(), dummyRect, dummyRect, dummyRect, true);
</span><del>- if (auto builder = filter->buildPrimitives(dummyFilter.get())) {
</del><ins>+ if (auto builder = filter.buildPrimitives(dummyFilter.get())) {
</ins><span class="cx"> if (FilterEffect* lastEffect = builder->lastEffect())
</span><span class="cx"> lastEffect->externalRepresentation(ts, indent + 1);
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><del>- } else if (resource->resourceType() == ClipperResourceType) {
- RenderSVGResourceClipper* clipper = static_cast<RenderSVGResourceClipper*>(resource);
- writeNameValuePair(ts, "clipPathUnits", clipper->clipPathUnits());
</del><ins>+ } else if (resource.resourceType() == ClipperResourceType) {
+ const auto& clipper = static_cast<const RenderSVGResourceClipper&>(resource);
+ writeNameValuePair(ts, "clipPathUnits", clipper.clipPathUnits());
</ins><span class="cx"> ts << "\n";
</span><del>- } else if (resource->resourceType() == MarkerResourceType) {
- RenderSVGResourceMarker* marker = static_cast<RenderSVGResourceMarker*>(resource);
- writeNameValuePair(ts, "markerUnits", marker->markerUnits());
- ts << " [ref at " << marker->referencePoint() << "]";
</del><ins>+ } else if (resource.resourceType() == MarkerResourceType) {
+ const auto& marker = static_cast<const RenderSVGResourceMarker&>(resource);
+ writeNameValuePair(ts, "markerUnits", marker.markerUnits());
+ ts << " [ref at " << marker.referencePoint() << "]";
</ins><span class="cx"> ts << " [angle=";
</span><del>- if (marker->angle() == -1)
</del><ins>+ if (marker.angle() == -1)
</ins><span class="cx"> ts << "auto" << "]\n";
</span><span class="cx"> else
</span><del>- ts << marker->angle() << "]\n";
- } else if (resource->resourceType() == PatternResourceType) {
- RenderSVGResourcePattern* pattern = static_cast<RenderSVGResourcePattern*>(resource);
</del><ins>+ ts << marker.angle() << "]\n";
+ } else if (resource.resourceType() == PatternResourceType) {
+ const auto& pattern = static_cast<const RenderSVGResourcePattern&>(resource);
</ins><span class="cx">
</span><span class="cx"> // Dump final results that are used for rendering. No use in asking SVGPatternElement for its patternUnits(), as it may
</span><span class="cx"> // link to other patterns using xlink:href, we need to build the full inheritance chain, aka. collectPatternProperties()
</span><span class="cx"> PatternAttributes attributes;
</span><del>- pattern->patternElement().collectPatternAttributes(attributes);
</del><ins>+ pattern.patternElement().collectPatternAttributes(attributes);
</ins><span class="cx">
</span><span class="cx"> writeNameValuePair(ts, "patternUnits", attributes.patternUnits());
</span><span class="cx"> writeNameValuePair(ts, "patternContentUnits", attributes.patternContentUnits());
</span><span class="lines">@@ -526,29 +525,29 @@
</span><span class="cx"> if (!transform.isIdentity())
</span><span class="cx"> ts << " [patternTransform=" << transform << "]";
</span><span class="cx"> ts << "\n";
</span><del>- } else if (resource->resourceType() == LinearGradientResourceType) {
- RenderSVGResourceLinearGradient* gradient = static_cast<RenderSVGResourceLinearGradient*>(resource);
</del><ins>+ } else if (resource.resourceType() == LinearGradientResourceType) {
+ const auto& gradient = static_cast<const RenderSVGResourceLinearGradient&>(resource);
</ins><span class="cx">
</span><span class="cx"> // Dump final results that are used for rendering. No use in asking SVGGradientElement for its gradientUnits(), as it may
</span><span class="cx"> // link to other gradients using xlink:href, we need to build the full inheritance chain, aka. collectGradientProperties()
</span><span class="cx"> LinearGradientAttributes attributes;
</span><del>- gradient->linearGradientElement().collectGradientAttributes(attributes);
</del><ins>+ gradient.linearGradientElement().collectGradientAttributes(attributes);
</ins><span class="cx"> writeCommonGradientProperties(ts, attributes.spreadMethod(), attributes.gradientTransform(), attributes.gradientUnits());
</span><span class="cx">
</span><del>- ts << " [start=" << gradient->startPoint(attributes) << "] [end=" << gradient->endPoint(attributes) << "]\n";
- } else if (resource->resourceType() == RadialGradientResourceType) {
- RenderSVGResourceRadialGradient* gradient = static_cast<RenderSVGResourceRadialGradient*>(resource);
</del><ins>+ ts << " [start=" << gradient.startPoint(attributes) << "] [end=" << gradient.endPoint(attributes) << "]\n";
+ } else if (resource.resourceType() == RadialGradientResourceType) {
+ const auto& gradient = static_cast<const RenderSVGResourceRadialGradient&>(resource);
</ins><span class="cx">
</span><span class="cx"> // Dump final results that are used for rendering. No use in asking SVGGradientElement for its gradientUnits(), as it may
</span><span class="cx"> // link to other gradients using xlink:href, we need to build the full inheritance chain, aka. collectGradientProperties()
</span><span class="cx"> RadialGradientAttributes attributes;
</span><del>- gradient->radialGradientElement().collectGradientAttributes(attributes);
</del><ins>+ gradient.radialGradientElement().collectGradientAttributes(attributes);
</ins><span class="cx"> writeCommonGradientProperties(ts, attributes.spreadMethod(), attributes.gradientTransform(), attributes.gradientUnits());
</span><span class="cx">
</span><del>- FloatPoint focalPoint = gradient->focalPoint(attributes);
- FloatPoint centerPoint = gradient->centerPoint(attributes);
- float radius = gradient->radius(attributes);
- float focalRadius = gradient->focalRadius(attributes);
</del><ins>+ FloatPoint focalPoint = gradient.focalPoint(attributes);
+ FloatPoint centerPoint = gradient.centerPoint(attributes);
+ float radius = gradient.radius(attributes);
+ float focalRadius = gradient.focalRadius(attributes);
</ins><span class="cx">
</span><span class="cx"> ts << " [center=" << centerPoint << "] [focal=" << focalPoint << "] [radius=" << radius << "] [focalRadius=" << focalRadius << "]\n";
</span><span class="cx"> } else
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGResourcesCycleSolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGResourcesCycleSolver.cpp (163282 => 163283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGResourcesCycleSolver.cpp 2014-02-03 04:44:10 UTC (rev 163282)
+++ trunk/Source/WebCore/rendering/svg/SVGResourcesCycleSolver.cpp 2014-02-03 04:50:00 UTC (rev 163283)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> auto parent = m_renderer.parent();
</span><span class="cx"> while (parent) {
</span><span class="cx"> if (parent->isSVGResourceContainer())
</span><del>- parentResources.add(parent->toRenderSVGResourceContainer());
</del><ins>+ parentResources.add(toRenderSVGResourceContainer(parent));
</ins><span class="cx"> parent = parent->parent();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx">
</span><span class="cx"> // If we're a resource, add ourselves to the HashSet.
</span><span class="cx"> if (m_renderer.isSVGResourceContainer())
</span><del>- m_allResources.add(m_renderer.toRenderSVGResourceContainer());
</del><ins>+ m_allResources.add(&toRenderSVGResourceContainer(m_renderer));
</ins><span class="cx">
</span><span class="cx"> ASSERT(!m_allResources.isEmpty());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGElement.cpp (163282 => 163283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGElement.cpp 2014-02-03 04:44:10 UTC (rev 163282)
+++ trunk/Source/WebCore/svg/SVGElement.cpp 2014-02-03 04:50:00 UTC (rev 163283)
</span><span class="lines">@@ -1010,10 +1010,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (isIdAttributeName(attrName)) {
</span><del>- RenderObject* object = renderer();
</del><ins>+ auto renderer = this->renderer();
</ins><span class="cx"> // Notify resources about id changes, this is important as we cache resources by id in SVGDocumentExtensions
</span><del>- if (object && object->isSVGResourceContainer())
- object->toRenderSVGResourceContainer()->idChanged();
</del><ins>+ if (renderer && renderer->isSVGResourceContainer())
+ toRenderSVGResourceContainer(*renderer).idChanged();
</ins><span class="cx"> if (inDocument())
</span><span class="cx"> buildPendingResourcesIfNeeded();
</span><span class="cx"> SVGElementInstance::invalidateAllInstancesOfElement(this);
</span></span></pre>
</div>
</div>
</body>
</html>