Commit d0c768a0 authored by aroben@apple.com's avatar aroben@apple.com
Browse files

Fix Bug 18544: REGRESSION (r31951): Two fast/xsl tests crash

        <https://bugs.webkit.org/show_bug.cgi?id=18544>

        r31951 changed XSLTProcessor::parseErrorFunc to expect a Console* as
        the context parameter. The caller in XSLTProcessor was changed, but
        the one in XSLStyleSheet was missed.

        Reviewed by Alexey Proskuryakov.

        * xml/XSLStyleSheet.cpp:
        (WebCore::XSLStyleSheet::parseString): Pass the Console as the context
        to parseErrorFunc.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@31999 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 7df5fd3c
2008-04-17 Adam Roben <aroben@apple.com>
Fix Bug 18544: REGRESSION (r31951): Two fast/xsl tests crash
<https://bugs.webkit.org/show_bug.cgi?id=18544>
r31951 changed XSLTProcessor::parseErrorFunc to expect a Console* as
the context parameter. The caller in XSLTProcessor was changed, but
the one in XSLStyleSheet was missed.
Reviewed by Alexey Proskuryakov.
* xml/XSLStyleSheet.cpp:
(WebCore::XSLStyleSheet::parseString): Pass the Console as the context
to parseErrorFunc.
2008-04-17 Adam Roben <aroben@apple.com>
 
Windows build fix after r31981
......@@ -25,11 +25,13 @@
#if ENABLE(XSLT)
#include "CString.h"
#include "Console.h"
#include "DOMWindow.h"
#include "DocLoader.h"
#include "Document.h"
#include "Frame.h"
#include "loader.h"
#include "Node.h"
#include "Page.h"
#include "XMLTokenizer.h"
#include "XSLImportRule.h"
#include "XSLTProcessor.h"
......@@ -139,10 +141,10 @@ bool XSLStyleSheet::parseString(const String& string, bool strict)
xmlFreeDoc(m_stylesheetDoc);
m_stylesheetDocTaken = false;
Chrome* chrome = 0;
if (Page* page = ownerDocument()->page())
chrome = page->chrome();
xmlSetStructuredErrorFunc(chrome, XSLTProcessor::parseErrorFunc);
Console* console = 0;
if (Frame* frame = ownerDocument()->frame())
console = frame->domWindow()->console();
xmlSetStructuredErrorFunc(console, XSLTProcessor::parseErrorFunc);
m_stylesheetDoc = xmlReadMemory(reinterpret_cast<const char*>(string.characters()), string.length() * sizeof(UChar),
href().utf8().data(),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment