[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:44:36 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit b6d46ab7a1d13ba82f226567080716b499aec16a
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Aug 5 15:33:36 2010 +0000
2010-08-05 François Sausset <sausset at gmail.com>
Reviewed by Kenneth Rohde Christiansen.
Add test for basic values of the MathML mathvariant attribute
https://bugs.webkit.org/show_bug.cgi?id=43481
* mathml/presentation/attributes.xhtml:
* platform/mac/mathml/presentation/attributes-expected.checksum:
* platform/mac/mathml/presentation/attributes-expected.png:
* platform/mac/mathml/presentation/attributes-expected.txt:
2010-08-05 François Sausset <sausset at gmail.com>
Reviewed by Kenneth Rohde Christiansen.
Implement basic values of MathML mathvariant attribute
https://bugs.webkit.org/show_bug.cgi?id=43481
Test: mathml/presentation/attributes.xhtml
* css/mathml.css:
(math[mathvariant="normal"], mstyle[mathvariant="normal"], mo[mathvariant="normal"], mn[mathvariant="normal"], mi[mathvariant="normal"], mtext[mathvariant="normal"], mspace[mathvariant="normal"], ms[mathvariant="normal"]):
(math[mathvariant="bold"], mstyle[mathvariant="bold"], mo[mathvariant="bold"], mn[mathvariant="bold"], mi[mathvariant="bold"], mtext[mathvariant="bold"], mspace[mathvariant="bold"], ms[mathvariant="bold"]):
(math[mathvariant="italic"], mstyle[mathvariant="italic"], mo[mathvariant="italic"], mn[mathvariant="italic"], mi[mathvariant="italic"], mtext[mathvariant="italic"], mspace[mathvariant="italic"], ms[mathvariant="italic"]):
(math[mathvariant="bold-italic"], mstyle[mathvariant="bold-italic"], mo[mathvariant="bold-italic"], mn[mathvariant="bold-italic"], mi[mathvariant="bold-italic"], mtext[mathvariant="bold-italic"], mspace[mathvariant="bold-italic"], ms[mathvariant="bold-italic"]):
* mathml/mathattrs.in:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64753 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index bc64261..7026cfb 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-05 François Sausset <sausset at gmail.com>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Add test for basic values of the MathML mathvariant attribute
+ https://bugs.webkit.org/show_bug.cgi?id=43481
+
+ * mathml/presentation/attributes.xhtml:
+ * platform/mac/mathml/presentation/attributes-expected.checksum:
+ * platform/mac/mathml/presentation/attributes-expected.png:
+ * platform/mac/mathml/presentation/attributes-expected.txt:
+
2010-08-05 Pavel Feldman <pfeldman at chromium.org>
Not reviewed. Chromium test expectations update.
diff --git a/LayoutTests/mathml/presentation/attributes.xhtml b/LayoutTests/mathml/presentation/attributes.xhtml
index af2e27d..e8579da 100644
--- a/LayoutTests/mathml/presentation/attributes.xhtml
+++ b/LayoutTests/mathml/presentation/attributes.xhtml
@@ -21,5 +21,13 @@
<mi mathsize="2em">x</mi>
</math>
</p>
+<p id='t3'>font variants:
+<math xmlns='http://www.w3.org/1998/Math/MathML'>
+<mi mathvariant="normal">A</mi>
+<mi mathvariant="bold">A</mi>
+<mi mathvariant="italic">A</mi>
+<mi mathvariant="bold-italic">A</mi>
+</math>
+</p>
</body>
</html>
diff --git a/LayoutTests/platform/mac/mathml/presentation/attributes-expected.checksum b/LayoutTests/platform/mac/mathml/presentation/attributes-expected.checksum
index 6e3c0a8..d52cda7 100644
--- a/LayoutTests/platform/mac/mathml/presentation/attributes-expected.checksum
+++ b/LayoutTests/platform/mac/mathml/presentation/attributes-expected.checksum
@@ -1 +1 @@
-ca66f60b621697f15cd827ff3e41b513
\ No newline at end of file
+573c0ea5a0013b193f34b258498e0a6e
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/mathml/presentation/attributes-expected.png b/LayoutTests/platform/mac/mathml/presentation/attributes-expected.png
index 0935d84..af30235 100644
Binary files a/LayoutTests/platform/mac/mathml/presentation/attributes-expected.png and b/LayoutTests/platform/mac/mathml/presentation/attributes-expected.png differ
diff --git a/LayoutTests/platform/mac/mathml/presentation/attributes-expected.txt b/LayoutTests/platform/mac/mathml/presentation/attributes-expected.txt
index 3326b78..aee06ca 100644
--- a/LayoutTests/platform/mac/mathml/presentation/attributes-expected.txt
+++ b/LayoutTests/platform/mac/mathml/presentation/attributes-expected.txt
@@ -1,8 +1,8 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x128
- RenderBlock {html} at (0,0) size 800x128
- RenderBody {body} at (8,16) size 784x96
+layer at (0,0) size 800x163
+ RenderBlock {html} at (0,0) size 800x163
+ RenderBody {body} at (8,16) size 784x131
RenderBlock {p} at (0,0) size 784x43
RenderText {#text} at (0,13) size 432x18
text run at (0,13) width 432: "following elements should appear in blue on an orange background: "
@@ -45,3 +45,20 @@ layer at (0,0) size 800x128
RenderText {#text} at (24,5) size 14x32
text run at (24,5) width 14: "x"
RenderText {#text} at (0,0) size 0x0
+ RenderBlock {p} at (0,112) size 784x19
+ RenderText {#text} at (0,0) size 86x18
+ text run at (0,0) width 86: "font variants: "
+ RenderBlock {math} at (86,0) size 47x19
+ RenderInline {mi} at (0,0) size 12x16
+ RenderText {#text} at (1,3) size 12x16
+ text run at (1,3) width 12: "A"
+ RenderInline {mi} at (0,0) size 12x16
+ RenderText {#text} at (13,3) size 12x16
+ text run at (13,3) width 12: "A"
+ RenderInline {mi} at (0,0) size 10x16
+ RenderText {#text} at (25,3) size 10x16
+ text run at (25,3) width 10: "A"
+ RenderInline {mi} at (0,0) size 11x16
+ RenderText {#text} at (35,3) size 11x16
+ text run at (35,3) width 11: "A"
+ RenderText {#text} at (0,0) size 0x0
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9aa24a7..69ae890 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-08-05 François Sausset <sausset at gmail.com>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Implement basic values of MathML mathvariant attribute
+ https://bugs.webkit.org/show_bug.cgi?id=43481
+
+ Test: mathml/presentation/attributes.xhtml
+
+ * css/mathml.css:
+ (math[mathvariant="normal"], mstyle[mathvariant="normal"], mo[mathvariant="normal"], mn[mathvariant="normal"], mi[mathvariant="normal"], mtext[mathvariant="normal"], mspace[mathvariant="normal"], ms[mathvariant="normal"]):
+ (math[mathvariant="bold"], mstyle[mathvariant="bold"], mo[mathvariant="bold"], mn[mathvariant="bold"], mi[mathvariant="bold"], mtext[mathvariant="bold"], mspace[mathvariant="bold"], ms[mathvariant="bold"]):
+ (math[mathvariant="italic"], mstyle[mathvariant="italic"], mo[mathvariant="italic"], mn[mathvariant="italic"], mi[mathvariant="italic"], mtext[mathvariant="italic"], mspace[mathvariant="italic"], ms[mathvariant="italic"]):
+ (math[mathvariant="bold-italic"], mstyle[mathvariant="bold-italic"], mo[mathvariant="bold-italic"], mn[mathvariant="bold-italic"], mi[mathvariant="bold-italic"], mtext[mathvariant="bold-italic"], mspace[mathvariant="bold-italic"], ms[mathvariant="bold-italic"]):
+ * mathml/mathattrs.in:
+
2010-08-05 Yury Semikhatsky <yurys at chromium.org>
Reviewed by Pavel Feldman.
diff --git a/WebCore/css/mathml.css b/WebCore/css/mathml.css
index 94a11d0..6929314 100644
--- a/WebCore/css/mathml.css
+++ b/WebCore/css/mathml.css
@@ -94,6 +94,26 @@ math > mo, mrow > mo, mfenced > mo {
padding-right: 0.05em;
}
+math[mathvariant="normal"], mstyle[mathvariant="normal"], mo[mathvariant="normal"], mn[mathvariant="normal"], mi[mathvariant="normal"], mtext[mathvariant="normal"], mspace[mathvariant="normal"], ms[mathvariant="normal"] {
+ font-style: normal;
+ font-weight: normal;
+}
+
+math[mathvariant="bold"], mstyle[mathvariant="bold"], mo[mathvariant="bold"], mn[mathvariant="bold"], mi[mathvariant="bold"], mtext[mathvariant="bold"], mspace[mathvariant="bold"], ms[mathvariant="bold"] {
+ font-style: normal;
+ font-weight: bold;
+}
+
+math[mathvariant="italic"], mstyle[mathvariant="italic"], mo[mathvariant="italic"], mn[mathvariant="italic"], mi[mathvariant="italic"], mtext[mathvariant="italic"], mspace[mathvariant="italic"], ms[mathvariant="italic"] {
+ font-style: italic;
+ font-weight: normal;
+}
+
+math[mathvariant="bold-italic"], mstyle[mathvariant="bold-italic"], mo[mathvariant="bold-italic"], mn[mathvariant="bold-italic"], mi[mathvariant="bold-italic"], mtext[mathvariant="bold-italic"], mspace[mathvariant="bold-italic"], ms[mathvariant="bold-italic"] {
+ font-weight: bold;
+ font-style: italic;
+}
+
math[mathsize="small"], mstyle[mathsize="small"], mo[mathsize="small"], mn[mathsize="small"], mi[mathsize="small"], mtext[mathsize="small"], mspace[mathsize="small"], ms[mathsize="small"] {
font-size: 0.75em;
}
diff --git a/WebCore/mathml/mathattrs.in b/WebCore/mathml/mathattrs.in
index 5431453..373b832 100644
--- a/WebCore/mathml/mathattrs.in
+++ b/WebCore/mathml/mathattrs.in
@@ -10,6 +10,7 @@ linethickness
mathbackground
mathcolor
mathsize
+mathvariant
numalign
open
separators
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list