<!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>[164861] 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/164861">164861</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-28 08:35:27 -0800 (Fri, 28 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>ASSERTION FAILED: roundedIntPoint(rendererMappedResult) == roundedIntPoint(result) in WebCore::RenderGeometryMap::mapToContainer
https://bugs.webkit.org/show_bug.cgi?id=119626
Source/WebCore:
SVGRenderSupport::mapLocalToContainer() was trying to apply transforms
in the incorrect order. Specifically, it would attempt to apply its
localToParentTransform before its localToBorderBoxTransform. This
was causing an ASSERT to fail when the computed transforms didn't
match up to those computed by RenderGeometryMap.
Backported from Blink: https://codereview.chromium.org/143363004
Patch by Martin Hodovan <mhodovan@inf.u-szeged.hu> on 2014-02-28
Reviewed by Simon Fraser.
Test: svg/transforms/svg-geometry-crash.html
* rendering/svg/SVGRenderSupport.cpp:
(WebCore::SVGRenderSupport::mapLocalToContainer):
LayoutTests:
Backported from Blink: https://codereview.chromium.org/143363004
Patch by Martin Hodovan <mhodovan@inf.u-szeged.hu> on 2014-02-28
Reviewed by Simon Fraser.
* svg/transforms/svg-geometry-crash-expected.txt: Added.
* svg/transforms/svg-geometry-crash.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGRenderSupportcpp">trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestssvgtransformssvggeometrycrashexpectedtxt">trunk/LayoutTests/svg/transforms/svg-geometry-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestssvgtransformssvggeometrycrashhtml">trunk/LayoutTests/svg/transforms/svg-geometry-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (164860 => 164861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-28 15:52:17 UTC (rev 164860)
+++ trunk/LayoutTests/ChangeLog 2014-02-28 16:35:27 UTC (rev 164861)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-02-28 Martin Hodovan <mhodovan@inf.u-szeged.hu>
+
+ ASSERTION FAILED: roundedIntPoint(rendererMappedResult) == roundedIntPoint(result) in WebCore::RenderGeometryMap::mapToContainer
+ https://bugs.webkit.org/show_bug.cgi?id=119626
+
+ Backported from Blink: https://codereview.chromium.org/143363004
+
+ Reviewed by Simon Fraser.
+
+ * svg/transforms/svg-geometry-crash-expected.txt: Added.
+ * svg/transforms/svg-geometry-crash.html: Added.
+
</ins><span class="cx"> 2014-02-28 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r164859.
</span></span></pre></div>
<a id="trunkLayoutTestssvgtransformssvggeometrycrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/transforms/svg-geometry-crash-expected.txt (0 => 164861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/transforms/svg-geometry-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/svg/transforms/svg-geometry-crash-expected.txt 2014-02-28 16:35:27 UTC (rev 164861)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+
+This test passes if it does not crash.
</ins></span></pre></div>
<a id="trunkLayoutTestssvgtransformssvggeometrycrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/transforms/svg-geometry-crash.html (0 => 164861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/transforms/svg-geometry-crash.html (rev 0)
+++ trunk/LayoutTests/svg/transforms/svg-geometry-crash.html 2014-02-28 16:35:27 UTC (rev 164861)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+ </script>
+ </head>
+ <body>
+ <svg viewbox="0 0 1000 500">
+ <g transform="scale(3.0)">
+ <foreignobject width="300" height="50">
+ <textarea>scaled text</textarea>
+ </foreignobject>
+ </g>
+ </svg>
+ This test passes if it does not crash.
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164860 => 164861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-28 15:52:17 UTC (rev 164860)
+++ trunk/Source/WebCore/ChangeLog 2014-02-28 16:35:27 UTC (rev 164861)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-02-28 Martin Hodovan <mhodovan@inf.u-szeged.hu>
+
+ ASSERTION FAILED: roundedIntPoint(rendererMappedResult) == roundedIntPoint(result) in WebCore::RenderGeometryMap::mapToContainer
+ https://bugs.webkit.org/show_bug.cgi?id=119626
+
+ SVGRenderSupport::mapLocalToContainer() was trying to apply transforms
+ in the incorrect order. Specifically, it would attempt to apply its
+ localToParentTransform before its localToBorderBoxTransform. This
+ was causing an ASSERT to fail when the computed transforms didn't
+ match up to those computed by RenderGeometryMap.
+
+ Backported from Blink: https://codereview.chromium.org/143363004
+
+ Reviewed by Simon Fraser.
+
+ Test: svg/transforms/svg-geometry-crash.html
+
+ * rendering/svg/SVGRenderSupport.cpp:
+ (WebCore::SVGRenderSupport::mapLocalToContainer):
+
</ins><span class="cx"> 2014-02-28 Mihnea Ovidenie <mihnea@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSSRegions] ASSERTION FAILED: !m_regionsInvalidated in RenderFlowThread::regionAtBlockOffset
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGRenderSupportcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp (164860 => 164861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp 2014-02-28 15:52:17 UTC (rev 164860)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp 2014-02-28 16:35:27 UTC (rev 164861)
</span><span class="lines">@@ -83,8 +83,6 @@
</span><span class="cx">
</span><span class="cx"> void SVGRenderSupport::mapLocalToContainer(const RenderElement& renderer, const RenderLayerModelObject* repaintContainer, TransformState& transformState, bool* wasFixed)
</span><span class="cx"> {
</span><del>- transformState.applyTransform(renderer.localToParentTransform());
-
</del><span class="cx"> ASSERT(renderer.parent());
</span><span class="cx"> auto& parent = *renderer.parent();
</span><span class="cx">
</span><span class="lines">@@ -94,6 +92,8 @@
</span><span class="cx"> if (parent.isSVGRoot())
</span><span class="cx"> transformState.applyTransform(toRenderSVGRoot(parent).localToBorderBoxTransform());
</span><span class="cx">
</span><ins>+ transformState.applyTransform(renderer.localToParentTransform());
+
</ins><span class="cx"> MapCoordinatesFlags mode = UseTransforms;
</span><span class="cx"> parent.mapLocalToContainer(repaintContainer, transformState, mode, wasFixed);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>