[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75
jmalonzo at webkit.org
jmalonzo at webkit.org
Thu Oct 29 20:47:13 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 89e722b0729f7e127c8f4c1d35b455fcf3fffe63
Author: jmalonzo at webkit.org <jmalonzo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Oct 18 19:29:49 2009 +0000
2009-10-18 Jan Michael Alonzo <jmalonzo at webkit.org>
Reviewed by Holger Freyther.
[GTK] Add MathML to the build system
https://bugs.webkit.org/show_bug.cgi?id=30487
Add --enable-mathml to configure.
* configure.ac:
Add MathML sources if MathML support is enabled.
* GNUmakefile.am:
Include layout test baseline for Gtk.
* platform/gtk/mathml/presentation/sub-expected.txt: Added.
* platform/gtk/mathml/presentation/sup-expected.txt: Added.
* platform/gtk/mathml/presentation/tables-expected.txt: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49755 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/ChangeLog b/ChangeLog
index 7f9f1c8..fb7dddf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-18 Jan Michael Alonzo <jmalonzo at webkit.org>
+
+ Reviewed by Holger Freyther.
+
+ [GTK] Add MathML to the build system
+ https://bugs.webkit.org/show_bug.cgi?id=30487
+
+ Add --enable-mathml to configure.
+
+ * configure.ac:
+
2009-10-15 Jan Michael Alonzo <jmalonzo at webkit.org>
Reviewed by Xan Lopez.
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 6c80e05..81c47b2 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2009-10-18 Jan Michael Alonzo <jmalonzo at webkit.org>
+
+ Reviewed by Holger Freyther.
+
+ [GTK] Add MathML to the build system
+ https://bugs.webkit.org/show_bug.cgi?id=30487
+
+ Include layout test baseline for Gtk.
+
+ * platform/gtk/mathml/presentation/sub-expected.txt: Added.
+ * platform/gtk/mathml/presentation/sup-expected.txt: Added.
+ * platform/gtk/mathml/presentation/tables-expected.txt: Added.
+
2009-10-18 Simon Fraser <simon.fraser at apple.com>
Reviewed by Dan Bernstein.
diff --git a/LayoutTests/platform/gtk/mathml/presentation/sub-expected.txt b/LayoutTests/platform/gtk/mathml/presentation/sub-expected.txt
new file mode 100644
index 0000000..edc1386
--- /dev/null
+++ b/LayoutTests/platform/gtk/mathml/presentation/sub-expected.txt
@@ -0,0 +1,19 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x52
+ RenderBlock {html} at (0,0) size 800x52
+ RenderBody {body} at (8,16) size 784x20
+ RenderBlock {p} at (0,0) size 784x20
+ RenderText {#text} at (0,0) size 64x20
+ text run at (0,0) width 64: "subscript: "
+ RenderInline {math} at (0,0) size 16x20
+ RenderText {#text} at (0,0) size 0x0
+ RenderInline {msub} at (0,0) size 16x20
+ RenderInline {mi} at (0,0) size 8x20
+ RenderText {#text} at (64,0) size 8x20
+ text run at (64,0) width 8: "x"
+ RenderInline {mn} at (0,0) size 8x20
+ RenderText {#text} at (72,0) size 8x20
+ text run at (72,0) width 8: "1"
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/mathml/presentation/sup-expected.txt b/LayoutTests/platform/gtk/mathml/presentation/sup-expected.txt
new file mode 100644
index 0000000..fa55ccc
--- /dev/null
+++ b/LayoutTests/platform/gtk/mathml/presentation/sup-expected.txt
@@ -0,0 +1,19 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x52
+ RenderBlock {html} at (0,0) size 800x52
+ RenderBody {body} at (8,16) size 784x20
+ RenderBlock {p} at (0,0) size 784x20
+ RenderText {#text} at (0,0) size 76x20
+ text run at (0,0) width 76: "superscript: "
+ RenderInline {math} at (0,0) size 16x20
+ RenderText {#text} at (0,0) size 0x0
+ RenderInline {msup} at (0,0) size 16x20
+ RenderInline {mi} at (0,0) size 8x20
+ RenderText {#text} at (76,0) size 8x20
+ text run at (76,0) width 8: "x"
+ RenderInline {mn} at (0,0) size 8x20
+ RenderText {#text} at (84,0) size 8x20
+ text run at (84,0) width 8: "2"
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/mathml/presentation/tables-expected.txt b/LayoutTests/platform/gtk/mathml/presentation/tables-expected.txt
new file mode 100644
index 0000000..7257c54
--- /dev/null
+++ b/LayoutTests/platform/gtk/mathml/presentation/tables-expected.txt
@@ -0,0 +1,112 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x52
+ RenderBlock {html} at (0,0) size 800x52
+ RenderBody {body} at (8,16) size 784x20
+ RenderBlock {p} at (0,0) size 784x20
+ RenderText {#text} at (0,0) size 49x20
+ text run at (0,0) width 49: "simple: "
+ RenderInline {math} at (0,0) size 242x20
+ RenderText {#text} at (0,0) size 0x0
+ RenderInline {mtable} at (0,0) size 242x20
+ RenderText {#text} at (0,0) size 0x0
+ RenderInline {mtr} at (0,0) size 81x20
+ RenderText {#text} at (0,0) size 0x0
+ RenderInline {mtd} at (0,0) size 23x20
+ RenderInline {msub} at (0,0) size 23x20
+ RenderInline {mi} at (0,0) size 7x20
+ RenderText {#text} at (49,0) size 7x20
+ text run at (49,0) width 7: "a"
+ RenderInline {mn} at (0,0) size 16x20
+ RenderText {#text} at (56,0) size 16x20
+ text run at (56,0) width 16: "11"
+ RenderText {#text} at (72,0) size 4x20
+ text run at (72,0) width 4: " "
+ RenderInline {mtd} at (0,0) size 23x20
+ RenderInline {msub} at (0,0) size 23x20
+ RenderInline {mi} at (0,0) size 7x20
+ RenderText {#text} at (76,0) size 7x20
+ text run at (76,0) width 7: "a"
+ RenderInline {mn} at (0,0) size 16x20
+ RenderText {#text} at (83,0) size 16x20
+ text run at (83,0) width 16: "12"
+ RenderText {#text} at (99,0) size 4x20
+ text run at (99,0) width 4: " "
+ RenderInline {mtd} at (0,0) size 23x20
+ RenderInline {msub} at (0,0) size 23x20
+ RenderInline {mi} at (0,0) size 7x20
+ RenderText {#text} at (103,0) size 7x20
+ text run at (103,0) width 7: "a"
+ RenderInline {mn} at (0,0) size 16x20
+ RenderText {#text} at (110,0) size 16x20
+ text run at (110,0) width 16: "13"
+ RenderText {#text} at (126,0) size 4x20
+ text run at (126,0) width 4: " "
+ RenderText {#text} at (0,0) size 0x0
+ RenderInline {mtr} at (0,0) size 84x20
+ RenderText {#text} at (0,0) size 0x0
+ RenderInline {mtd} at (0,0) size 24x20
+ RenderInline {msub} at (0,0) size 24x20
+ RenderInline {mi} at (0,0) size 8x20
+ RenderText {#text} at (130,0) size 8x20
+ text run at (130,0) width 8: "b"
+ RenderInline {mn} at (0,0) size 16x20
+ RenderText {#text} at (138,0) size 16x20
+ text run at (138,0) width 16: "21"
+ RenderText {#text} at (154,0) size 4x20
+ text run at (154,0) width 4: " "
+ RenderInline {mtd} at (0,0) size 24x20
+ RenderInline {msub} at (0,0) size 24x20
+ RenderInline {mi} at (0,0) size 8x20
+ RenderText {#text} at (158,0) size 8x20
+ text run at (158,0) width 8: "b"
+ RenderInline {mn} at (0,0) size 16x20
+ RenderText {#text} at (166,0) size 16x20
+ text run at (166,0) width 16: "22"
+ RenderText {#text} at (182,0) size 4x20
+ text run at (182,0) width 4: " "
+ RenderInline {mtd} at (0,0) size 24x20
+ RenderInline {msub} at (0,0) size 24x20
+ RenderInline {mi} at (0,0) size 8x20
+ RenderText {#text} at (186,0) size 8x20
+ text run at (186,0) width 8: "b"
+ RenderInline {mn} at (0,0) size 16x20
+ RenderText {#text} at (194,0) size 16x20
+ text run at (194,0) width 16: "23"
+ RenderText {#text} at (210,0) size 4x20
+ text run at (210,0) width 4: " "
+ RenderText {#text} at (0,0) size 0x0
+ RenderInline {mtr} at (0,0) size 77x20
+ RenderText {#text} at (0,0) size 0x0
+ RenderInline {mtd} at (0,0) size 23x20
+ RenderInline {msub} at (0,0) size 23x20
+ RenderInline {mi} at (0,0) size 7x20
+ RenderText {#text} at (214,0) size 7x20
+ text run at (214,0) width 7: "c"
+ RenderInline {mn} at (0,0) size 16x20
+ RenderText {#text} at (221,0) size 16x20
+ text run at (221,0) width 16: "31"
+ RenderText {#text} at (237,0) size 4x20
+ text run at (237,0) width 4: " "
+ RenderInline {mtd} at (0,0) size 23x20
+ RenderInline {msub} at (0,0) size 23x20
+ RenderInline {mi} at (0,0) size 7x20
+ RenderText {#text} at (241,0) size 7x20
+ text run at (241,0) width 7: "c"
+ RenderInline {mn} at (0,0) size 16x20
+ RenderText {#text} at (248,0) size 16x20
+ text run at (248,0) width 16: "32"
+ RenderText {#text} at (264,0) size 4x20
+ text run at (264,0) width 4: " "
+ RenderInline {mtd} at (0,0) size 23x20
+ RenderInline {msub} at (0,0) size 23x20
+ RenderInline {mi} at (0,0) size 7x20
+ RenderText {#text} at (268,0) size 7x20
+ text run at (268,0) width 7: "c"
+ RenderInline {mn} at (0,0) size 16x20
+ RenderText {#text} at (275,0) size 16x20
+ text run at (275,0) width 16: "33"
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d8d0eff..4e645cf 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-18 Jan Michael Alonzo <jmalonzo at webkit.org>
+
+ Reviewed by Holger Freyther.
+
+ [GTK] Add MathML to the build system
+ https://bugs.webkit.org/show_bug.cgi?id=30487
+
+ Add MathML sources if MathML support is enabled.
+
+ * GNUmakefile.am:
+
2009-10-18 Kevin Ollivier <kevino at theolliviers.com>
Non-PCH build fix. Added missing header.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index f12c811..588ac0f 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -2628,6 +2628,47 @@ webcoregtk_sources += \
endif # END ENABLE_GEOLOCATION
# ----
+# MathML support
+# ----
+if ENABLE_MATHML
+
+FEATURE_DEFINES_JAVASCRIPT += ENABLE_MATHML=1
+
+webcore_cppflags += \
+ -I$(srcdir)/WebCore/mathml \
+ -DENABLE_MATHML=1
+
+webcore_sources += \
+ WebCore/mathml/MathMLElement.cpp \
+ WebCore/mathml/MathMLElement.h \
+ WebCore/mathml/MathMLInlineContainerElement.cpp \
+ WebCore/mathml/MathMLInlineContainerElement.h \
+ WebCore/mathml/MathMLMathElement.cpp \
+ WebCore/mathml/MathMLMathElement.h
+
+webcore_built_sources += \
+ DerivedSources/MathMLElementFactory.cpp \
+ DerivedSources/MathMLElementFactory.h \
+ DerivedSources/MathMLNames.cpp \
+ DerivedSources/MathMLNames.h
+
+# MathML tag and attribute names, and element factory
+DerivedSources/MathMLElementFactory.h: DerivedSources/MathMLElementFactory.cpp
+
+DerivedSources/MathMLNames.h: DerivedSources/MathMLNames.cpp
+
+DerivedSources/MathMLElementFactory.cpp DerivedSources/MathMLNames.cpp: $(WebCore)/dom/make_names.pl $(WebCore)/mathml/mathtags.in
+ $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $< --tags $(WebCore)/mathml/mathtags.in --factory --wrapperFactory --outputDir "$(GENSOURCES)"
+else
+DerivedSources/MathMLElementFactory.cpp:
+ echo > $@
+
+DerivedSources/MathMLNames.cpp:
+ echo > $@
+
+endif # END ENABLE_MATHML
+
+# ----
# Notifications support
# ----
if ENABLE_NOTIFICATIONS
@@ -3363,6 +3404,7 @@ DerivedSources/CSSGrammar.cpp: $(WebCore)/css/CSSGrammar.y
# user agent style sheets
USER_AGENT_STYLE_SHEETS = \
$(WebCore)/css/html.css \
+ $(WebCore)/css/mathml.css \
$(WebCore)/css/quirks.css \
$(WebCore)/css/view-source.css \
$(WebCore)/css/svg.css \
diff --git a/configure.ac b/configure.ac
index c881935..1073324 100644
--- a/configure.ac
+++ b/configure.ac
@@ -411,6 +411,14 @@ AC_ARG_ENABLE(geolocation,
[],[enable_geolocation="no"])
AC_MSG_RESULT([$enable_geolocation])
+# check whether to enable MathML support
+AC_MSG_CHECKING([whether to enable MathML support])
+AC_ARG_ENABLE(mathml,
+ AC_HELP_STRING([--enable-mathml],
+ [enable support for MathML [default=no]]),
+ [],[enable_mathml="no"])
+AC_MSG_RESULT([$enable_mathml])
+
# check whether to enable SVG support
AC_MSG_CHECKING([whether to enable SVG support])
AC_ARG_ENABLE(svg,
@@ -747,6 +755,7 @@ AM_CONDITIONAL([ENABLE_XPATH],[test "$enable_xpath" = "yes"])
AM_CONDITIONAL([ENABLE_XSLT],[test "$enable_xslt" = "yes"])
AM_CONDITIONAL([ENABLE_FILTERS],[test "$enable_filters" = "yes"])
AM_CONDITIONAL([ENABLE_GEOLOCATION], [test "$enable_geolocation" = "yes"])
+AM_CONDITIONAL([ENABLE_MATHML], [test "$enable_mathml" = "yes"])
AM_CONDITIONAL([ENABLE_RUBY],[test "$enable_ruby" = "yes"])
AM_CONDITIONAL([ENABLE_VIDEO],[test "$enable_video" = "yes"])
AM_CONDITIONAL([ENABLE_NOTIFICATIONS],[test "$enable_notifications" = "yes"])
@@ -798,6 +807,7 @@ Features:
Filters support : $enable_filters
Geolocation support : $enable_geolocation
JavaScript debugger/profiler support : $enable_javascript_debugger
+ MathML support : $enable_mathml
HTML5 offline web applications support : $enable_offline_web_applications
HTML5 channel messaging support : $enable_channel_messaging
HTML5 client-side session and persistent storage support : $enable_dom_storage
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list