From c23d593b9ae35e6782145a1edde6c5330169bb98 Mon Sep 17 00:00:00 2001 From: Jonathan Hage Date: Sat, 9 Jul 2011 15:52:19 +0200 Subject: [PATCH] Bug 669719 - support the displaystyle attribute on the element. r=roc --- layout/mathml/nsMathMLFrame.cpp | 1 + layout/reftests/mathml/math-display-ref.html | 13 +++++++++++++ layout/reftests/mathml/math-display.html | 11 +++++++++++ layout/reftests/mathml/reftest.list | 1 + 4 files changed, 26 insertions(+) create mode 100644 layout/reftests/mathml/math-display-ref.html create mode 100644 layout/reftests/mathml/math-display.html diff --git a/layout/mathml/nsMathMLFrame.cpp b/layout/mathml/nsMathMLFrame.cpp index 3861a90381b..24689737bb1 100644 --- a/layout/mathml/nsMathMLFrame.cpp +++ b/layout/mathml/nsMathMLFrame.cpp @@ -219,6 +219,7 @@ nsMathMLFrame::GetPresentationDataFrom(nsIFrame* aFrame, if (display->mDisplay == NS_STYLE_DISPLAY_BLOCK) { aPresentationData.flags |= NS_MATHML_DISPLAYSTYLE; } + FindAttrDisplaystyle(content, aPresentationData); aPresentationData.mstyle = frame->GetFirstContinuation(); break; } diff --git a/layout/reftests/mathml/math-display-ref.html b/layout/reftests/mathml/math-display-ref.html new file mode 100644 index 00000000000..0716ec87854 --- /dev/null +++ b/layout/reftests/mathml/math-display-ref.html @@ -0,0 +1,13 @@ + + + + + + ∑ + b + c + + + + + diff --git a/layout/reftests/mathml/math-display.html b/layout/reftests/mathml/math-display.html new file mode 100644 index 00000000000..d464a95cba2 --- /dev/null +++ b/layout/reftests/mathml/math-display.html @@ -0,0 +1,11 @@ + + + + + ∑ + b + c + + + + diff --git a/layout/reftests/mathml/reftest.list b/layout/reftests/mathml/reftest.list index c77bd340965..42379394719 100644 --- a/layout/reftests/mathml/reftest.list +++ b/layout/reftests/mathml/reftest.list @@ -67,6 +67,7 @@ fails == mstyle-5.xhtml mstyle-5-ref.xhtml # See bug 569125#c29 == mpadded-5.html mpadded-5-ref.html == mpadded-1-2.html mpadded-1-2-ref.html == mpadded-6.html mpadded-6-ref.html +== math-display.html math-display-ref.html == mfrac-linethickness-1.xhtml mfrac-linethickness-1-ref.xhtml == mathml-negativespace.html mathml-negativespace-ref.html != link-1.xhtml link-ref.xhtml