Title: [190579] trunk
- Revision
- 190579
- Author
- commit-qu...@webkit.org
- Date
- 2015-10-05 14:21:18 -0700 (Mon, 05 Oct 2015)
Log Message
Cleaning up after revision 190339
https://bugs.webkit.org/show_bug.cgi?id=149732
Patch by Jiewen Tan <jiewen_...@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.
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (190578 => 190579)
--- trunk/LayoutTests/ChangeLog 2015-10-05 20:57:09 UTC (rev 190578)
+++ trunk/LayoutTests/ChangeLog 2015-10-05 21:21:18 UTC (rev 190579)
@@ -1,3 +1,15 @@
+2015-10-05 Jiewen Tan <jiewen_...@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.
+
2015-10-05 Timothy Horton <timothy_hor...@apple.com>
Rebaseline test for iOS
Deleted: trunk/LayoutTests/svg/custom/invalid-xslt-crash-expected.txt (190578 => 190579)
--- 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)
@@ -1,2 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
Modified: trunk/LayoutTests/svg/custom/invalid-xslt-crash.svg (190578 => 190579)
--- 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)
@@ -2,6 +2,11 @@
<svg xmlns="http://www.w3.org/2000/svg"
xmlns:xslt="http://www.w3.org/1999/XSL/Transform"
xslt:version="1.0">
- <!-- The test passes if it doesn't crash -->
- <xslt:attribute nnnnnnnnnnname="fill">lime</xslt:attribute>
+ <script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+ </script>
+
+ <!-- The test passes if it doesn't crash -->
+ <xslt:attribute nnnnnnnnnnname="fill">lime</xslt:attribute>
</svg>
Modified: trunk/Source/WebCore/ChangeLog (190578 => 190579)
--- 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)
@@ -1,3 +1,14 @@
+2015-10-05 Jiewen Tan <jiewen_...@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):
+
2015-10-05 Beth Dakin <bda...@apple.com>
Errant space!!
Modified: trunk/Source/WebCore/xml/XSLStyleSheet.h (190578 => 190579)
--- 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)
@@ -116,7 +116,7 @@
xmlDocPtr m_stylesheetDoc;
bool m_stylesheetDocTaken;
- bool m_compilationFailed = false;
+ bool m_compilationFailed { false };
XSLStyleSheet* m_parentStyleSheet;
};
Modified: trunk/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp (190578 => 190579)
--- 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)
@@ -248,7 +248,7 @@
// Certain libxslt versions are corrupting the xmlDoc on compilation
// failures - hence attempting to recompile after a failure is unsafe.
if (m_compilationFailed)
- return 0;
+ return nullptr;
// xsltParseStylesheetDoc makes the document part of the stylesheet
// so we have to release our pointer to it.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
