- Revision
- 127769
- Author
- [email protected]
- Date
- 2012-09-06 12:04:55 -0700 (Thu, 06 Sep 2012)
Log Message
mathml.css: Add more { white-space: nowrap } declarations
https://bugs.webkit.org/show_bug.cgi?id=95404
Reviewed by Eric Seidel.
mathml.css declared { white-space: nowrap } for mrow, mfenced, msqrt. It is also needed
for other tags such as msub, msup, msubsup.
Added a test to mathml/presentation/sup.xhtml, and a regression test to roots.xhtml.
Source/WebCore:
* css/mathml.css:
(mo, mrow, mfenced, mfrac, msub, msup, msubsup, munder, mover, munderover, msqrt, mroot):
LayoutTests:
* mathml/presentation/roots.xhtml:
* mathml/presentation/sup.xhtml:
* platform/mac/mathml/presentation/roots-expected.png:
* platform/mac/mathml/presentation/roots-expected.txt:
* platform/mac/mathml/presentation/sup-expected.png:
* platform/mac/mathml/presentation/sup-expected.txt:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (127768 => 127769)
--- trunk/LayoutTests/ChangeLog 2012-09-06 19:02:20 UTC (rev 127768)
+++ trunk/LayoutTests/ChangeLog 2012-09-06 19:04:55 UTC (rev 127769)
@@ -1,3 +1,22 @@
+2012-09-06 David Barton <[email protected]>
+
+ mathml.css: Add more { white-space: nowrap } declarations
+ https://bugs.webkit.org/show_bug.cgi?id=95404
+
+ Reviewed by Eric Seidel.
+
+ mathml.css declared { white-space: nowrap } for mrow, mfenced, msqrt. It is also needed
+ for other tags such as msub, msup, msubsup.
+
+ Added a test to mathml/presentation/sup.xhtml, and a regression test to roots.xhtml.
+
+ * mathml/presentation/roots.xhtml:
+ * mathml/presentation/sup.xhtml:
+ * platform/mac/mathml/presentation/roots-expected.png:
+ * platform/mac/mathml/presentation/roots-expected.txt:
+ * platform/mac/mathml/presentation/sup-expected.png:
+ * platform/mac/mathml/presentation/sup-expected.txt:
+
2012-09-06 Roger Fong <[email protected]>
Unreviewed gardening. Skip failing test: fast/dom/HTMLScriptElement/script-reexecution.html
Modified: trunk/LayoutTests/mathml/presentation/roots.xhtml (127768 => 127769)
--- trunk/LayoutTests/mathml/presentation/roots.xhtml 2012-09-06 19:02:20 UTC (rev 127768)
+++ trunk/LayoutTests/mathml/presentation/roots.xhtml 2012-09-06 19:04:55 UTC (rev 127769)
@@ -2,6 +2,9 @@
<head>
<title>Roots</title>
<style type='text/css'>
+ body {
+ overflow: hidden;
+ }
</style>
</head>
<body>
@@ -168,5 +171,15 @@
</mroot>
</math>
</p>
+
+<p id='t10'>Don't wrap this wide line with an implicit mrow:<br />
+ <math xmlns='http://www.w3.org/1998/Math/MathML'>
+ <msqrt>
+ <mi style="padding-right: 50vw">x</mi>
+ <mi style="padding-right: 50vw">y</mi>
+ </msqrt>
+ </math>
+</p>
+
</body>
</html>
\ No newline at end of file
Modified: trunk/LayoutTests/mathml/presentation/sup.xhtml (127768 => 127769)
--- trunk/LayoutTests/mathml/presentation/sup.xhtml 2012-09-06 19:02:20 UTC (rev 127768)
+++ trunk/LayoutTests/mathml/presentation/sup.xhtml 2012-09-06 19:04:55 UTC (rev 127769)
@@ -1,6 +1,11 @@
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>Superscripts</title>
+<style type="text/css">
+ body {
+ overflow: hidden;
+ }
+</style>
</head>
<body>
<p id='t1'>superscript:
@@ -8,5 +13,16 @@
<msup><mi>x</mi><mn>2</mn></msup>
</math>
</p>
+
+<p id='t2'>For <a href="" 95404</a> -
+ mathml.css: Add more { white-space: nowrap } declarations:<br />
+ <math xmlns='http://www.w3.org/1998/Math/MathML'>
+ <msup>
+ <mi style="padding-right: 50vw">x</mi>
+ <mi style="padding-right: 50vw">y</mi>
+ </msup>
+ </math>
+</p>
+
</body>
</html>
Modified: trunk/LayoutTests/platform/mac/mathml/presentation/roots-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac/mathml/presentation/roots-expected.txt (127768 => 127769)
--- trunk/LayoutTests/platform/mac/mathml/presentation/roots-expected.txt 2012-09-06 19:02:20 UTC (rev 127768)
+++ trunk/LayoutTests/platform/mac/mathml/presentation/roots-expected.txt 2012-09-06 19:04:55 UTC (rev 127769)
@@ -1,8 +1,8 @@
-layer at (0,0) size 800x600
+layer at (0,0) size 836x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x496
- RenderBlock {html} at (0,0) size 800x496
- RenderBody {body} at (8,16) size 784x464
+layer at (0,0) size 800x548
+ RenderBlock {html} at (0,0) size 800x548
+ RenderBody {body} at (8,16) size 784x516
RenderBlock {p} at (0,0) size 784x18
RenderText {#text} at (0,0) size 177x18
text run at (0,0) width 177: "square root (should be red): "
@@ -181,6 +181,20 @@
text run at (0,34) width 110: "Imbricated roots: "
RenderMathMLMath {math} at (110,0) size 295x70 [padding: 0 1 0 1]
RenderText {#text} at (0,0) size 0x0
+ RenderBlock {p} at (0,480) size 784x36
+ RenderText {#text} at (0,0) size 306x18
+ text run at (0,0) width 306: "Don't wrap this wide line with an implicit mrow:"
+ RenderBR {br} at (306,0) size 0x18
+ RenderMathMLMath {math} at (0,21) size 828x15 [padding: 0 1 0 1]
+ RenderMathMLSquareRoot {msqrt} at (1,0) size 826x15 [intrinsic padding: 3 0 0 12]
+ RenderMathMLRow (anonymous) at (12,3) size 814x12
+ RenderInline {mi} at (0,0) size 407x24
+ RenderText {#text} at (0,-9) size 7x24
+ text run at (0,-9) width 7: "x"
+ RenderInline {mi} at (0,0) size 407x24
+ RenderText {#text} at (407,-9) size 7x24
+ text run at (407,-9) width 7: "y"
+ RenderText {#text} at (0,0) size 0x0
layer at (182,170) size 20x19
RenderMathMLRoot {mroot} at (1,0) size 20x19 [intrinsic padding: 7 0 0 12]
RenderMathMLRow (anonymous) at (12,7) size 8x12
Modified: trunk/LayoutTests/platform/mac/mathml/presentation/sup-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac/mathml/presentation/sup-expected.txt (127768 => 127769)
--- trunk/LayoutTests/platform/mac/mathml/presentation/sup-expected.txt 2012-09-06 19:02:20 UTC (rev 127768)
+++ trunk/LayoutTests/platform/mac/mathml/presentation/sup-expected.txt 2012-09-06 19:04:55 UTC (rev 127769)
@@ -1,8 +1,8 @@
-layer at (0,0) size 800x600
+layer at (0,0) size 822x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x51
- RenderBlock {html} at (0,0) size 800x51
- RenderBody {body} at (8,16) size 784x19
+layer at (0,0) size 800x103
+ RenderBlock {html} at (0,0) size 800x103
+ RenderBody {body} at (8,16) size 784x71
RenderBlock {p} at (0,0) size 784x19
RenderText {#text} at (0,1) size 76x18
text run at (0,1) width 76: "superscript: "
@@ -16,3 +16,23 @@
RenderText {#text} at (7,-4) size 6x18
text run at (7,-4) width 6: "2"
RenderText {#text} at (0,0) size 0x0
+ RenderBlock {p} at (0,35) size 784x36
+ RenderText {#text} at (0,0) size 26x18
+ text run at (0,0) width 26: "For "
+ RenderInline {a} at (0,0) size 71x18 [color=#0000EE]
+ RenderText {#text} at (26,0) size 71x18
+ text run at (26,0) width 71: "Bug 95404"
+ RenderText {#text} at (97,0) size 397x18
+ text run at (97,0) width 13: " - "
+ text run at (110,0) width 384: "mathml.css: Add more { white-space: nowrap } declarations:"
+ RenderBR {br} at (494,0) size 0x18
+ RenderMathMLMath {math} at (0,20) size 814x13 [padding: 0 1 0 1]
+ RenderMathMLSubSup {msup} at (1,0) size 812x13
+ RenderMathMLBlock (anonymous, inline-block) at (0,4) size 407x9
+ RenderInline {mi} at (0,0) size 407x24
+ RenderText {#text} at (0,-9) size 7x24
+ text run at (0,-9) width 7: "x"
+ RenderInline {mi} at (0,0) size 405x18
+ RenderText {#text} at (407,-7) size 5x18
+ text run at (407,-7) width 5: "y"
+ RenderText {#text} at (0,0) size 0x0
Modified: trunk/Source/WebCore/ChangeLog (127768 => 127769)
--- trunk/Source/WebCore/ChangeLog 2012-09-06 19:02:20 UTC (rev 127768)
+++ trunk/Source/WebCore/ChangeLog 2012-09-06 19:04:55 UTC (rev 127769)
@@ -1,3 +1,18 @@
+2012-09-06 David Barton <[email protected]>
+
+ mathml.css: Add more { white-space: nowrap } declarations
+ https://bugs.webkit.org/show_bug.cgi?id=95404
+
+ Reviewed by Eric Seidel.
+
+ mathml.css declared { white-space: nowrap } for mrow, mfenced, msqrt. It is also needed
+ for other tags such as msub, msup, msubsup.
+
+ Added a test to mathml/presentation/sup.xhtml, and a regression test to roots.xhtml.
+
+ * css/mathml.css:
+ (mo, mrow, mfenced, mfrac, msub, msup, msubsup, munder, mover, munderover, msqrt, mroot):
+
2012-09-06 Robert Kroeger <[email protected]>
[chromium] Enable different fling behaviour for touchscreen and touchpad
Modified: trunk/Source/WebCore/css/mathml.css (127768 => 127769)
--- trunk/Source/WebCore/css/mathml.css 2012-09-06 19:02:20 UTC (rev 127768)
+++ trunk/Source/WebCore/css/mathml.css 2012-09-06 19:04:55 UTC (rev 127769)
@@ -28,9 +28,6 @@
mo, mrow, mfenced, mfrac, msub, msup, msubsup, munder, mover, munderover, msqrt, mroot {
display: inline-block;
-}
-
-mrow, mfenced {
white-space: nowrap;
}
@@ -125,10 +122,6 @@
background-color: lightYellow;
}
-msqrt {
- white-space: nowrap; /* for the anonymous RenderMathMLRow */
-}
-
mroot {
position: relative;
}
