[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9
eric at webkit.org
eric at webkit.org
Thu Feb 4 21:31:37 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit fa15d4f96e3e04162302660ec0ede668084f3e74
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 29 00:57:49 2010 +0000
2010-01-28 Alex Milowski <alex at milowski.com>
Reviewed by Eric Seidel.
Updates from CSS change for mathml.css
* platform/mac/mathml/presentation/sub-expected.txt:
* platform/mac/mathml/presentation/sup-expected.txt:
* platform/mac/mathml/presentation/tables-expected.checksum:
* platform/mac/mathml/presentation/tables-expected.png:
* platform/mac/mathml/presentation/tables-expected.txt:
2010-01-28 Alex Milowski <alex at milowski.com>
Reviewed by Eric Seidel.
Update to CSS to remove unnecessary line-height settings
* css/mathml.css:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54029 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 69c6f50..7b3ebd9 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-28 Alex Milowski <alex at milowski.com>
+
+ Reviewed by Eric Seidel.
+
+ Updates from CSS change for mathml.css
+
+ * platform/mac/mathml/presentation/sub-expected.txt:
+ * platform/mac/mathml/presentation/sup-expected.txt:
+ * platform/mac/mathml/presentation/tables-expected.checksum:
+ * platform/mac/mathml/presentation/tables-expected.png:
+ * platform/mac/mathml/presentation/tables-expected.txt:
+
2010-01-28 Gustavo Noronha Silva <gns at gnome.org>
Reviewed by Eric Carlson.
diff --git a/LayoutTests/platform/mac/mathml/presentation/sub-expected.txt b/LayoutTests/platform/mac/mathml/presentation/sub-expected.txt
index 8c9e1be..156c65b 100644
--- a/LayoutTests/platform/mac/mathml/presentation/sub-expected.txt
+++ b/LayoutTests/platform/mac/mathml/presentation/sub-expected.txt
@@ -1,17 +1,17 @@
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
+layer at (0,0) size 800x54
+ RenderBlock {html} at (0,0) size 800x54
+ RenderBody {body} at (8,16) size 784x22
+ RenderBlock {p} at (0,0) size 784x22
RenderText {#text} at (0,0) size 64x18
text run at (0,0) width 64: "subscript: "
- RenderBlock {math} at (64,3) size 13x17
- RenderBlock {msub} at (0,0) size 13x17
+ RenderBlock {math} at (64,2) size 13x20
+ RenderBlock {msub} at (0,0) size 13x20
RenderInline {mi} at (0,0) size 7x16
- RenderText {#text} at (0,0) size 7x16
- text run at (0,0) width 7: "x"
+ RenderText {#text} at (0,1) size 7x16
+ text run at (0,1) width 7: "x"
RenderInline {mn} at (0,0) size 6x12
- RenderText {#text} at (7,7) size 6x12
- text run at (7,7) width 6: "1"
+ RenderText {#text} at (7,8) size 6x12
+ text run at (7,8) width 6: "1"
RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac/mathml/presentation/sup-expected.txt b/LayoutTests/platform/mac/mathml/presentation/sup-expected.txt
index cb212ea..e2904eb 100644
--- a/LayoutTests/platform/mac/mathml/presentation/sup-expected.txt
+++ b/LayoutTests/platform/mac/mathml/presentation/sup-expected.txt
@@ -6,12 +6,12 @@ layer at (0,0) size 800x51
RenderBlock {p} at (0,0) size 784x19
RenderText {#text} at (0,0) size 76x18
text run at (0,0) width 76: "superscript: "
- RenderBlock {math} at (76,1) size 13x18
- RenderBlock {msup} at (0,0) size 13x18
+ RenderBlock {math} at (76,0) size 13x19
+ RenderBlock {msup} at (0,0) size 13x19
RenderInline {mi} at (0,0) size 7x16
- RenderText {#text} at (0,2) size 7x16
- text run at (0,2) width 7: "x"
+ RenderText {#text} at (0,3) size 7x16
+ text run at (0,3) width 7: "x"
RenderInline {mn} at (0,0) size 6x12
- RenderText {#text} at (7,-1) size 6x12
- text run at (7,-1) width 6: "2"
+ RenderText {#text} at (7,0) size 6x12
+ text run at (7,0) width 6: "2"
RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac/mathml/presentation/tables-expected.checksum b/LayoutTests/platform/mac/mathml/presentation/tables-expected.checksum
index c65cb94..0b753aa 100644
--- a/LayoutTests/platform/mac/mathml/presentation/tables-expected.checksum
+++ b/LayoutTests/platform/mac/mathml/presentation/tables-expected.checksum
@@ -1 +1 @@
-cbcece8221f188a83926eecbaec4c0bc
\ No newline at end of file
+1e5ea870241858b5733bb278f3632612
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/mathml/presentation/tables-expected.png b/LayoutTests/platform/mac/mathml/presentation/tables-expected.png
index 87acefb..9420731 100644
Binary files a/LayoutTests/platform/mac/mathml/presentation/tables-expected.png and b/LayoutTests/platform/mac/mathml/presentation/tables-expected.png differ
diff --git a/LayoutTests/platform/mac/mathml/presentation/tables-expected.txt b/LayoutTests/platform/mac/mathml/presentation/tables-expected.txt
index e5e99c5..460c8f6 100644
--- a/LayoutTests/platform/mac/mathml/presentation/tables-expected.txt
+++ b/LayoutTests/platform/mac/mathml/presentation/tables-expected.txt
@@ -1,87 +1,87 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x104
- RenderBlock {html} at (0,0) size 800x104
- RenderBody {body} at (8,16) size 784x72
- RenderBlock {p} at (0,0) size 784x72
- RenderText {#text} at (0,25) size 49x18
- text run at (0,25) width 49: "simple: "
- RenderBlock {math} at (49,0) size 78x72
- RenderTable {mtable} at (0,0) size 78x72
- RenderTableSection (anonymous) at (0,0) size 78x72
- RenderTableRow {mtr} at (0,0) size 78x24
- RenderTableCell {mtd} at (0,0) size 26x24 [r=0 c=0 rs=1 cs=1]
- RenderBlock {msub} at (3,0) size 20x24
+layer at (0,0) size 800x92
+ RenderBlock {html} at (0,0) size 800x92
+ RenderBody {body} at (8,16) size 784x60
+ RenderBlock {p} at (0,0) size 784x60
+ RenderText {#text} at (0,19) size 49x18
+ text run at (0,19) width 49: "simple: "
+ RenderBlock {math} at (49,0) size 78x60
+ RenderTable {mtable} at (0,0) size 78x60
+ RenderTableSection (anonymous) at (0,0) size 78x60
+ RenderTableRow {mtr} at (0,0) size 78x20
+ RenderTableCell {mtd} at (0,0) size 26x20 [r=0 c=0 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 20x20
RenderInline {mi} at (0,0) size 8x16
- RenderText {#text} at (0,4) size 8x16
- text run at (0,4) width 8: "a"
+ RenderText {#text} at (0,1) size 8x16
+ text run at (0,1) width 8: "a"
RenderInline {mn} at (0,0) size 12x12
- RenderText {#text} at (8,11) size 12x12
- text run at (8,11) width 12: "11"
- RenderTableCell {mtd} at (26,0) size 26x24 [r=0 c=1 rs=1 cs=1]
- RenderBlock {msub} at (3,0) size 20x24
+ RenderText {#text} at (8,8) size 12x12
+ text run at (8,8) width 12: "11"
+ RenderTableCell {mtd} at (26,0) size 26x20 [r=0 c=1 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 20x20
RenderInline {mi} at (0,0) size 8x16
- RenderText {#text} at (0,4) size 8x16
- text run at (0,4) width 8: "a"
+ RenderText {#text} at (0,1) size 8x16
+ text run at (0,1) width 8: "a"
RenderInline {mn} at (0,0) size 12x12
- RenderText {#text} at (8,11) size 12x12
- text run at (8,11) width 12: "12"
- RenderTableCell {mtd} at (52,0) size 26x24 [r=0 c=2 rs=1 cs=1]
- RenderBlock {msub} at (3,0) size 20x24
+ RenderText {#text} at (8,8) size 12x12
+ text run at (8,8) width 12: "12"
+ RenderTableCell {mtd} at (52,0) size 26x20 [r=0 c=2 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 20x20
RenderInline {mi} at (0,0) size 8x16
- RenderText {#text} at (0,4) size 8x16
- text run at (0,4) width 8: "a"
+ RenderText {#text} at (0,1) size 8x16
+ text run at (0,1) width 8: "a"
RenderInline {mn} at (0,0) size 12x12
- RenderText {#text} at (8,11) size 12x12
- text run at (8,11) width 12: "13"
- RenderTableRow {mtr} at (0,24) size 78x24
- RenderTableCell {mtd} at (0,24) size 26x24 [r=1 c=0 rs=1 cs=1]
- RenderBlock {msub} at (3,0) size 20x24
+ RenderText {#text} at (8,8) size 12x12
+ text run at (8,8) width 12: "13"
+ RenderTableRow {mtr} at (0,20) size 78x20
+ RenderTableCell {mtd} at (0,20) size 26x20 [r=1 c=0 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 20x20
RenderInline {mi} at (0,0) size 8x16
- RenderText {#text} at (0,4) size 8x16
- text run at (0,4) width 8: "b"
+ RenderText {#text} at (0,1) size 8x16
+ text run at (0,1) width 8: "b"
RenderInline {mn} at (0,0) size 12x12
- RenderText {#text} at (8,11) size 12x12
- text run at (8,11) width 12: "21"
- RenderTableCell {mtd} at (26,24) size 26x24 [r=1 c=1 rs=1 cs=1]
- RenderBlock {msub} at (3,0) size 20x24
+ RenderText {#text} at (8,8) size 12x12
+ text run at (8,8) width 12: "21"
+ RenderTableCell {mtd} at (26,20) size 26x20 [r=1 c=1 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 20x20
RenderInline {mi} at (0,0) size 8x16
- RenderText {#text} at (0,4) size 8x16
- text run at (0,4) width 8: "b"
+ RenderText {#text} at (0,1) size 8x16
+ text run at (0,1) width 8: "b"
RenderInline {mn} at (0,0) size 12x12
- RenderText {#text} at (8,11) size 12x12
- text run at (8,11) width 12: "22"
- RenderTableCell {mtd} at (52,24) size 26x24 [r=1 c=2 rs=1 cs=1]
- RenderBlock {msub} at (3,0) size 20x24
+ RenderText {#text} at (8,8) size 12x12
+ text run at (8,8) width 12: "22"
+ RenderTableCell {mtd} at (52,20) size 26x20 [r=1 c=2 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 20x20
RenderInline {mi} at (0,0) size 8x16
- RenderText {#text} at (0,4) size 8x16
- text run at (0,4) width 8: "b"
+ RenderText {#text} at (0,1) size 8x16
+ text run at (0,1) width 8: "b"
RenderInline {mn} at (0,0) size 12x12
- RenderText {#text} at (8,11) size 12x12
- text run at (8,11) width 12: "23"
- RenderTableRow {mtr} at (0,48) size 78x24
- RenderTableCell {mtd} at (0,48) size 26x24 [r=2 c=0 rs=1 cs=1]
- RenderBlock {msub} at (3,0) size 19x24
+ RenderText {#text} at (8,8) size 12x12
+ text run at (8,8) width 12: "23"
+ RenderTableRow {mtr} at (0,40) size 78x20
+ RenderTableCell {mtd} at (0,40) size 26x20 [r=2 c=0 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 19x20
RenderInline {mi} at (0,0) size 7x16
- RenderText {#text} at (0,4) size 7x16
- text run at (0,4) width 7: "c"
+ RenderText {#text} at (0,1) size 7x16
+ text run at (0,1) width 7: "c"
RenderInline {mn} at (0,0) size 12x12
- RenderText {#text} at (7,11) size 12x12
- text run at (7,11) width 12: "31"
- RenderTableCell {mtd} at (26,48) size 26x24 [r=2 c=1 rs=1 cs=1]
- RenderBlock {msub} at (3,0) size 19x24
+ RenderText {#text} at (7,8) size 12x12
+ text run at (7,8) width 12: "31"
+ RenderTableCell {mtd} at (26,40) size 26x20 [r=2 c=1 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 19x20
RenderInline {mi} at (0,0) size 7x16
- RenderText {#text} at (0,4) size 7x16
- text run at (0,4) width 7: "c"
+ RenderText {#text} at (0,1) size 7x16
+ text run at (0,1) width 7: "c"
RenderInline {mn} at (0,0) size 12x12
- RenderText {#text} at (7,11) size 12x12
- text run at (7,11) width 12: "32"
- RenderTableCell {mtd} at (52,48) size 26x24 [r=2 c=2 rs=1 cs=1]
- RenderBlock {msub} at (3,0) size 19x24
+ RenderText {#text} at (7,8) size 12x12
+ text run at (7,8) width 12: "32"
+ RenderTableCell {mtd} at (52,40) size 26x20 [r=2 c=2 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 19x20
RenderInline {mi} at (0,0) size 7x16
- RenderText {#text} at (0,4) size 7x16
- text run at (0,4) width 7: "c"
+ RenderText {#text} at (0,1) size 7x16
+ text run at (0,1) width 7: "c"
RenderInline {mn} at (0,0) size 12x12
- RenderText {#text} at (7,11) size 12x12
- text run at (7,11) width 12: "33"
+ RenderText {#text} at (7,8) size 12x12
+ text run at (7,8) width 12: "33"
RenderText {#text} at (0,0) size 0x0
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 90b1d62..9a50ff6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-28 Alex Milowski <alex at milowski.com>
+
+ Reviewed by Eric Seidel.
+
+ Update to CSS to remove unnecessary line-height settings
+
+ * css/mathml.css:
+
2010-01-28 Steve Block <steveblock at google.com>
Reviewed by David Levin.
diff --git a/WebCore/css/mathml.css b/WebCore/css/mathml.css
index ae1e0ee..b56a24b 100644
--- a/WebCore/css/mathml.css
+++ b/WebCore/css/mathml.css
@@ -1,13 +1,12 @@
@namespace "http://www.w3.org/1998/Math/MathML";
-/* approved */
-
math {
font-family: Symbol, STIXGeneral, "Times New Roman";
display: inline-block;
padding: 0px;
margin: 0px;
vertical-align: baseline;
+ line-height: 1.0;
}
math[display="block"] {
@@ -18,7 +17,7 @@ math[display="block"] {
}
math > * {
- vertical-align: baseline;
+ vertical-align: baseline;
}
mrow, mfenced {
@@ -27,12 +26,9 @@ mrow, mfenced {
vertical-align: middle;
}
-mrow > mo, mfenced > mo, math > mo,
-mrow > mi, mfenced > mi, math > mi,
-mrow > mn, mfenced > mn, math > mn,
-mrow > mtext, mfenced > mtext, math > mtext
+mrow > mo, mfenced > mo, math > mo
{
- vertical-align: middle;
+ vertical-align: middle;
}
mi, mtext {
@@ -41,7 +37,7 @@ mi, mtext {
}
mi + mrow {
- margin-left: 0.1em;
+ margin-left: 0.1em;
}
mfrac {
@@ -55,15 +51,13 @@ msub, msup {
}
msub > * + * {
- vertical-align: sub;
- font-size: 0.75em;
- line-height: 0.75em;
+ vertical-align: sub;
+ font-size: 0.75em;
}
msup > * + * {
- vertical-align: super;
- font-size: 0.75em;
- line-height: 0.75em;
+ vertical-align: super;
+ font-size: 0.75em;
}
msubsup {
@@ -77,8 +71,7 @@ msubsup > * {
}
msubsup > * + * {
- font-size: 0.75em;
- line-height: 0.75em;
+ font-size: 0.75em;
}
munder, mover, munderover {
@@ -87,39 +80,37 @@ munder, mover, munderover {
}
munderover > * + *, mover > * + *, munder > * + * {
- font-size: 0.75em;
- line-height: 0.5625em;
+ font-size: 0.75em;
+}
+
+mover > mi {
+ text-align: center;
}
mo, mn, mi, mtext {
- line-height: 0.75em;
- padding: 0px;
- margin: 0px;
+ padding: 0px;
+ margin: 0px;
}
mo {
display: inline-block;
- /*height: 100%;*/
}
mo {
- padding-left: 0.05em;
- padding-right: 0.05em;
+ padding-left: 0.05em;
+ padding-right: 0.05em;
}
mo[mathsize="small"], mn[mathsize="small"], mi[mathsize="small"] {
- font-size: 0.75em;
- line-height: 0.5625em;
+ font-size: 0.75em;
}
mo[mathsize="normal"],mn[mathsize="normal"],mi[mathsize="normal"] {
- font-size: 1em;
- line-height: 0.75em;
+ font-size: 1em;
}
mo[mathsize="big"], mn[mathsize="big"], mi[mathsize="big"] {
- line-height: 1.2em;
- font-size: 1.5em;
+ font-size: 1.5em;
}
annotation, annotation-xml {
@@ -147,14 +138,12 @@ mroot {
mroot > * + * {
font-size: 0.75em;
- line-height: 0.75em;
vertical-align: top;
padding-right: 0.3em;
}
mtable {
display: inline-table;
- line-height: 1.5em;
text-align: center;
vertical-align: middle;
}
@@ -205,5 +194,5 @@ mtable[columnlines="dashed"] > mtr > mtd + mtd {
}
mspace[linebreak="newline"] {
- display: block;
+ display: block;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list