<!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>[180179] 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/180179">180179</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-02-16 15:19:23 -0800 (Mon, 16 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert a change in SVGRenderSupport::mapLocalToContainer committed for fixing <https://bugs.webkit.org/show_bug.cgi?id=119626>.
https://bugs.webkit.org/show_bug.cgi?id=138439
Patch by Said Abou-Hallawa <sabouhallawa@apple.com> on 2015-02-16
Reviewed by Darin Adler.
The change http://trac.webkit.org/changeset/164861 was ported from Blink
but it was was revert later because it broke Chrome SVG rendering. It also
broke the WebKit SVG text search highlighting.
Tests: svg/transforms/svg-geometry-crash.html: This test was added by the
blamed change. A new but correct solution is required to fix the assertion.
* rendering/svg/SVGRenderSupport.h:
* rendering/svg/SVGRenderSupport.cpp:
Notice that TransformState.applyTransform() does matrix-left-multiplication,
i.e. state = transform * state. But operator*() of AffineTransform and
MatrixTransform does right multiply, i.e. this = this * transform.
(WebCore::SVGRenderSupport::localToParentTransform): Have the calculation
of the SVG localToParentTransform in one shared function.
(WebCore::SVGRenderSupport::mapLocalToContainer): Revert the Blink change.
If the parent is the SVG root, the transform state should be equal to
transform = svg_to_css_mapping * local_to_parent_mapping * transform.
(WebCore::SVGRenderSupport::pushMappingToContainer): Get the localToParent
transform to be pushed in the geometryMap. If the parent is the SVG root,
localToParent = svg_to_css_mapping * local_to_parent_mapping. The original
code was doing the opposite and this is the cause of the assertion which
was fixed wrongly by reversing the correct multiplication order in
SVGRenderSupport::mapLocalToContainer().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGRenderSupportcpp">trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGRenderSupporth">trunk/Source/WebCore/rendering/svg/SVGRenderSupport.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180178 => 180179)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-16 23:11:23 UTC (rev 180178)
+++ trunk/Source/WebCore/ChangeLog 2015-02-16 23:19:23 UTC (rev 180179)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2015-02-16 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ Revert a change in SVGRenderSupport::mapLocalToContainer committed for fixing <https://bugs.webkit.org/show_bug.cgi?id=119626>.
+ https://bugs.webkit.org/show_bug.cgi?id=138439
+
+ Reviewed by Darin Adler.
+
+ The change http://trac.webkit.org/changeset/164861 was ported from Blink
+ but it was was revert later because it broke Chrome SVG rendering. It also
+ broke the WebKit SVG text search highlighting.
+
+ Tests: svg/transforms/svg-geometry-crash.html: This test was added by the
+ blamed change. A new but correct solution is required to fix the assertion.
+
+ * rendering/svg/SVGRenderSupport.h:
+ * rendering/svg/SVGRenderSupport.cpp:
+ Notice that TransformState.applyTransform() does matrix-left-multiplication,
+ i.e. state = transform * state. But operator*() of AffineTransform and
+ MatrixTransform does right multiply, i.e. this = this * transform.
+
+ (WebCore::SVGRenderSupport::localToParentTransform): Have the calculation
+ of the SVG localToParentTransform in one shared function.
+
+ (WebCore::SVGRenderSupport::mapLocalToContainer): Revert the Blink change.
+ If the parent is the SVG root, the transform state should be equal to
+ transform = svg_to_css_mapping * local_to_parent_mapping * transform.
+
+ (WebCore::SVGRenderSupport::pushMappingToContainer): Get the localToParent
+ transform to be pushed in the geometryMap. If the parent is the SVG root,
+ localToParent = svg_to_css_mapping * local_to_parent_mapping. The original
+ code was doing the opposite and this is the cause of the assertion which
+ was fixed wrongly by reversing the correct multiplication order in
+ SVGRenderSupport::mapLocalToContainer().
+
</ins><span class="cx"> 2015-02-16 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> RenderTableCell can't access its parent while in detached state.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGRenderSupportcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp (180178 => 180179)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp 2015-02-16 23:11:23 UTC (rev 180178)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp 2015-02-16 23:19:23 UTC (rev 180179)
</span><span class="lines">@@ -83,19 +83,28 @@
</span><span class="cx"> renderer.parent()->computeFloatRectForRepaint(repaintContainer, repaintRect, fixed);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SVGRenderSupport::mapLocalToContainer(const RenderElement& renderer, const RenderLayerModelObject* repaintContainer, TransformState& transformState, bool* wasFixed)
</del><ins>+const RenderElement& SVGRenderSupport::localToParentTransform(const RenderElement& renderer, AffineTransform &transform)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(renderer.parent());
</span><span class="cx"> auto& parent = *renderer.parent();
</span><del>-
- // At the SVG/HTML boundary (aka RenderSVGRoot), we apply the localToBorderBoxTransform
</del><ins>+
+ // At the SVG/HTML boundary (aka RenderSVGRoot), we apply the localToBorderBoxTransform
</ins><span class="cx"> // to map an element from SVG viewport coordinates to CSS box coordinates.
</span><del>- // RenderSVGRoot's mapLocalToContainer method expects CSS box coordinates.
</del><span class="cx"> if (is<RenderSVGRoot>(parent))
</span><del>- transformState.applyTransform(downcast<RenderSVGRoot>(parent).localToBorderBoxTransform());
</del><ins>+ transform = downcast<RenderSVGRoot>(parent).localToBorderBoxTransform() * renderer.localToParentTransform();
+ else
+ transform = renderer.localToParentTransform();
</ins><span class="cx">
</span><del>- transformState.applyTransform(renderer.localToParentTransform());
</del><ins>+ return parent;
+}
</ins><span class="cx">
</span><ins>+void SVGRenderSupport::mapLocalToContainer(const RenderElement& renderer, const RenderLayerModelObject* repaintContainer, TransformState& transformState, bool* wasFixed)
+{
+ AffineTransform transform;
+ auto& parent = localToParentTransform(renderer, transform);
+
+ transformState.applyTransform(transform);
+
</ins><span class="cx"> MapCoordinatesFlags mode = UseTransforms;
</span><span class="cx"> parent.mapLocalToContainer(repaintContainer, transformState, mode, wasFixed);
</span><span class="cx"> }
</span><span class="lines">@@ -104,19 +113,10 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(ancestorToStopAt, ancestorToStopAt != &renderer);
</span><span class="cx">
</span><del>- ASSERT(renderer.parent());
- auto& parent = *renderer.parent();
</del><ins>+ AffineTransform transform;
+ auto& parent = localToParentTransform(renderer, transform);
</ins><span class="cx">
</span><del>- // At the SVG/HTML boundary (aka RenderSVGRoot), we apply the localToBorderBoxTransform
- // to map an element from SVG viewport coordinates to CSS box coordinates.
- // RenderSVGRoot's mapLocalToContainer method expects CSS box coordinates.
- if (is<RenderSVGRoot>(parent)) {
- TransformationMatrix matrix(renderer.localToParentTransform());
- matrix.multiply(downcast<RenderSVGRoot>(parent).localToBorderBoxTransform());
- geometryMap.push(&renderer, matrix);
- } else
- geometryMap.push(&renderer, renderer.localToParentTransform());
-
</del><ins>+ geometryMap.push(&renderer, transform);
</ins><span class="cx"> return &parent;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGRenderSupporth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGRenderSupport.h (180178 => 180179)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGRenderSupport.h 2015-02-16 23:11:23 UTC (rev 180178)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderSupport.h 2015-02-16 23:19:23 UTC (rev 180179)
</span><span class="lines">@@ -68,6 +68,7 @@
</span><span class="cx"> static FloatRect repaintRectForRendererInLocalCoordinatesExcludingSVGShadow(const RenderElement&);
</span><span class="cx"> static LayoutRect clippedOverflowRectForRepaint(const RenderElement&, const RenderLayerModelObject* repaintContainer);
</span><span class="cx"> static void computeFloatRectForRepaint(const RenderElement&, const RenderLayerModelObject* repaintContainer, FloatRect&, bool fixed);
</span><ins>+ static const RenderElement& localToParentTransform(const RenderElement&, AffineTransform &);
</ins><span class="cx"> static void mapLocalToContainer(const RenderElement&, const RenderLayerModelObject* repaintContainer, TransformState&, bool* wasFixed = 0);
</span><span class="cx"> static const RenderElement* pushMappingToContainer(const RenderElement&, const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&);
</span><span class="cx"> static bool checkForSVGRepaintDuringLayout(const RenderElement&);
</span></span></pre>
</div>
</div>
</body>
</html>