[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 11:10:50 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 2b352d8ffc22b1423f3e4bcf882d422c0c0ca649
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jul 14 16:21:23 2010 +0000
2010-07-14 Lucas De Marchi <lucas.demarchi at profusion.mobi>
Reviewed by Antonio Gomes.
Generate MathML files with CMake even if MathML is disabled. This
fixes EFL build after r63274.
https://bugs.webkit.org/show_bug.cgi?id=42263
No new functionality, so no new tests.
* CMakeLists.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63325 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/CMakeLists.txt b/WebCore/CMakeLists.txt
index 8488c2c..2ec1525 100644
--- a/WebCore/CMakeLists.txt
+++ b/WebCore/CMakeLists.txt
@@ -19,6 +19,7 @@ SET(WebCore_INCLUDE_DIRECTORIES
"${WEBCORE_DIR}/loader/appcache"
"${WEBCORE_DIR}/loader/archive"
"${WEBCORE_DIR}/loader/icon"
+ "${WEBCORE_DIR}/mathml"
"${WEBCORE_DIR}/notifications"
"${WEBCORE_DIR}/page"
"${WEBCORE_DIR}/page/animation"
@@ -525,6 +526,7 @@ SET(WebCore_SOURCES
${DERIVED_SOURCES_DIR}/HTMLElementFactory.cpp
${DERIVED_SOURCES_DIR}/HTMLEntityNames.cpp
${DERIVED_SOURCES_DIR}/HTMLNames.cpp
+ ${DERIVED_SOURCES_DIR}/MathMLNames.cpp
${DERIVED_SOURCES_DIR}/JSHTMLElementWrapperFactory.cpp
${DERIVED_SOURCES_DIR}/UserAgentStyleSheetsData.cpp
${DERIVED_SOURCES_DIR}/XMLNames.cpp
@@ -1112,6 +1114,20 @@ SET(WebCore_SOURCES
loader/icon/PageURLRecord.cpp
loader/loader.cpp
+ 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
+
page/BarInfo.cpp
page/Chrome.cpp
page/Console.cpp
@@ -1743,9 +1759,11 @@ ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/platform/graphics/Color.cpp Color
ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp tokenizer.cpp)
ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/html/LegacyPreloadScanner.cpp HTMLEntityNames.cpp)
ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/html/HTMLEntityParser.cpp HTMLEntityNames.cpp)
+ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/html/HTMLTreeBuilder.cpp MathMLNames.cpp)
ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSStyleSelector.cpp UserAgentStyleSheetsData.cpp UserAgentStyleSheets.h)
GENERATE_DOM_NAMES_FACTORY(HTML ${WEBCORE_DIR}/html/HTMLTagNames.in ${WEBCORE_DIR}/html/HTMLAttributeNames.in "${HTML_FEATURES}")
+GENERATE_DOM_NAMES_FACTORY(MathML ${WEBCORE_DIR}/mathml/mathtags.in ${WEBCORE_DIR}/mathml/mathattrs.in "${MATHML_FEATURES}")
GENERATE_DOM_NAMES_FACTORY(SVG ${WEBCORE_DIR}/svg/svgtags.in ${WEBCORE_DIR}/svg/svgattrs.in "${SVG_FEATURES}")
GENERATE_DOM_NAMES_ONLY(XLink ${WEBCORE_DIR}/svg/xlinkattrs.in)
GENERATE_DOM_NAMES_ONLY(XMLNS ${WEBCORE_DIR}/xml/xmlnsattrs.in)
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e6bcc0c..c5d3f6e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-14 Lucas De Marchi <lucas.demarchi at profusion.mobi>
+
+ Reviewed by Antonio Gomes.
+
+ Generate MathML files with CMake even if MathML is disabled. This
+ fixes EFL build after r63274.
+ https://bugs.webkit.org/show_bug.cgi?id=42263
+
+ No new functionality, so no new tests.
+
+ * CMakeLists.txt:
+
2010-07-14 Martin Robinson <mrobinson at igalia.com>
Reviewed by Xan Lopez.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list