Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (89515 => 89516)
--- trunk/Source/_javascript_Core/ChangeLog 2011-06-23 01:34:11 UTC (rev 89515)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-06-23 01:36:42 UTC (rev 89516)
@@ -1,3 +1,12 @@
+2011-06-22 Yael Aharon <yael.aha...@nokia.com>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] Add a build flag for building with libxml2 and libxslt.
+ https://bugs.webkit.org/show_bug.cgi?id=63113
+
+ * wtf/Platform.h:
+
2011-06-22 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r89489.
Modified: trunk/Source/_javascript_Core/wtf/Platform.h (89515 => 89516)
--- trunk/Source/_javascript_Core/wtf/Platform.h 2011-06-23 01:34:11 UTC (rev 89515)
+++ trunk/Source/_javascript_Core/wtf/Platform.h 2011-06-23 01:36:42 UTC (rev 89516)
@@ -1117,9 +1117,11 @@
/* Use the QXmlStreamReader implementation for XMLDocumentParser */
/* Use the QXmlQuery implementation for XSLTProcessor */
#if PLATFORM(QT)
+#if !USE(LIBXML2)
#define WTF_USE_QXMLSTREAM 1
#define WTF_USE_QXMLQUERY 1
#endif
+#endif
#if PLATFORM(MAC)
/* Complex text framework */
Modified: trunk/Source/WebCore/ChangeLog (89515 => 89516)
--- trunk/Source/WebCore/ChangeLog 2011-06-23 01:34:11 UTC (rev 89515)
+++ trunk/Source/WebCore/ChangeLog 2011-06-23 01:36:42 UTC (rev 89516)
@@ -1,3 +1,18 @@
+2011-06-22 Yael Aharon <yael.aha...@nokia.com>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] Add a build flag for building with libxml2 and libxslt.
+ https://bugs.webkit.org/show_bug.cgi?id=63113
+
+ No new tests. If this new flag was set by default, we could unskip
+ existing xmlviewer tests.
+
+ * CodeGenerators.pri:
+ * WebCore.pri:
+ * WebCore.pro:
+ * features.pri:
+
2011-06-22 Ryosuke Niwa <rn...@webkit.org>
Yet another build fix after r89472.
Modified: trunk/Source/WebCore/CodeGenerators.pri (89515 => 89516)
--- trunk/Source/WebCore/CodeGenerators.pri 2011-06-23 01:34:11 UTC (rev 89515)
+++ trunk/Source/WebCore/CodeGenerators.pri 2011-06-23 01:36:42 UTC (rev 89516)
@@ -22,6 +22,13 @@
CSSBISON = $$PWD/css/CSSGrammar.y
+contains(DEFINES, ENABLE_XSLT=1) {
+ contains(DEFINES, WTF_USE_LIBXML2=1) {
+ XMLVIEWER_CSS = $$PWD/xml/XMLViewer.css
+ XMLVIEWER_JS = $$PWD/xml/XMLViewer.js
+ }
+}
+
HTML_NAMES = $$PWD/html/HTMLTagNames.in
XML_NAMES = $$PWD/xml/xmlattrs.in
@@ -777,6 +784,30 @@
colordata.depends = $$PWD/make-hash-tools.pl
addExtraCompiler(colordata)
+contains(DEFINES, ENABLE_XSLT=1) {
+contains(DEFINES, WTF_USE_LIBXML2=1) {
+# GENERATOR 8-D:
+xmlviewercss.output = $${WC_GENERATED_SOURCES_DIR}/XMLViewerCSS.h
+xmlviewercss.input = XMLVIEWER_CSS
+xmlviewercss.wkScript = $$PWD/inspector/xxd.pl
+xmlviewercss.commands = perl $$xmlviewercss.wkScript XMLViewer_css $$XMLVIEWER_CSS $${WC_GENERATED_SOURCES_DIR}/XMLViewerCSS.h
+xmlviewercss.clean = ${QMAKE_FILE_OUT}
+xmlviewercss.depends = $$PWD/inspector/xxd.pl
+xmlviewercss.wkAddOutputToSources = false
+addExtraCompiler(xmlviewercss)
+
+# GENERATOR 8-E:
+xmlviewerjs.output = $${WC_GENERATED_SOURCES_DIR}/XMLViewerJS.h
+xmlviewerjs.input = XMLVIEWER_JS
+xmlviewerjs.wkScript = $$PWD/inspector/xxd.pl
+xmlviewerjs.commands = perl $$xmlviewerjs.wkScript XMLViewer_js $$XMLVIEWER_JS $${WC_GENERATED_SOURCES_DIR}/XMLViewerJS.h
+xmlviewerjs.clean = ${QMAKE_FILE_OUT}
+xmlviewerjs.depends = $$PWD/inspector/xxd.pl
+xmlviewerjs.wkAddOutputToSources = false
+addExtraCompiler(xmlviewerjs)
+}
+}
+
# GENERATOR 9:
stylesheets.wkScript = $$PWD/css/make-css-file-arrays.pl
stylesheets.output = $${WC_GENERATED_SOURCES_DIR}/UserAgentStyleSheetsData.cpp
Modified: trunk/Source/WebCore/WebCore.pri (89515 => 89516)
--- trunk/Source/WebCore/WebCore.pri 2011-06-23 01:34:11 UTC (rev 89515)
+++ trunk/Source/WebCore/WebCore.pri 2011-06-23 01:36:42 UTC (rev 89516)
@@ -167,9 +167,17 @@
}
contains(DEFINES, ENABLE_XSLT=1) {
- QT *= xmlpatterns
+ contains(DEFINES, WTF_USE_LIBXML2=1) {
+ PKGCONFIG += libxslt
+ } else {
+ QT *= xmlpatterns
+ }
}
+contains(DEFINES, WTF_USE_LIBXML2=1) {
+ PKGCONFIG += libxml-2.0
+}
+
contains(DEFINES, ENABLE_SQLITE=1) {
!system-sqlite:exists( $${SQLITE3SRCDIR}/sqlite3.c ) {
INCLUDEPATH += $${SQLITE3SRCDIR}
Modified: trunk/Source/WebCore/WebCore.pro (89515 => 89516)
--- trunk/Source/WebCore/WebCore.pro 2011-06-23 01:34:11 UTC (rev 89515)
+++ trunk/Source/WebCore/WebCore.pro 2011-06-23 01:36:42 UTC (rev 89516)
@@ -565,7 +565,6 @@
dom/WheelEvent.cpp \
dom/WindowEventContext.cpp \
dom/XMLDocumentParser.cpp \
- dom/XMLDocumentParserQt.cpp \
dom/default/PlatformMessagePortChannel.cpp \
editing/AppendNodeCommand.cpp \
editing/ApplyBlockElementCommand.cpp \
@@ -2588,6 +2587,9 @@
platform/qt/WheelEventQt.cpp \
platform/qt/WidgetQt.cpp
+!contains(DEFINES, WTF_USE_LIBXML2=1) {
+ SOURCES += dom/XMLDocumentParserQt.cpp
+}
contains(DEFINES, WTF_USE_QT_MOBILE_THEME=1) {
HEADERS += platform/qt/QtMobileWebStyle.h
@@ -3079,11 +3081,36 @@
SOURCES += \
bindings/js/JSXSLTProcessorCustom.cpp
}
- SOURCES += \
- dom/TransformSourceQt.cpp \
- xml/XSLStyleSheetQt.cpp \
- xml/XSLTProcessor.cpp \
- xml/XSLTProcessorQt.cpp
+
+ contains(DEFINES, WTF_USE_LIBXML2=1) {
+ SOURCES += \
+ xml/XSLTProcessor.cpp \
+ xml/XSLTProcessorLibxslt.cpp \
+ dom/TransformSourceLibxslt.cpp \
+ xml/XSLStyleSheetLibxslt.cpp \
+ xml/XSLImportRule.cpp \
+ xml/XSLTExtensions.cpp \
+ xml/XSLImportRule.cpp \
+ xml/XSLTUnicodeSort.cpp \
+ xml/XMLTreeViewer.cpp \
+ dom/XMLDocumentParserLibxml2.cpp \
+ dom/XMLDocumentParserScope.cpp
+
+ HEADERS += \
+ xml/XSLImportRule.h \
+ xml/XSLTExtensions.h \
+ xml/XSLImportRule.h \
+ xml/XSLTUnicodeSort.h \
+ xml/XMLTreeViewer.h \
+ dom/XMLDocumentParserScope.h
+
+ } else {
+ SOURCES += \
+ dom/TransformSourceQt.cpp \
+ xml/XSLStyleSheetQt.cpp \
+ xml/XSLTProcessor.cpp \
+ xml/XSLTProcessorQt.cpp
+ }
}
contains(DEFINES, ENABLE_FILTERS=1) {
Modified: trunk/Source/WebCore/features.pri (89515 => 89516)
--- trunk/Source/WebCore/features.pri 2011-06-23 01:34:11 UTC (rev 89515)
+++ trunk/Source/WebCore/features.pri 2011-06-23 01:36:42 UTC (rev 89516)
@@ -128,6 +128,11 @@
else:DEFINES += ENABLE_XSLT=0
}
+# This is experimental and only works on Linux so far.
+contains(DEFINES, WTF_USE_LIBXML2=1) {
+ DEFINES += ENABLE_XSLT=1
+}
+
# geolocation support if QtMobility exists
!CONFIG(QTDIR_build):!contains(DEFINES, ENABLE_GEOLOCATION=.) {
contains(MOBILITY_CONFIG, location) {
