summaryrefslogtreecommitdiff
path: root/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@digia.com>2013-09-13 12:51:20 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-19 20:50:05 +0200
commitd441d6f39bb846989d95bcf5caf387b42414718d (patch)
treee367e64a75991c554930278175d403c072de6bb8 /Source/WebCore/xml/XSLStyleSheetLibxslt.cpp
parent0060b2994c07842f4c59de64b5e3e430525c4b90 (diff)
downloadqtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit. Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/WebCore/xml/XSLStyleSheetLibxslt.cpp')
-rw-r--r--Source/WebCore/xml/XSLStyleSheetLibxslt.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp b/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp
index 0b8340cd9..8e24b7421 100644
--- a/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp
+++ b/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp
@@ -24,12 +24,12 @@
#if ENABLE(XSLT)
-#include "Console.h"
-#include "DOMWindow.h"
#include "CachedResourceLoader.h"
#include "Document.h"
#include "Frame.h"
#include "Node.h"
+#include "Page.h"
+#include "PageConsole.h"
#include "TransformSource.h"
#include "XMLDocumentParser.h"
#include "XMLDocumentParserScope.h"
@@ -144,9 +144,10 @@ bool XSLStyleSheet::parseString(const String& string)
xmlFreeDoc(m_stylesheetDoc);
m_stylesheetDocTaken = false;
- Console* console = 0;
- if (ownerDocument()->frame())
- console = ownerDocument()->domWindow()->console();
+ PageConsole* console = 0;
+ Frame* frame = ownerDocument()->frame();
+ if (frame && frame->page())
+ console = frame->page()->console();
XMLDocumentParserScope scope(cachedResourceLoader(), XSLTProcessor::genericErrorFunc, XSLTProcessor::parseErrorFunc, console);