Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 11:55:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

backout 4dc8bdb7af6d due to 355548-2 reftest failure

Browse Source
This commit is contained in:
Karl Tomlinson 2010-02-02 20:29:59 +13:00
parent 66af1ab007
commit dda6be68cd
5 changed files with 3 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
layout/base/nsCSSFrameConstructor.cpp
View File

@ -4628,12 +4628,9 @@ nsCSSFrameConstructor::FindMathMLData(nsIContent* aContent,
if (aNameSpaceID != kNameSpaceID_MathML)
return nsnull;
const nsStyleDisplay* display = aStyleContext->GetStyleDisplay();
// Handle <math> specially, because it sometimes produces inlines
if (aTag == nsGkAtoms::math) {
if (display->mDisplay == NS_STYLE_DISPLAY_BLOCK ||
display->mDisplay == NS_STYLE_DISPLAY_INLINE_BLOCK) {
if (aStyleContext->GetStyleDisplay()->mDisplay == NS_STYLE_DISPLAY_BLOCK) {
static const FrameConstructionData sBlockMathData =
FCDATA_DECL(FCDATA_FORCE_NULL_ABSPOS_CONTAINER |
FCDATA_WRAP_KIDS_IN_BLOCKS,

4
layout/mathml/mathml.css
View File

@ -51,7 +51,7 @@
math {
direction: ltr;
unicode-bidi: embed;
display: inline-block;
display: inline;
font-size: inherit;
font-style: normal;
font-family: STIXGeneral, DejaVu Serif, DejaVu Sans, Cambria, Cambria Math, Times, Lucida Sans Unicode, OpenSymbol, Standard Symbols L, serif;
@ -63,7 +63,7 @@ math[mode="display"], math[display="block"] {
text-align: -moz-center;
}
math[display="inline"] {
display: inline-block;
display: inline;
}
/**************************************************************************/

35
layout/reftests/mathml/math-height-1-ref.xhtml
View File

@ -1,35 +0,0 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<style type="text/css">
html { background-color: grey; }
math { border: 1px solid white;
background-color: black;
color: black; }
</style>
</head>
<body>
<math xmlns="http://www.w3.org/1998/Math/MathML">
<mphantom>
<menclose notation="box updiagonalstrike downdiagonalstrike">
<mtable>
<mtr>
<mtd> <mi>a</mi> </mtd>
<mtd> <mi>b</mi> </mtd>
<mtd> <mi>c</mi> </mtd>
</mtr>
<mtr>
<mtd> <mi>d</mi> </mtd>
<mtd> <mi>e</mi> </mtd>
<mtd> <mi>f</mi> </mtd>
</mtr>
<mtr>
<mtd> <mi>g</mi> </mtd>
<mtd> <mi>h</mi> </mtd>
<mtd> <mi>i</mi> </mtd>
</mtr>
</mtable>
</menclose>
</mphantom>
</math>
</body>
</html>

34
layout/reftests/mathml/math-height-1.xhtml
View File

@ -1,34 +0,0 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Check the height of an inline math element</title>
<style type="text/css">
html { background-color: grey; }
math { border: 1px solid white;
background-color: black;
color: black; }
</style>
</head>
<body>
<math xmlns="http://www.w3.org/1998/Math/MathML">
<menclose notation="box updiagonalstrike downdiagonalstrike">
<mtable>
<mtr>
<mtd> <mi>a</mi> </mtd>
<mtd> <mi>b</mi> </mtd>
<mtd> <mi>c</mi> </mtd>
</mtr>
<mtr>
<mtd> <mi>d</mi> </mtd>
<mtd> <mi>e</mi> </mtd>
<mtd> <mi>f</mi> </mtd>
</mtr>
<mtr>
<mtd> <mi>g</mi> </mtd>
<mtd> <mi>h</mi> </mtd>
<mtd> <mi>i</mi> </mtd>
</mtr>
</mtable>
</menclose>
</math>
</body>
</html>

1
layout/reftests/mathml/reftest.list
View File

@ -7,4 +7,3 @@
!= stretchy-underbar-1.xhtml stretchy-underbar-1-ref.xhtml
== table-width-1.xhtml table-width-1-ref.xhtml
== underbar-width-1.xhtml underbar-width-1-ref.xhtml
== math-height-1.xhtml math-height-1-ref.xhtml