[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 13:08:34 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit efc690f89aa6bbab8c26e6bbb66fba59b712d221
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Sep 7 19:31:04 2010 +0000
2010-09-07 François Sausset <sausset at gmail.com>
Reviewed by Beth Dakin.
Update to test the display attribute on the math element.
https://bugs.webkit.org/show_bug.cgi?id=44206
* 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-09-07 François Sausset <sausset at gmail.com>
Reviewed by Beth Dakin.
<math> element should be centered when display attribute set to block.
https://bugs.webkit.org/show_bug.cgi?id=44206
Test: mathml/presentation/attributes.xhtml
* css/mathml.css:
(math[display="block"]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66899 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 5c5f226..f0d7637 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-07 François Sausset <sausset at gmail.com>
+
+ Reviewed by Beth Dakin.
+
+ Update to test the display attribute on the math element.
+ https://bugs.webkit.org/show_bug.cgi?id=44206
+
+ * 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-09-07 Simon Fraser <simon.fraser at apple.com>
Reviewed by Chris Marrin.
diff --git a/LayoutTests/mathml/presentation/attributes.xhtml b/LayoutTests/mathml/presentation/attributes.xhtml
index b45ced5..38e213b 100644
--- a/LayoutTests/mathml/presentation/attributes.xhtml
+++ b/LayoutTests/mathml/presentation/attributes.xhtml
@@ -40,5 +40,13 @@
<mtext fontweight="bold">A</mtext>
</math>
</p>
+<p id='t5'>following element should be inline:
+<math xmlns='http://www.w3.org/1998/Math/MathML' display="inline">
+<mi>x</mi>
+</math>, and this one centered on a new line:
+<math xmlns='http://www.w3.org/1998/Math/MathML' display="block">
+<mi>x</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 451865c..2ab7433 100644
--- a/LayoutTests/platform/mac/mathml/presentation/attributes-expected.checksum
+++ b/LayoutTests/platform/mac/mathml/presentation/attributes-expected.checksum
@@ -1 +1 @@
-684bc130d96bc4b74df32b4b69116b31
\ No newline at end of file
+070cceaa35396ff11a98988d9fca59d1
\ 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 0c6b146..0e09f4d 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 2971ddb..d5b1246 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 800x216
- RenderBlock {html} at (0,0) size 800x216
- RenderBody {body} at (8,16) size 784x184
+layer at (0,0) size 800x270
+ RenderBlock {html} at (0,0) size 800x270
+ RenderBody {body} at (8,16) size 784x238
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: "
@@ -91,3 +91,17 @@ layer at (0,0) size 800x216
RenderText {#text} at (45,16) size 12x16
text run at (45,16) width 12: "A"
RenderText {#text} at (0,0) size 0x0
+ RenderBlock {p} at (0,200) size 784x38
+ RenderBlock (anonymous) at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 226x18
+ text run at (0,0) width 226: "following element should be inline: "
+ RenderBlock {math} at (226,0) size 9x19
+ RenderInline {mi} at (0,0) size 7x16
+ RenderText {#text} at (1,3) size 7x16
+ text run at (1,3) width 7: "x"
+ RenderText {#text} at (235,0) size 234x18
+ text run at (235,0) width 234: ", and this one centered on a new line:"
+ RenderBlock {math} at (0,19) size 784x19
+ RenderInline {mi} at (0,0) size 7x16
+ RenderText {#text} at (388,3) size 7x16
+ text run at (388,3) width 7: "x"
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 75d0c0b..8a582f4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-07 François Sausset <sausset at gmail.com>
+
+ Reviewed by Beth Dakin.
+
+ <math> element should be centered when display attribute set to block.
+ https://bugs.webkit.org/show_bug.cgi?id=44206
+
+ Test: mathml/presentation/attributes.xhtml
+
+ * css/mathml.css:
+ (math[display="block"]):
+
2010-09-07 Eric Carlson <eric.carlson at apple.com>
Reviewed by Darin Adler.
diff --git a/WebCore/css/mathml.css b/WebCore/css/mathml.css
index a5df17c..7cf9866 100644
--- a/WebCore/css/mathml.css
+++ b/WebCore/css/mathml.css
@@ -16,6 +16,9 @@ math[display="block"] {
display: block;
page-break-inside: avoid;
margin-bottom: 1em;
+ text-align: center;
+ margin-left: auto;
+ margin-right: auto;
}
math > * {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list