Title: [176730] branches/safari-600.3-branch/Source/WebCore
- Revision
- 176730
- Author
- [email protected]
- Date
- 2014-12-03 11:36:58 -0800 (Wed, 03 Dec 2014)
Log Message
Merged r175974. rdar://problems/19122595
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebCore/ChangeLog (176729 => 176730)
--- branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-12-03 19:16:52 UTC (rev 176729)
+++ branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-12-03 19:36:58 UTC (rev 176730)
@@ -1,3 +1,22 @@
+2014-12-03 Dana Burkart <[email protected]>
+
+ Merge r175974. <rdar://problem/19122595>
+
+ 2014-11-11 David Kilzer <[email protected]>
+
+ Protect Document in ProcessingInstruction::setXSLStyleSheet()
+ <http://webkit.org/b/138621>
+
+ Reviewed by Andreas Kling.
+
+ The patch is inspired by the following Blink revision by
+ <[email protected]>:
+ <https://src.chromium.org/viewvc/blink?view=rev&revision=182309>
+
+ * dom/ProcessingInstruction.cpp:
+ (WebCore::ProcessingInstruction::setXSLStyleSheet):
+
+
2014-12-02 Dana Burkart <[email protected]>
Merge r176617. <rdar://problem/19107247>
Modified: branches/safari-600.3-branch/Source/WebCore/dom/ProcessingInstruction.cpp (176729 => 176730)
--- branches/safari-600.3-branch/Source/WebCore/dom/ProcessingInstruction.cpp 2014-12-03 19:16:52 UTC (rev 176729)
+++ branches/safari-600.3-branch/Source/WebCore/dom/ProcessingInstruction.cpp 2014-12-03 19:36:58 UTC (rev 176730)
@@ -215,6 +215,7 @@
{
ASSERT(m_isXSL);
m_sheet = XSLStyleSheet::create(this, href, baseURL);
+ Ref<Document> protect(document());
parseStyleSheet(sheet);
}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
