<!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>[163319] 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/163319">163319</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-02-03 12:26:09 -0800 (Mon, 03 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>CTTE: RenderSVGGradientStop always has a SVGStopElement.
<https://webkit.org/b/128107>
RenderSVGGradientStop is never anonymous and always has a
corresponding SVGStopElement. Codify this by adding an element()
overload that returns an SVGStopElement&.
Also added missing overrides and made most functions private.
Reviewed by Darin Adler.
* rendering/svg/RenderSVGGradientStop.cpp:
(WebCore::RenderSVGGradientStop::styleDidChange):
(WebCore::RenderSVGGradientStop::gradientElement):
* rendering/svg/RenderSVGGradientStop.h:
* rendering/svg/SVGRenderTreeAsText.cpp:
(WebCore::writeSVGGradientStop):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGGradientStopcpp">trunk/Source/WebCore/rendering/svg/RenderSVGGradientStop.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGGradientStoph">trunk/Source/WebCore/rendering/svg/RenderSVGGradientStop.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGRenderTreeAsTextcpp">trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163318 => 163319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-03 19:34:30 UTC (rev 163318)
+++ trunk/Source/WebCore/ChangeLog 2014-02-03 20:26:09 UTC (rev 163319)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-02-03 Andreas Kling <akling@apple.com>
+
+ CTTE: RenderSVGGradientStop always has a SVGStopElement.
+ <https://webkit.org/b/128107>
+
+ RenderSVGGradientStop is never anonymous and always has a
+ corresponding SVGStopElement. Codify this by adding an element()
+ overload that returns an SVGStopElement&.
+
+ Also added missing overrides and made most functions private.
+
+ Reviewed by Darin Adler.
+
+ * rendering/svg/RenderSVGGradientStop.cpp:
+ (WebCore::RenderSVGGradientStop::styleDidChange):
+ (WebCore::RenderSVGGradientStop::gradientElement):
+ * rendering/svg/RenderSVGGradientStop.h:
+ * rendering/svg/SVGRenderTreeAsText.cpp:
+ (WebCore::writeSVGGradientStop):
+
</ins><span class="cx"> 2014-02-03 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove CachedImageManual class
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGGradientStopcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGGradientStop.cpp (163318 => 163319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGGradientStop.cpp 2014-02-03 19:34:30 UTC (rev 163318)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGGradientStop.cpp 2014-02-03 20:26:09 UTC (rev 163319)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> // <stop> elements should only be allowed to make renderers under gradient elements
</span><span class="cx"> // but I can imagine a few cases we might not be catching, so let's not crash if our parent isn't a gradient.
</span><del>- SVGGradientElement* gradient = gradientElement();
</del><ins>+ const auto* gradient = gradientElement();
</ins><span class="cx"> if (!gradient)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -67,12 +67,11 @@
</span><span class="cx"> clearNeedsLayout();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SVGGradientElement* RenderSVGGradientStop::gradientElement() const
</del><ins>+SVGGradientElement* RenderSVGGradientStop::gradientElement()
</ins><span class="cx"> {
</span><del>- ContainerNode* parentNode = element()->parentNode();
- if (parentNode->hasTagName(linearGradientTag) || parentNode->hasTagName(radialGradientTag))
- return toSVGGradientElement(parentNode);
- return 0;
</del><ins>+ if (element().parentElement() && isSVGGradientElement(*element().parentElement()))
+ return &toSVGGradientElement(*element().parentElement());
+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGGradientStoph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGGradientStop.h (163318 => 163319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGGradientStop.h 2014-02-03 19:34:30 UTC (rev 163318)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGGradientStop.h 2014-02-03 20:26:09 UTC (rev 163319)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
</span><span class="cx"> * Copyright (C) 2009 Google, Inc.
</span><ins>+ * Copyright (C) 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="cx"> * modify it under the terms of the GNU Library General Public
</span><span class="lines">@@ -23,11 +24,11 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SVG)
</span><span class="cx"> #include "RenderElement.h"
</span><ins>+#include "SVGStopElement.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class SVGGradientElement;
</span><del>-class SVGStopElement;
</del><span class="cx">
</span><span class="cx"> // This class exists mostly so we can hear about gradient stop style changes
</span><span class="cx"> class RenderSVGGradientStop final : public RenderElement {
</span><span class="lines">@@ -35,28 +36,29 @@
</span><span class="cx"> RenderSVGGradientStop(SVGStopElement&, PassRef<RenderStyle>);
</span><span class="cx"> virtual ~RenderSVGGradientStop();
</span><span class="cx">
</span><del>- virtual bool isSVGGradientStop() const { return true; }
- virtual const char* renderName() const { return "RenderSVGGradientStop"; }
</del><ins>+ SVGStopElement& element() const { return toSVGStopElement(RenderObject::nodeForNonAnonymous()); }
</ins><span class="cx">
</span><del>- virtual void layout();
</del><ins>+private:
+ virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
</ins><span class="cx">
</span><del>- // This overrides are needed to prevent ASSERTs on <svg><stop /></svg>
</del><ins>+ virtual void layout() override;
+
+ // These overrides are needed to prevent ASSERTs on <svg><stop /></svg>
</ins><span class="cx"> // RenderObject's default implementations ASSERT_NOT_REACHED()
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=20400
</span><span class="cx"> virtual LayoutRect clippedOverflowRectForRepaint(const RenderLayerModelObject*) const override { return LayoutRect(); }
</span><del>- virtual FloatRect objectBoundingBox() const { return FloatRect(); }
- virtual FloatRect strokeBoundingBox() const { return FloatRect(); }
- virtual FloatRect repaintRectInLocalCoordinates() const { return FloatRect(); }
</del><ins>+ virtual FloatRect objectBoundingBox() const override { return FloatRect(); }
+ virtual FloatRect strokeBoundingBox() const override { return FloatRect(); }
+ virtual FloatRect repaintRectInLocalCoordinates() const override { return FloatRect(); }
</ins><span class="cx"> virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const FloatPoint&, HitTestAction) override { return false; }
</span><span class="cx">
</span><del>-protected:
- virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
</del><ins>+ virtual bool isSVGGradientStop() const override { return true; }
+ virtual const char* renderName() const override { return "RenderSVGGradientStop"; }
</ins><span class="cx">
</span><del>-private:
</del><span class="cx"> virtual bool canHaveChildren() const override { return false; }
</span><del>- virtual void paint(PaintInfo&, const LayoutPoint&) override final { }
</del><ins>+ virtual void paint(PaintInfo&, const LayoutPoint&) override { }
</ins><span class="cx">
</span><del>- SVGGradientElement* gradientElement() const;
</del><ins>+ SVGGradientElement* gradientElement();
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> RENDER_OBJECT_TYPE_CASTS(RenderSVGGradientStop, isSVGGradientStop())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGRenderTreeAsTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp (163318 => 163319)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp 2014-02-03 19:34:30 UTC (rev 163318)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp 2014-02-03 20:26:09 UTC (rev 163319)
</span><span class="lines">@@ -608,10 +608,7 @@
</span><span class="cx"> {
</span><span class="cx"> writeStandardPrefix(ts, stop, indent);
</span><span class="cx">
</span><del>- SVGStopElement* stopElement = toSVGStopElement(toSVGElement(stop.element()));
- ASSERT(stopElement);
-
- ts << " [offset=" << stopElement->offset() << "] [color=" << stopElement->stopColorIncludingOpacity() << "]\n";
</del><ins>+ ts << " [offset=" << stop.element().offset() << "] [color=" << stop.element().stopColorIncludingOpacity() << "]\n";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void writeResources(TextStream& ts, const RenderObject& renderer, int indent)
</span></span></pre>
</div>
</div>
</body>
</html>