Changeset 31999 in webkit

Timestamp:

Apr 17, 2008, 8:31:50 AM (17 years ago)

Author:

Adam Roben

Message:

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.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• xml/XSLStyleSheet.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/WebCore/xml/XSLStyleSheet.cpp

@@ -26 +26 @@
 
 #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"
@@ -140 +142 @@
     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),