<!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>[190579] 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/190579">190579</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-10-05 14:21:18 -0700 (Mon, 05 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cleaning up after <a href="http://trac.webkit.org/projects/webkit/changeset/190339">revision 190339</a>
https://bugs.webkit.org/show_bug.cgi?id=149732
Patch by Jiewen Tan <jiewen_tan@apple.com> on 2015-10-05
Reviewed by Myles C. Maxfield.
Source/WebCore:
* xml/XSLStyleSheet.h:
* xml/XSLStyleSheetLibxslt.cpp:
(WebCore::XSLStyleSheet::compileStyleSheet):
LayoutTests:
* svg/custom/invalid-xslt-crash.svg:
* svg/custom/invalid-xslt-crash-expected.txt:
Replace render tree dump test with text dump.
Pass if no crash.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestssvgcustominvalidxsltcrashsvg">trunk/LayoutTests/svg/custom/invalid-xslt-crash.svg</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorexmlXSLStyleSheeth">trunk/Source/WebCore/xml/XSLStyleSheet.h</a></li>
<li><a href="#trunkSourceWebCorexmlXSLStyleSheetLibxsltcpp">trunk/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestssvgcustominvalidxsltcrashexpectedtxt">trunk/LayoutTests/svg/custom/invalid-xslt-crash-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (190578 => 190579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-10-05 20:57:09 UTC (rev 190578)
+++ trunk/LayoutTests/ChangeLog 2015-10-05 21:21:18 UTC (rev 190579)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-10-05 Jiewen Tan <jiewen_tan@apple.com>
+
+ Cleaning up after revision 190339
+ https://bugs.webkit.org/show_bug.cgi?id=149732
+
+ Reviewed by Myles C. Maxfield.
+
+ * svg/custom/invalid-xslt-crash.svg:
+ * svg/custom/invalid-xslt-crash-expected.txt:
+ Replace render tree dump test with text dump.
+ Pass if no crash.
+
</ins><span class="cx"> 2015-10-05 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Rebaseline test for iOS
</span></span></pre></div>
<a id="trunkLayoutTestssvgcustominvalidxsltcrashexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/svg/custom/invalid-xslt-crash-expected.txt (190578 => 190579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/custom/invalid-xslt-crash-expected.txt 2015-10-05 20:57:09 UTC (rev 190578)
+++ trunk/LayoutTests/svg/custom/invalid-xslt-crash-expected.txt 2015-10-05 21:21:18 UTC (rev 190579)
</span><span class="lines">@@ -1,2 +0,0 @@
</span><del>-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
</del></span></pre></div>
<a id="trunkLayoutTestssvgcustominvalidxsltcrashsvg"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/custom/invalid-xslt-crash.svg (190578 => 190579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/custom/invalid-xslt-crash.svg 2015-10-05 20:57:09 UTC (rev 190578)
+++ trunk/LayoutTests/svg/custom/invalid-xslt-crash.svg 2015-10-05 21:21:18 UTC (rev 190579)
</span><span class="lines">@@ -2,6 +2,11 @@
</span><span class="cx"> <svg xmlns="http://www.w3.org/2000/svg"
</span><span class="cx"> xmlns:xslt="http://www.w3.org/1999/XSL/Transform"
</span><span class="cx"> xslt:version="1.0">
</span><del>- <!-- The test passes if it doesn't crash -->
- <xslt:attribute nnnnnnnnnnname="fill">lime</xslt:attribute>
</del><ins>+ <script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+ </script>
+
+ <!-- The test passes if it doesn't crash -->
+ <xslt:attribute nnnnnnnnnnname="fill">lime</xslt:attribute>
</ins><span class="cx"> </svg>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190578 => 190579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-05 20:57:09 UTC (rev 190578)
+++ trunk/Source/WebCore/ChangeLog 2015-10-05 21:21:18 UTC (rev 190579)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-10-05 Jiewen Tan <jiewen_tan@apple.com>
+
+ Cleaning up after revision 190339
+ https://bugs.webkit.org/show_bug.cgi?id=149732
+
+ Reviewed by Myles C. Maxfield.
+
+ * xml/XSLStyleSheet.h:
+ * xml/XSLStyleSheetLibxslt.cpp:
+ (WebCore::XSLStyleSheet::compileStyleSheet):
+
</ins><span class="cx"> 2015-10-05 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Errant space!!
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXSLStyleSheeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XSLStyleSheet.h (190578 => 190579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XSLStyleSheet.h 2015-10-05 20:57:09 UTC (rev 190578)
+++ trunk/Source/WebCore/xml/XSLStyleSheet.h 2015-10-05 21:21:18 UTC (rev 190579)
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx">
</span><span class="cx"> xmlDocPtr m_stylesheetDoc;
</span><span class="cx"> bool m_stylesheetDocTaken;
</span><del>- bool m_compilationFailed = false;
</del><ins>+ bool m_compilationFailed { false };
</ins><span class="cx">
</span><span class="cx"> XSLStyleSheet* m_parentStyleSheet;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXSLStyleSheetLibxsltcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp (190578 => 190579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp 2015-10-05 20:57:09 UTC (rev 190578)
+++ trunk/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp 2015-10-05 21:21:18 UTC (rev 190579)
</span><span class="lines">@@ -248,7 +248,7 @@
</span><span class="cx"> // Certain libxslt versions are corrupting the xmlDoc on compilation
</span><span class="cx"> // failures - hence attempting to recompile after a failure is unsafe.
</span><span class="cx"> if (m_compilationFailed)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> // xsltParseStylesheetDoc makes the document part of the stylesheet
</span><span class="cx"> // so we have to release our pointer to it.
</span></span></pre>
</div>
</div>
</body>
</html>