Changeset 58516 in webkit

Timestamp:

Apr 29, 2010 7:26:20 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-29 Alex Milowski <​alex@milowski.com>

Reviewed by Kenneth Rohde Christiansen.

Updates to the Qt build to enable building MathML support.

• WebCore.pri:
• WebCore.pro:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.pri (modified) (3 diffs)
• WebCore.pro (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-29  Alex Milowski  <alex@milowski.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Updates to the Qt build to enable building MathML support.
+
+        * WebCore.pri:
+        * WebCore.pro:
+
 2010-04-29  Xan Lopez  <xlopez@igalia.com>
 

trunk/WebCore/WebCore.pri

@@ -167 +167 @@
 
 ## Derived source generators
+MATHML_NAMES = $$PWD/mathml/mathtags.in
+
 WML_NAMES = $$PWD/wml/WMLTagNames.in
 
@@ -210 +212 @@
     $$PWD/css/html.css \
     $$PWD/css/quirks.css \
+    $$PWD/css/mathml.css \
     $$PWD/css/svg.css \
     $$PWD/css/view-source.css \
@@ -593 +596 @@
     xml/XSLTProcessor.idl
 
+contains(DEFINES, ENABLE_MATHML=1) {
+    mathmlnames.output = $${WC_GENERATED_SOURCES_DIR}/MathMLNames.cpp
+    mathmlnames.input = MATHML_NAMES
+    mathmlnames.wkScript = $$PWD/dom/make_names.pl
+    mathmlnames.commands = perl -I$$PWD/bindings/scripts $$mathmlnames.wkScript --tags $$PWD/mathml/mathtags.in --attrs $$PWD/mathml/mathattrs.in --extraDefines \"$${DEFINES}\" --preprocessor \"$${QMAKE_MOC} -E\" --factory --wrapperFactory --outputDir $$WC_GENERATED_SOURCES_DIR
+    mathmlnames.wkExtraSources = $${WC_GENERATED_SOURCES_DIR}/MathMLElementFactory.cpp 
+    addExtraCompiler(mathmlnames)
+}
+
 contains(DEFINES, ENABLE_WML=1) {
     wmlnames.output = $${WC_GENERATED_SOURCES_DIR}/WMLNames.cpp

trunk/WebCore/WebCore.pro

@@ -189 +189 @@
     $$PWD/loader/archive \
     $$PWD/loader/icon \
+    $$PWD/mathml \
     $$PWD/notifications \
     $$PWD/page \
@@ -1484 +1485 @@
     loader/ThreadableLoader.h \
     loader/WorkerThreadableLoader.h \
+    mathml/MathMLElement.h \
+    mathml/MathMLInlineContainerElement.h \
+    mathml/MathMLMathElement.h \
+    mathml/MathMLTextElement.h \
+    mathml/RenderMathMLBlock.h \
+    mathml/RenderMathMLFraction.h \
+    mathml/RenderMathMLMath.h \
+    mathml/RenderMathMLOperator.h \
+    mathml/RenderMathMLRoot.h \
+    mathml/RenderMathMLRow.h \
+    mathml/RenderMathMLSquareRoot.h \
+    mathml/RenderMathMLSubSup.h \
+    mathml/RenderMathMLUnderOver.h \
     notifications/Notification.h \
     notifications/NotificationCenter.h \
@@ -2468 +2482 @@
 }
 
+contains(DEFINES, ENABLE_MATHML=1) {
+    SOURCES += \
+        mathml/MathMLElement.cpp \
+        mathml/MathMLInlineContainerElement.cpp \
+        mathml/MathMLMathElement.cpp \
+        mathml/MathMLTextElement.cpp \
+        mathml/RenderMathMLBlock.cpp \
+        mathml/RenderMathMLFraction.cpp \
+        mathml/RenderMathMLMath.cpp \
+        mathml/RenderMathMLOperator.cpp \
+        mathml/RenderMathMLRoot.cpp \
+        mathml/RenderMathMLRow.cpp \
+        mathml/RenderMathMLSquareRoot.cpp \
+        mathml/RenderMathMLSubSup.cpp \
+        mathml/RenderMathMLUnderOver.cpp
+}
+
 contains(DEFINES, ENABLE_WML=1) {
     SOURCES += \