diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp index 3c623af0dde..2941fdfe485 100644 --- a/mozilla/layout/base/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp @@ -6850,11 +6850,11 @@ nsCSSFrameConstructor::ConstructMathMLFrame(nsIPresShell* aPresShell, isFixedPositioned = PR_TRUE; } - if (aTag == nsMathMLAtoms::mi_) - rv = NS_NewMathMLmiFrame(aPresShell, &newFrame); - else if (aTag == nsMathMLAtoms::mtext_ || - aTag == nsMathMLAtoms::mn_) - rv = NS_NewMathMLmtextFrame(aPresShell, &newFrame); + if (aTag == nsMathMLAtoms::mi_ || + aTag == nsMathMLAtoms::mn_ || + aTag == nsMathMLAtoms::ms_ || + aTag == nsMathMLAtoms::mtext_) + rv = NS_NewMathMLTokenFrame(aPresShell, &newFrame); else if (aTag == nsMathMLAtoms::mo_) rv = NS_NewMathMLmoFrame(aPresShell, &newFrame); else if (aTag == nsMathMLAtoms::mfrac_) @@ -6877,8 +6877,6 @@ nsCSSFrameConstructor::ConstructMathMLFrame(nsIPresShell* aPresShell, rv = NS_NewMathMLmpaddedFrame(aPresShell, &newFrame); else if (aTag == nsMathMLAtoms::mspace_) rv = NS_NewMathMLmspaceFrame(aPresShell, &newFrame); - else if (aTag == nsMathMLAtoms::ms_) - rv = NS_NewMathMLmsFrame(aPresShell, &newFrame); else if (aTag == nsMathMLAtoms::mfenced_) rv = NS_NewMathMLmfencedFrame(aPresShell, &newFrame); else if (aTag == nsMathMLAtoms::mmultiscripts_) diff --git a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp index 3c623af0dde..2941fdfe485 100644 --- a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp @@ -6850,11 +6850,11 @@ nsCSSFrameConstructor::ConstructMathMLFrame(nsIPresShell* aPresShell, isFixedPositioned = PR_TRUE; } - if (aTag == nsMathMLAtoms::mi_) - rv = NS_NewMathMLmiFrame(aPresShell, &newFrame); - else if (aTag == nsMathMLAtoms::mtext_ || - aTag == nsMathMLAtoms::mn_) - rv = NS_NewMathMLmtextFrame(aPresShell, &newFrame); + if (aTag == nsMathMLAtoms::mi_ || + aTag == nsMathMLAtoms::mn_ || + aTag == nsMathMLAtoms::ms_ || + aTag == nsMathMLAtoms::mtext_) + rv = NS_NewMathMLTokenFrame(aPresShell, &newFrame); else if (aTag == nsMathMLAtoms::mo_) rv = NS_NewMathMLmoFrame(aPresShell, &newFrame); else if (aTag == nsMathMLAtoms::mfrac_) @@ -6877,8 +6877,6 @@ nsCSSFrameConstructor::ConstructMathMLFrame(nsIPresShell* aPresShell, rv = NS_NewMathMLmpaddedFrame(aPresShell, &newFrame); else if (aTag == nsMathMLAtoms::mspace_) rv = NS_NewMathMLmspaceFrame(aPresShell, &newFrame); - else if (aTag == nsMathMLAtoms::ms_) - rv = NS_NewMathMLmsFrame(aPresShell, &newFrame); else if (aTag == nsMathMLAtoms::mfenced_) rv = NS_NewMathMLmfencedFrame(aPresShell, &newFrame); else if (aTag == nsMathMLAtoms::mmultiscripts_) diff --git a/mozilla/layout/macbuild/layoutmathml.xml b/mozilla/layout/macbuild/layoutmathml.xml index 4d10fc73788..dab569b1cdd 100644 --- a/mozilla/layout/macbuild/layoutmathml.xml +++ b/mozilla/layout/macbuild/layoutmathml.xml @@ -927,7 +927,7 @@ Name - nsMathMLmiFrame.cpp + nsMathMLTokenFrame.cpp MacOS Text @@ -981,13 +981,6 @@ Text - - Name - nsMathMLmsFrame.cpp - MacOS - Text - - Name nsMathMLmspaceFrame.cpp @@ -1037,13 +1030,6 @@ Text - - Name - nsMathMLmtextFrame.cpp - MacOS - Text - - Name nsMathMLmunderFrame.cpp @@ -1115,7 +1101,7 @@ Name - nsMathMLmiFrame.cpp + nsMathMLTokenFrame.cpp MacOS @@ -1153,11 +1139,6 @@ nsMathMLmrowFrame.cpp MacOS - - Name - nsMathMLmsFrame.cpp - MacOS - Name nsMathMLmspaceFrame.cpp @@ -1193,11 +1174,6 @@ nsMathMLmtableFrame.cpp MacOS - - Name - nsMathMLmtextFrame.cpp - MacOS - Name nsMathMLmunderFrame.cpp @@ -2104,7 +2080,7 @@ Name - nsMathMLmiFrame.cpp + nsMathMLTokenFrame.cpp MacOS Text @@ -2158,13 +2134,6 @@ Text - - Name - nsMathMLmsFrame.cpp - MacOS - Text - - Name nsMathMLmspaceFrame.cpp @@ -2214,13 +2183,6 @@ Text - - Name - nsMathMLmtextFrame.cpp - MacOS - Text - - Name nsMathMLmunderFrame.cpp @@ -2292,7 +2254,7 @@ Name - nsMathMLmiFrame.cpp + nsMathMLTokenFrame.cpp MacOS @@ -2330,11 +2292,6 @@ nsMathMLmrowFrame.cpp MacOS - - Name - nsMathMLmsFrame.cpp - MacOS - Name nsMathMLmspaceFrame.cpp @@ -2370,11 +2327,6 @@ nsMathMLmtableFrame.cpp MacOS - - Name - nsMathMLmtextFrame.cpp - MacOS - Name nsMathMLmunderFrame.cpp @@ -4147,7 +4099,7 @@ layoutmathmlDebug.o Name - nsMathMLmiFrame.cpp + nsMathMLTokenFrame.cpp MacOS @@ -4192,12 +4144,6 @@ nsMathMLmrowFrame.cpp MacOS - - layoutmathmlDebug.o - Name - nsMathMLmsFrame.cpp - MacOS - layoutmathmlDebug.o Name @@ -4240,12 +4186,6 @@ nsMathMLmtableFrame.cpp MacOS - - layoutmathmlDebug.o - Name - nsMathMLmtextFrame.cpp - MacOS - layoutmathmlDebug.o Name diff --git a/mozilla/layout/mathml/base/src/Makefile.in b/mozilla/layout/mathml/base/src/Makefile.in index f1df0b92c41..c583d4d88f3 100644 --- a/mozilla/layout/mathml/base/src/Makefile.in +++ b/mozilla/layout/mathml/base/src/Makefile.in @@ -58,6 +58,8 @@ CPPSRCS = nsMathMLChar.cpp \ nsMathMLFrame.cpp \ nsMathMLContainerFrame.cpp \ nsMathMLForeignFrameWrapper.cpp \ + nsMathMLTokenFrame.cpp \ + nsMathMLmoFrame.cpp \ nsMathMLmrowFrame.cpp \ nsMathMLmphantomFrame.cpp \ nsMathMLmfencedFrame.cpp \ @@ -66,16 +68,12 @@ CPPSRCS = nsMathMLChar.cpp \ nsMathMLmsubFrame.cpp \ nsMathMLmsubsupFrame.cpp \ nsMathMLmmultiscriptsFrame.cpp \ - nsMathMLmiFrame.cpp \ - nsMathMLmtextFrame.cpp \ nsMathMLmtableFrame.cpp \ - nsMathMLmoFrame.cpp \ nsMathMLmunderFrame.cpp \ nsMathMLmoverFrame.cpp \ nsMathMLmunderoverFrame.cpp \ nsMathMLmpaddedFrame.cpp \ nsMathMLmspaceFrame.cpp \ - nsMathMLmsFrame.cpp \ nsMathMLmstyleFrame.cpp \ nsMathMLmsqrtFrame.cpp \ nsMathMLmrootFrame.cpp \ diff --git a/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp index a9bffdabd14..0d47583f621 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp @@ -786,37 +786,6 @@ nsMathMLContainerFrame::Paint(nsIPresContext* aPresContext, return rv; } -static void -CompressWhitespace(nsIContent* aContent) -{ - nsCOMPtr tag; - aContent->GetTag(*getter_AddRefs(tag)); - if (tag.get() == nsMathMLAtoms::mo_ || - tag.get() == nsMathMLAtoms::mi_ || - tag.get() == nsMathMLAtoms::mn_ || - tag.get() == nsMathMLAtoms::ms_ || - tag.get() == nsMathMLAtoms::mtext_) { - PRInt32 numKids; - aContent->ChildCount(numKids); - for (PRInt32 kid = 0; kid < numKids; kid++) { - nsCOMPtr kidContent; - aContent->ChildAt(kid, *getter_AddRefs(kidContent)); - if (kidContent.get()) { - nsCOMPtr kidText(do_QueryInterface(kidContent)); - if (kidText.get()) { - nsCOMPtr tc(do_QueryInterface(kidContent)); - if (tc) { - nsAutoString text; - tc->CopyText(text); - text.CompressWhitespace(); - tc->SetText(text, PR_FALSE); // not meant to be used if notify is needed - } - } - } - } - } -} - // This method is called in a top-down manner, as we descend the frame tree // during its construction NS_IMETHODIMP @@ -826,11 +795,6 @@ nsMathMLContainerFrame::Init(nsIPresContext* aPresContext, nsIStyleContext* aContext, nsIFrame* aPrevInFlow) { - // leading and trailing whitespace doesn't count -- bug 15402 - // brute force removal for people who do a instead of a - // XXX the best fix is to skip these in nsTextFrame - CompressWhitespace(aContent); - MapAttributesIntoCSS(aPresContext, aContent); // let the base class do its Init() @@ -1083,132 +1047,6 @@ nsMathMLContainerFrame::AttributeChanged(nsIPresContext* aPresContext, return ReflowDirtyChild(presShell, nsnull); } -// helper function to reflow token elements -// note that mBoundingMetrics is computed here -nsresult -nsMathMLContainerFrame::ReflowTokenFor(nsIFrame* aFrame, - nsIPresContext* aPresContext, - nsHTMLReflowMetrics& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus) -{ - NS_PRECONDITION(aFrame, "null arg"); - nsresult rv = NS_OK; - - // See if this is an incremental reflow - if (aReflowState.reason == eReflowReason_Incremental) { -#ifdef MATHML_NOISY_INCREMENTAL_REFLOW -printf("nsMathMLContainerFrame::ReflowTokenFor:IncrementalReflow received by: "); -nsFrame::ListTag(stdout, aFrame); -printf("\n"); -#endif - } - - // initializations needed for empty markup like - aDesiredSize.width = aDesiredSize.height = 0; - aDesiredSize.ascent = aDesiredSize.descent = 0; - aDesiredSize.mBoundingMetrics.Clear(); - - // ask our children to compute their bounding metrics - nsHTMLReflowMetrics childDesiredSize(aDesiredSize.maxElementSize, - aDesiredSize.mFlags | NS_REFLOW_CALC_BOUNDING_METRICS); - nsSize availSize(aReflowState.mComputedWidth, aReflowState.mComputedHeight); - PRInt32 count = 0; - nsIFrame* childFrame; - aFrame->FirstChild(aPresContext, nsnull, &childFrame); - while (childFrame) { - nsHTMLReflowState childReflowState(aPresContext, aReflowState, - childFrame, availSize); - rv = NS_STATIC_CAST(nsMathMLContainerFrame*, - aFrame)->ReflowChild(childFrame, - aPresContext, childDesiredSize, - childReflowState, aStatus); - //NS_ASSERTION(NS_FRAME_IS_COMPLETE(aStatus), "bad status"); - if (NS_FAILED(rv)) return rv; - - // origins are used as placeholders to store the child's ascent and descent. - childFrame->SetRect(aPresContext, - nsRect(childDesiredSize.descent, childDesiredSize.ascent, - childDesiredSize.width, childDesiredSize.height)); - // compute and cache the bounding metrics - if (0 == count) - aDesiredSize.mBoundingMetrics = childDesiredSize.mBoundingMetrics; - else - aDesiredSize.mBoundingMetrics += childDesiredSize.mBoundingMetrics; - - count++; - childFrame->GetNextSibling(&childFrame); - } - - // cache the frame's mBoundingMetrics - NS_STATIC_CAST(nsMathMLContainerFrame*, - aFrame)->SetBoundingMetrics(aDesiredSize.mBoundingMetrics); - - // place and size children - NS_STATIC_CAST(nsMathMLContainerFrame*, - aFrame)->FinalizeReflow(aPresContext, *aReflowState.rendContext, - aDesiredSize); - NS_FRAME_SET_TRUNCATION(aStatus, aReflowState, aDesiredSize); - return NS_OK; -} - -// helper function to place token elements -// mBoundingMetrics is computed at the ReflowToken pass, it is -// not computed here because our children may be text frames that -// do not implement the GetBoundingMetrics() interface. -nsresult -nsMathMLContainerFrame::PlaceTokenFor(nsIFrame* aFrame, - nsIPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - PRBool aPlaceOrigin, - nsHTMLReflowMetrics& aDesiredSize) -{ - aDesiredSize.width = aDesiredSize.height = 0; - aDesiredSize.ascent = aDesiredSize.descent = 0; - - const nsStyleFont* font; - aFrame->GetStyleData(eStyleStruct_Font, (const nsStyleStruct*&)font); - nsCOMPtr fm; - aPresContext->GetMetricsFor(font->mFont, getter_AddRefs(fm)); - nscoord ascent, descent; - fm->GetMaxAscent(ascent); - fm->GetMaxDescent(descent); - - nsBoundingMetrics bm; - NS_STATIC_CAST(nsMathMLContainerFrame*, aFrame)->GetBoundingMetrics(bm); - aDesiredSize.mBoundingMetrics = bm; - aDesiredSize.width = bm.width; - aDesiredSize.ascent = PR_MAX(bm.ascent, ascent); - aDesiredSize.descent = PR_MAX(bm.descent, descent); - aDesiredSize.height = aDesiredSize.ascent + aDesiredSize.descent; - - if (aPlaceOrigin) { - nscoord dy, dx = 0; - nsRect rect; - nsIFrame* childFrame; - aFrame->FirstChild(aPresContext, nsnull, &childFrame); - while (childFrame) { - childFrame->GetRect(rect); - nsHTMLReflowMetrics childSize(nsnull); - childSize.width = rect.width; - childSize.height = aDesiredSize.height; //rect.height; - - // place and size the child - dy = aDesiredSize.ascent - rect.y; - NS_STATIC_CAST(nsMathMLContainerFrame*, - aFrame)->FinishReflowChild(childFrame, aPresContext, nsnull, - childSize, dx, dy, 0); - dx += rect.width; - childFrame->GetNextSibling(&childFrame); - } - } - - NS_STATIC_CAST(nsMathMLContainerFrame*, - aFrame)->SetReference(nsPoint(0, aDesiredSize.ascent)); - - return NS_OK; -} - // We are an inline frame, so we handle dirty request like nsInlineFrame NS_IMETHODIMP nsMathMLContainerFrame::ReflowDirtyChild(nsIPresShell* aPresShell, nsIFrame* aChild) @@ -1347,25 +1185,9 @@ nsMathMLContainerFrame::GetFrameType(nsIAtom** aType) const mEmbellishData.coreFrame) { return mEmbellishData.coreFrame->GetFrameType(aType); } - else { - nsCOMPtr tag; - mContent->GetTag(*getter_AddRefs(tag)); - // see if this is a token element (mapped to 'Ord'in TeX) - if (tag == nsMathMLAtoms::mi_ || - tag == nsMathMLAtoms::mn_ || - tag == nsMathMLAtoms::ms_ || - tag == nsMathMLAtoms::mtext_) { - *aType = nsMathMLAtoms::ordinaryMathMLFrame; - } - else if (tag == nsMathMLAtoms::mo_ ) { - // this is an empty that wasn't treated as embellished above - *aType = nsMathMLAtoms::operatorInvisibleMathMLFrame; - } - else { - // everything else is a schematta element (mapped to 'Inner' in TeX) - *aType = nsMathMLAtoms::schemataMathMLFrame; - } - } + + // everything else is a schematta element (mapped to 'Inner' in TeX) + *aType = nsMathMLAtoms::schemataMathMLFrame; NS_ADDREF(*aType); return NS_OK; } diff --git a/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.h b/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.h index 0b2104face8..30754fb25a2 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.h @@ -231,22 +231,6 @@ public: const nsRect& aDirtyRect, nsFramePaintLayer aWhichLayer); - // helper function to reflow token elements - static nsresult - ReflowTokenFor(nsIFrame* aFrame, - nsIPresContext* aPresContext, - nsHTMLReflowMetrics& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus); - - // helper function to place token elements - static nsresult - PlaceTokenFor(nsIFrame* aFrame, - nsIPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - PRBool aPlaceOrigin, - nsHTMLReflowMetrics& aDesiredSize); - // helper method to reflow a child frame. We are inline frames, and we don't // know our positions until reflow is finished. That's why we ask the // base method not to worry about our position. diff --git a/mozilla/layout/mathml/base/src/nsMathMLParts.h b/mozilla/layout/mathml/base/src/nsMathMLParts.h index bccd8311da8..9176d5afea1 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLParts.h +++ b/mozilla/layout/mathml/base/src/nsMathMLParts.h @@ -27,10 +27,9 @@ // Factory methods for creating MathML objects extern nsresult NS_NewMathMLForeignFrameWrapper ( nsIPresShell* aPresShell, nsIFrame** aNewFrame ); -extern nsresult NS_NewMathMLmrowFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame ); -extern nsresult NS_NewMathMLmiFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame ); -extern nsresult NS_NewMathMLmtextFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame ); +extern nsresult NS_NewMathMLTokenFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame ); extern nsresult NS_NewMathMLmoFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame ); +extern nsresult NS_NewMathMLmrowFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame ); extern nsresult NS_NewMathMLmphantomFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame ); extern nsresult NS_NewMathMLmpaddedFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame ); extern nsresult NS_NewMathMLmspaceFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame ); diff --git a/mozilla/layout/mathml/base/src/nsMathMLTokenFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLTokenFrame.cpp new file mode 100644 index 00000000000..422b9b28e75 --- /dev/null +++ b/mozilla/layout/mathml/base/src/nsMathMLTokenFrame.cpp @@ -0,0 +1,439 @@ +/* + * The contents of this file are subject to the Mozilla Public + * License Version 1.1 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS + * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + * implied. See the License for the specific language governing + * rights and limitations under the License. + * + * The Original Code is Mozilla MathML Project. + * + * The Initial Developer of the The Original Code is The University Of + * Queensland. Portions created by The University Of Queensland are + * Copyright (C) 1999 The University Of Queensland. All Rights Reserved. + * + * Contributor(s): + * Roger B. Sidje + */ + +#include "nsCOMPtr.h" +#include "nsFrame.h" +#include "nsIPresContext.h" +#include "nsUnitConversion.h" +#include "nsIStyleContext.h" +#include "nsStyleConsts.h" +#include "nsIRenderingContext.h" +#include "nsIFontMetrics.h" + +#include "nsIDOMText.h" +#include "nsITextContent.h" +#include "nsIFrameManager.h" +#include "nsLayoutAtoms.h" +#include "nsStyleChangeList.h" +#include "nsINameSpaceManager.h" + +#include "nsMathMLTokenFrame.h" + +nsresult +NS_NewMathMLTokenFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame) +{ + NS_PRECONDITION(aNewFrame, "null OUT ptr"); + if (nsnull == aNewFrame) { + return NS_ERROR_NULL_POINTER; + } + nsMathMLTokenFrame* it = new (aPresShell) nsMathMLTokenFrame; + if (nsnull == it) { + return NS_ERROR_OUT_OF_MEMORY; + } + *aNewFrame = it; + return NS_OK; +} + +nsMathMLTokenFrame::nsMathMLTokenFrame() +{ +} + +nsMathMLTokenFrame::~nsMathMLTokenFrame() +{ +} + +NS_IMETHODIMP +nsMathMLTokenFrame::GetFrameType(nsIAtom** aType) const +{ + *aType = nsMathMLAtoms::ordinaryMathMLFrame; + NS_ADDREF(*aType); + return NS_OK; +} + +static void +CompressWhitespace(nsIContent* aContent) +{ + PRInt32 numKids; + aContent->ChildCount(numKids); + for (PRInt32 kid = 0; kid < numKids; kid++) { + nsCOMPtr kidContent; + aContent->ChildAt(kid, *getter_AddRefs(kidContent)); + if (kidContent) { + nsCOMPtr kidText(do_QueryInterface(kidContent)); + if (kidText) { + nsCOMPtr tc(do_QueryInterface(kidContent)); + if (tc) { + nsAutoString text; + tc->CopyText(text); + text.CompressWhitespace(); + tc->SetText(text, PR_FALSE); // not meant to be used if notify is needed + } + } + } + } +} + +NS_IMETHODIMP +nsMathMLTokenFrame::Init(nsIPresContext* aPresContext, + nsIContent* aContent, + nsIFrame* aParent, + nsIStyleContext* aContext, + nsIFrame* aPrevInFlow) +{ + // leading and trailing whitespace doesn't count -- bug 15402 + // brute force removal for people who do a instead of a + // XXX the best fix is to skip these in nsTextFrame + CompressWhitespace(aContent); + + // let the base class do its Init() + return nsMathMLContainerFrame::Init(aPresContext, aContent, aParent, aContext, aPrevInFlow); +} + +NS_IMETHODIMP +nsMathMLTokenFrame::SetInitialChildList(nsIPresContext* aPresContext, + nsIAtom* aListName, + nsIFrame* aChildList) +{ + // First, let the base class do its work + nsresult rv = nsMathMLContainerFrame::SetInitialChildList(aPresContext, aListName, aChildList); + if (NS_FAILED(rv)) + return rv; + + // Safety measure to cater for math fonts with metrics that sometimes + // cause glyphs in the text frames to protrude outside. Without this, + // such glyphs may be clipped at the painting stage + mState |= NS_FRAME_OUTSIDE_CHILDREN; + nsIFrame* childFrame = mFrames.FirstChild(); + while (childFrame) { + nsFrameState state; + childFrame->GetFrameState(&state); + childFrame->SetFrameState(state | NS_FRAME_OUTSIDE_CHILDREN); + childFrame->GetNextSibling(&childFrame); + } + + ProcessTextData(aPresContext); + return rv; +} + +nsresult +nsMathMLTokenFrame::Reflow(nsIPresContext* aPresContext, + nsHTMLReflowMetrics& aDesiredSize, + const nsHTMLReflowState& aReflowState, + nsReflowStatus& aStatus) +{ + nsresult rv = NS_OK; + + // See if this is an incremental reflow + if (aReflowState.reason == eReflowReason_Incremental) { +#ifdef MATHML_NOISY_INCREMENTAL_REFLOW +printf("nsMathMLContainerFrame::ReflowTokenFor:IncrementalReflow received by: "); +nsFrame::ListTag(stdout, aFrame); +printf("\n"); +#endif + } + + // initializations needed for empty markup like + aDesiredSize.width = aDesiredSize.height = 0; + aDesiredSize.ascent = aDesiredSize.descent = 0; + aDesiredSize.mBoundingMetrics.Clear(); + + // ask our children to compute their bounding metrics + nsHTMLReflowMetrics childDesiredSize(aDesiredSize.maxElementSize, + aDesiredSize.mFlags | NS_REFLOW_CALC_BOUNDING_METRICS); + nsSize availSize(aReflowState.mComputedWidth, aReflowState.mComputedHeight); + PRInt32 count = 0; + nsIFrame* childFrame; + FirstChild(aPresContext, nsnull, &childFrame); + while (childFrame) { + nsHTMLReflowState childReflowState(aPresContext, aReflowState, + childFrame, availSize); + rv = ReflowChild(childFrame, aPresContext, childDesiredSize, + childReflowState, aStatus); + //NS_ASSERTION(NS_FRAME_IS_COMPLETE(aStatus), "bad status"); + if (NS_FAILED(rv)) return rv; + + // origins are used as placeholders to store the child's ascent and descent. + childFrame->SetRect(aPresContext, + nsRect(childDesiredSize.descent, childDesiredSize.ascent, + childDesiredSize.width, childDesiredSize.height)); + // compute and cache the bounding metrics + if (0 == count) + aDesiredSize.mBoundingMetrics = childDesiredSize.mBoundingMetrics; + else + aDesiredSize.mBoundingMetrics += childDesiredSize.mBoundingMetrics; + + count++; + childFrame->GetNextSibling(&childFrame); + } + + // cache the frame's mBoundingMetrics + mBoundingMetrics = aDesiredSize.mBoundingMetrics; + + // place and size children + FinalizeReflow(aPresContext, *aReflowState.rendContext, aDesiredSize); + NS_FRAME_SET_TRUNCATION(aStatus, aReflowState, aDesiredSize); + return NS_OK; +} + +// For token elements, mBoundingMetrics is computed at the ReflowToken +// pass, it is not computed here because our children may be text frames +// that do not implement the GetBoundingMetrics() interface. +nsresult +nsMathMLTokenFrame::Place(nsIPresContext* aPresContext, + nsIRenderingContext& aRenderingContext, + PRBool aPlaceOrigin, + nsHTMLReflowMetrics& aDesiredSize) +{ + aDesiredSize.width = aDesiredSize.height = 0; + aDesiredSize.ascent = aDesiredSize.descent = 0; + + const nsStyleFont* font; + GetStyleData(eStyleStruct_Font, (const nsStyleStruct*&)font); + nsCOMPtr fm; + aPresContext->GetMetricsFor(font->mFont, getter_AddRefs(fm)); + nscoord ascent, descent; + fm->GetMaxAscent(ascent); + fm->GetMaxDescent(descent); + + aDesiredSize.mBoundingMetrics = mBoundingMetrics; + aDesiredSize.width = mBoundingMetrics.width; + aDesiredSize.ascent = PR_MAX(mBoundingMetrics.ascent, ascent); + aDesiredSize.descent = PR_MAX(mBoundingMetrics.descent, descent); + aDesiredSize.height = aDesiredSize.ascent + aDesiredSize.descent; + + if (aPlaceOrigin) { + nscoord dy, dx = 0; + nsRect rect; + nsIFrame* childFrame; + FirstChild(aPresContext, nsnull, &childFrame); + while (childFrame) { + childFrame->GetRect(rect); + nsHTMLReflowMetrics childSize(nsnull); + childSize.width = rect.width; + childSize.height = aDesiredSize.height; //rect.height; + + // place and size the child + dy = aDesiredSize.ascent - rect.y; + FinishReflowChild(childFrame, aPresContext, nsnull, childSize, dx, dy, 0); + dx += rect.width; + childFrame->GetNextSibling(&childFrame); + } + } + + SetReference(nsPoint(0, aDesiredSize.ascent)); + + return NS_OK; +} + +NS_IMETHODIMP +nsMathMLTokenFrame::ReflowDirtyChild(nsIPresShell* aPresShell, + nsIFrame* aChild) +{ + // if we get this, it means it was called by the nsTextFrame beneath us, and + // this means something changed in the text content. So re-process our text + + nsCOMPtr presContext; + aPresShell->GetPresContext(getter_AddRefs(presContext)); + ProcessTextData(presContext); + + mState |= NS_FRAME_IS_DIRTY | NS_FRAME_HAS_DIRTY_CHILDREN; + return mParent->ReflowDirtyChild(aPresShell, this); +} + +NS_IMETHODIMP +nsMathMLTokenFrame::AttributeChanged(nsIPresContext* aPresContext, + nsIContent* aContent, + PRInt32 aNameSpaceID, + nsIAtom* aAttribute, + PRInt32 aModType, + PRInt32 aHint) +{ + if (nsMathMLAtoms::lquote_ == aAttribute || + nsMathMLAtoms::rquote_ == aAttribute) { + SetQuotes(aPresContext); + } + + return nsMathMLContainerFrame:: + AttributeChanged(aPresContext, aContent, aNameSpaceID, + aAttribute, aModType, aHint); +} + +void +nsMathMLTokenFrame::ProcessTextData(nsIPresContext* aPresContext) +{ + SetTextStyle(aPresContext); +} + +/////////////////////////////////////////////////////////////////////////// +// For , if the content is not a single character, turn the font to +// normal (this function will also query attributes from the mstyle hierarchy) + +void +nsMathMLTokenFrame::SetTextStyle(nsIPresContext* aPresContext) +{ + nsCOMPtr tag; + mContent->GetTag(*getter_AddRefs(tag)); + if (tag != nsMathMLAtoms::mi_) + return; + + if (!mFrames.FirstChild()) + return; + + // Get the text content that we enclose and its length + // our content can include comment-nodes, attribute-nodes, text-nodes... + // we use the DOM to make sure that we are only looking at text-nodes... + nsAutoString data; + PRInt32 numKids; + mContent->ChildCount(numKids); + for (PRInt32 kid = 0; kid < numKids; kid++) { + nsCOMPtr kidContent; + mContent->ChildAt(kid, *getter_AddRefs(kidContent)); + if (kidContent) { + nsCOMPtr kidText(do_QueryInterface(kidContent)); + if (kidText) { + nsAutoString kidData; + kidText->GetData(kidData); + data += kidData; + } + } + } + + // attributes may override the default behavior + PRInt32 length = data.Length(); + nsAutoString fontstyle; + PRBool restyle = PR_TRUE; + if (NS_CONTENT_ATTR_HAS_VALUE == GetAttribute(mContent, mPresentationData.mstyle, + nsMathMLAtoms::fontstyle_, fontstyle)) + restyle = PR_FALSE; + if (1 == length) { + // our textual content consists of a single character + PRBool isStyleInvariant = nsMathMLOperators::LookupInvariantChar(data[0]); + if (isStyleInvariant) { + // bug 65951 - we always enforce the style to normal for a non-stylable char + // XXX also disable bold type? (makes sense to let the set IR be bold, no?) + fontstyle.Assign(NS_LITERAL_STRING("normal")); + restyle = PR_TRUE; + } + else { + fontstyle.Assign(NS_LITERAL_STRING("italic")); + } + } + else { + // our textual content consists of multiple characters + fontstyle.Assign(NS_LITERAL_STRING("normal")); + } + + // set the -moz-math-font-style attribute without notifying that we want a reflow + if (restyle) + mContent->SetAttr(kNameSpaceID_None, nsMathMLAtoms::fontstyle, fontstyle, PR_FALSE); + + // then, re-resolve the style contexts in our subtree + nsCOMPtr presShell; + aPresContext->GetShell(getter_AddRefs(presShell)); + if (presShell) { + nsCOMPtr fm; + presShell->GetFrameManager(getter_AddRefs(fm)); + if (fm) { + PRInt32 maxChange, minChange = NS_STYLE_HINT_NONE; + nsStyleChangeList changeList; + fm->ComputeStyleChangeFor(aPresContext, this, + kNameSpaceID_None, nsMathMLAtoms::fontstyle, + changeList, minChange, maxChange); + } + } +} + +/////////////////////////////////////////////////////////////////////////// +// For , it is assumed that the mathml.css file contains two rules: +// ms:before { content: open-quote; } +// ms:after { content: close-quote; } +// With these two rules, the frame construction code will +// create inline frames that contain text frames which themselves +// contain the text content of the quotes. +// So the main idea in this code is to see if there are lquote and +// rquote attributes. If these are there, we ovewrite the default +// quotes in the text frames. +// +// But what if the mathml.css file wasn't loaded? +// We also check that we are not relying on null pointers... + +static void +SetQuote(nsIPresContext* aPresContext, + nsIFrame* aFrame, + nsString& aValue) +{ + nsIFrame* textFrame; + do { + // walk down the hierarchy of first children because they could be wrapped + aFrame->FirstChild(aPresContext, nsnull, &textFrame); + if (textFrame) { + nsCOMPtr frameType; + textFrame->GetFrameType(getter_AddRefs(frameType)); + if (frameType == nsLayoutAtoms::textFrame) + break; + } + aFrame = textFrame; + } while (textFrame); + if (textFrame) { + nsCOMPtr quoteContent; + textFrame->GetContent(getter_AddRefs(quoteContent)); + if (quoteContent) { + nsCOMPtr domText(do_QueryInterface(quoteContent)); + if (domText) { + nsCOMPtr tc(do_QueryInterface(quoteContent)); + if (tc) { + tc->SetText(aValue, PR_FALSE); // no notify since we don't want a reflow yet + } + } + } + } +} + +void +nsMathMLTokenFrame::SetQuotes(nsIPresContext* aPresContext) +{ + nsCOMPtr tag; + mContent->GetTag(*getter_AddRefs(tag)); + if (tag != nsMathMLAtoms::ms_) + return; + + nsIFrame* rightFrame = nsnull; + nsIFrame* baseFrame = nsnull; + nsIFrame* leftFrame = mFrames.FirstChild(); + if (leftFrame) + leftFrame->GetNextSibling(&baseFrame); + if (baseFrame) + baseFrame->GetNextSibling(&rightFrame); + if (!leftFrame || !baseFrame || !rightFrame) + return; + + nsAutoString value; + // lquote + if (NS_CONTENT_ATTR_NOT_THERE != GetAttribute(mContent, mPresentationData.mstyle, + nsMathMLAtoms::lquote_, value)) { + SetQuote(aPresContext, leftFrame, value); + } + // rquote + if (NS_CONTENT_ATTR_NOT_THERE != GetAttribute(mContent, mPresentationData.mstyle, + nsMathMLAtoms::rquote_, value)) { + SetQuote(aPresContext, rightFrame, value); + } +} diff --git a/mozilla/layout/mathml/base/src/nsMathMLmiFrame.h b/mozilla/layout/mathml/base/src/nsMathMLTokenFrame.h similarity index 52% rename from mozilla/layout/mathml/base/src/nsMathMLmiFrame.h rename to mozilla/layout/mathml/base/src/nsMathMLTokenFrame.h index 11933e945a4..cd90f2cfd7b 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmiFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLTokenFrame.h @@ -17,25 +17,36 @@ * * Contributor(s): * Roger B. Sidje - * David J. Fiddes */ -#ifndef nsMathMLmiFrame_h___ -#define nsMathMLmiFrame_h___ +#ifndef nsMathMLTokenFrame_h___ +#define nsMathMLTokenFrame_h___ #include "nsCOMPtr.h" #include "nsMathMLContainerFrame.h" // -// -- identifier +// Base class to handle token elements // -class nsMathMLmiFrame : public nsMathMLContainerFrame { +class nsMathMLTokenFrame : public nsMathMLContainerFrame { public: - friend nsresult NS_NewMathMLmiFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame); + friend nsresult NS_NewMathMLTokenFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame); NS_IMETHOD - TransmitAutomaticData(nsIPresContext* aPresContext); + GetFrameType(nsIAtom** aType) const; + + NS_IMETHOD + Init(nsIPresContext* aPresContext, + nsIContent* aContent, + nsIFrame* aParent, + nsIStyleContext* aContext, + nsIFrame* aPrevInFlow); + + NS_IMETHOD + SetInitialChildList(nsIPresContext* aPresContext, + nsIAtom* aListName, + nsIFrame* aChildList); NS_IMETHOD Reflow(nsIPresContext* aPresContext, @@ -53,18 +64,29 @@ public: ReflowDirtyChild(nsIPresShell* aPresShell, nsIFrame* aChild); + NS_IMETHOD + AttributeChanged(nsIPresContext* aPresContext, + nsIContent* aChild, + PRInt32 aNameSpaceID, + nsIAtom* aAttribute, + PRInt32 aModType, + PRInt32 aHint); protected: - nsMathMLmiFrame(); - virtual ~nsMathMLmiFrame(); + nsMathMLTokenFrame(); + virtual ~nsMathMLTokenFrame(); virtual PRIntn GetSkipSides() const { return 0; } - /* needs to switch to a normal-font (rather than italics) if - * its text content is not a single character (as per the MathML REC). - * special care is also needed for style-invariant chars - bug 65951 - */ - void + // hook to perform MathML-specific actions depending on the tag + virtual void ProcessTextData(nsIPresContext* aPresContext); + + // helper to set the style of which has to be italic or normal + // depending on its textual content + void SetTextStyle(nsIPresContext* aPresContext); + + // helper to set the quotes of + void SetQuotes(nsIPresContext* aPresContext); }; -#endif /* nsMathMLmiFrame_h___ */ +#endif /* nsMathMLTokentFrame_h___ */ diff --git a/mozilla/layout/mathml/base/src/nsMathMLmiFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmiFrame.cpp deleted file mode 100644 index 55c8c4a696d..00000000000 --- a/mozilla/layout/mathml/base/src/nsMathMLmiFrame.cpp +++ /dev/null @@ -1,184 +0,0 @@ -/* - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is Mozilla MathML Project. - * - * The Initial Developer of the The Original Code is The University Of - * Queensland. Portions created by The University Of Queensland are - * Copyright (C) 1999 The University Of Queensland. All Rights Reserved. - * - * Contributor(s): - * Roger B. Sidje - * David J. Fiddes - */ - -#include "nsCOMPtr.h" -#include "nsFrame.h" -#include "nsIPresContext.h" -#include "nsUnitConversion.h" -#include "nsIStyleContext.h" -#include "nsStyleConsts.h" -#include "nsIRenderingContext.h" -#include "nsIFontMetrics.h" -#include "nsINameSpaceManager.h" - -#include "nsIDOMText.h" -#include "nsIFrameManager.h" -#include "nsStyleChangeList.h" - -#include "nsMathMLmiFrame.h" - -// -// -- identifier - implementation -// - -nsresult -NS_NewMathMLmiFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame) -{ - NS_PRECONDITION(aNewFrame, "null OUT ptr"); - if (nsnull == aNewFrame) { - return NS_ERROR_NULL_POINTER; - } - nsMathMLmiFrame* it = new (aPresShell) nsMathMLmiFrame; - if (nsnull == it) { - return NS_ERROR_OUT_OF_MEMORY; - } - *aNewFrame = it; - return NS_OK; -} - -nsMathMLmiFrame::nsMathMLmiFrame() -{ -} - -nsMathMLmiFrame::~nsMathMLmiFrame() -{ -} - -static PRBool -IsStyleInvariant(PRUnichar aChar) -{ - return nsMathMLOperators::LookupInvariantChar(aChar); -} - -// if our content is not a single character, we turn the font to normal -void -nsMathMLmiFrame::ProcessTextData(nsIPresContext* aPresContext) -{ - if (!mFrames.FirstChild()) - return; - - // Get the text content that we enclose and its length - // our content can include comment-nodes, attribute-nodes, text-nodes... - // we use the DOM to make sure that we are only looking at text-nodes... - nsAutoString data; - PRInt32 numKids; - mContent->ChildCount(numKids); - for (PRInt32 kid = 0; kid < numKids; kid++) { - nsCOMPtr kidContent; - mContent->ChildAt(kid, *getter_AddRefs(kidContent)); - if (kidContent.get()) { - nsCOMPtr kidText(do_QueryInterface(kidContent)); - if (kidText.get()) { - nsAutoString kidData; - kidText->GetData(kidData); - data += kidData; - } - } - } - - // attributes may override the default behavior - PRInt32 length = data.Length(); - nsAutoString fontstyle; - PRBool restyle = PR_TRUE; - if (NS_CONTENT_ATTR_HAS_VALUE == GetAttribute(mContent, mPresentationData.mstyle, - nsMathMLAtoms::fontstyle_, fontstyle)) - restyle = PR_FALSE; - if (1 == length) { - // our textual content consists of a single character - if (IsStyleInvariant(data[0])) { - // bug 65951 - we always enforce the style to normal for a non-stylable char - // XXX also disable bold type? (makes sense to let the set IR be bold, no?) - fontstyle.Assign(NS_LITERAL_STRING("normal")); - restyle = PR_TRUE; - } - else { - fontstyle.Assign(NS_LITERAL_STRING("italic")); - } - } - else { - // our textual content consists of multiple characters - fontstyle.Assign(NS_LITERAL_STRING("normal")); - } - - // set the -moz-math-font-style attribute without notifying that we want a reflow - if (restyle) - mContent->SetAttr(kNameSpaceID_None, nsMathMLAtoms::fontstyle, fontstyle, PR_FALSE); - - // then, re-resolve the style contexts in our subtree - nsCOMPtr presShell; - aPresContext->GetShell(getter_AddRefs(presShell)); - if (presShell) { - nsCOMPtr fm; - presShell->GetFrameManager(getter_AddRefs(fm)); - if (fm) { - PRInt32 maxChange, minChange = NS_STYLE_HINT_NONE; - nsStyleChangeList changeList; - fm->ComputeStyleChangeFor(aPresContext, this, - kNameSpaceID_None, nsMathMLAtoms::fontstyle, - changeList, minChange, maxChange); - } - } -} - -NS_IMETHODIMP -nsMathMLmiFrame::TransmitAutomaticData(nsIPresContext* aPresContext) -{ - // re-style our content depending on what it is - // (this will query attributes from the mstyle hierarchy) - ProcessTextData(aPresContext); - return NS_OK; -} - -NS_IMETHODIMP -nsMathMLmiFrame::Reflow(nsIPresContext* aPresContext, - nsHTMLReflowMetrics& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus) -{ - return ReflowTokenFor(this, aPresContext, aDesiredSize, - aReflowState, aStatus); -} - -NS_IMETHODIMP -nsMathMLmiFrame::Place(nsIPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - PRBool aPlaceOrigin, - nsHTMLReflowMetrics& aDesiredSize) -{ - return PlaceTokenFor(this, aPresContext, aRenderingContext, - aPlaceOrigin, aDesiredSize); -} - -NS_IMETHODIMP -nsMathMLmiFrame::ReflowDirtyChild(nsIPresShell* aPresShell, - nsIFrame* aChild) -{ - // if we get this, it means it was called by the nsTextFrame beneath us, and - // this means something changed in the text content. So re-process our text - - nsCOMPtr presContext; - aPresShell->GetPresContext(getter_AddRefs(presContext)); - ProcessTextData(presContext); - - mState |= NS_FRAME_IS_DIRTY | NS_FRAME_HAS_DIRTY_CHILDREN; - return mParent->ReflowDirtyChild(aPresShell, this); -} diff --git a/mozilla/layout/mathml/base/src/nsMathMLmoFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmoFrame.cpp index 85f86e101d4..4e33ddf414d 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmoFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmoFrame.cpp @@ -156,8 +156,8 @@ nsMathMLmoFrame::Paint(nsIPresContext* aPresContext, if (!useMathMLChar || NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer) { // let the base class paint the background, border, outline - rv = nsMathMLContainerFrame::Paint(aPresContext, aRenderingContext, - aDirtyRect, aWhichLayer); + rv = nsMathMLTokenFrame::Paint(aPresContext, aRenderingContext, + aDirtyRect, aWhichLayer); } if (useMathMLChar) { // make our char selected if our inner child text frame is selected @@ -927,29 +927,13 @@ nsMathMLmoFrame::Stretch(nsIPresContext* aPresContext, return NS_OK; } -NS_IMETHODIMP -nsMathMLmoFrame::SetInitialChildList(nsIPresContext* aPresContext, - nsIAtom* aListName, - nsIFrame* aChildList) -{ - // First, let the base class do its work - nsresult rv = nsMathMLContainerFrame::SetInitialChildList(aPresContext, aListName, aChildList); - if (NS_FAILED(rv)) return rv; - - // No need to tract the style context given to our MathML char. - // The Style System will use Get/SetAdditionalStyleContext() to keep it - // up-to-date if dynamic changes arise. - ProcessTextData(aPresContext); - return rv; -} - NS_IMETHODIMP nsMathMLmoFrame::InheritAutomaticData(nsIPresContext* aPresContext, nsIFrame* aParent) { // retain our native direction, it only changes if our text content changes nsStretchDirection direction = mEmbellishData.direction; - nsMathMLContainerFrame::InheritAutomaticData(aPresContext, aParent); + nsMathMLTokenFrame::InheritAutomaticData(aPresContext, aParent); mEmbellishData.direction = direction; return NS_OK; } @@ -974,18 +958,8 @@ nsMathMLmoFrame::Reflow(nsIPresContext* aPresContext, // certain values use units that depend on our style context, so // it is safer to just process the whole lot here ProcessOperatorData(aPresContext); - return ReflowTokenFor(this, aPresContext, aDesiredSize, - aReflowState, aStatus); -} - -NS_IMETHODIMP -nsMathMLmoFrame::Place(nsIPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - PRBool aPlaceOrigin, - nsHTMLReflowMetrics& aDesiredSize) -{ - return PlaceTokenFor(this, aPresContext, aRenderingContext, - aPlaceOrigin, aDesiredSize); + return nsMathMLTokenFrame::Reflow(aPresContext, aDesiredSize, + aReflowState, aStatus); } NS_IMETHODIMP @@ -1039,12 +1013,13 @@ nsMathMLmoFrame::AttributeChanged(nsIPresContext* aPresContext, return ReLayoutChildren(aPresContext, target); } - return nsMathMLContainerFrame:: + return nsMathMLTokenFrame:: AttributeChanged(aPresContext, aContent, aNameSpaceID, aAttribute, aModType, aHint); } // ---------------------- +// No need to tract the style context given to our MathML char. // the Style System will use these to pass the proper style context to our MathMLChar NS_IMETHODIMP nsMathMLmoFrame::GetAdditionalStyleContext(PRInt32 aIndex, diff --git a/mozilla/layout/mathml/base/src/nsMathMLmoFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmoFrame.h index eaa2d90cfd1..c1d7e4dd246 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmoFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLmoFrame.h @@ -25,13 +25,13 @@ #define nsMathMLmoFrame_h___ #include "nsCOMPtr.h" -#include "nsMathMLContainerFrame.h" +#include "nsMathMLTokenFrame.h" // // -- operator, fence, or separator // -class nsMathMLmoFrame : public nsMathMLContainerFrame { +class nsMathMLmoFrame : public nsMathMLTokenFrame { public: friend nsresult NS_NewMathMLmoFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame); @@ -45,11 +45,6 @@ public: GetAdditionalStyleContext(PRInt32 aIndex, nsIStyleContext** aStyleContext) const; - NS_IMETHOD - SetInitialChildList(nsIPresContext* aPresContext, - nsIAtom* aListName, - nsIFrame* aChildList); - NS_IMETHOD Paint(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, @@ -70,12 +65,6 @@ public: const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus); - NS_IMETHOD - Place(nsIPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - PRBool aPlaceOrigin, - nsHTMLReflowMetrics& aDesiredSize); - NS_IMETHOD ReflowDirtyChild(nsIPresShell* aPresShell, nsIFrame* aChild); @@ -108,8 +97,8 @@ protected: float mMinSize; float mMaxSize; - // helper to get the text that we enclose and setup our nsMathMLChar - void + // overload the base method so that we can setup our nsMathMLChar + virtual void ProcessTextData(nsIPresContext* aPresContext); // helper to get our 'form' and lookup in the Operator Dictionary to fetch diff --git a/mozilla/layout/mathml/base/src/nsMathMLmsFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmsFrame.cpp deleted file mode 100644 index db94415e16c..00000000000 --- a/mozilla/layout/mathml/base/src/nsMathMLmsFrame.cpp +++ /dev/null @@ -1,156 +0,0 @@ -/* - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is Mozilla MathML Project. - * - * The Initial Developer of the Original Code is The University Of - * Queensland. Portions created by The University Of Queensland are - * Copyright (C) 1999 The University Of Queensland. All Rights Reserved. - * - * Contributor(s): - * Roger B. Sidje - */ - - -#include "nsCOMPtr.h" -#include "nsFrame.h" -#include "nsIPresContext.h" -#include "nsUnitConversion.h" -#include "nsIStyleContext.h" -#include "nsStyleConsts.h" -#include "nsIRenderingContext.h" -#include "nsIFontMetrics.h" - -#include "nsIDOMText.h" -#include "nsITextContent.h" -#include "nsLayoutAtoms.h" - -#include "nsMathMLmsFrame.h" - -// -// -- string literal - implementation -// - -nsresult -NS_NewMathMLmsFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame) -{ - NS_PRECONDITION(aNewFrame, "null OUT ptr"); - if (nsnull == aNewFrame) { - return NS_ERROR_NULL_POINTER; - } - nsMathMLmsFrame* it = new (aPresShell) nsMathMLmsFrame; - if (nsnull == it) { - return NS_ERROR_OUT_OF_MEMORY; - } - *aNewFrame = it; - return NS_OK; -} - -nsMathMLmsFrame::nsMathMLmsFrame() -{ -} - -nsMathMLmsFrame::~nsMathMLmsFrame() -{ -} - -static void -SetQuote(nsIPresContext* aPresContext, - nsIFrame* aFrame, - nsString& aValue) -{ - nsIFrame* textFrame; - do { - // walk down the hierarchy of first children because they could be wrapped - aFrame->FirstChild(aPresContext, nsnull, &textFrame); - if (textFrame) { - nsCOMPtr frameType; - textFrame->GetFrameType(getter_AddRefs(frameType)); - if (frameType && frameType.get() == nsLayoutAtoms::textFrame) - break; - } - aFrame = textFrame; - } while (textFrame); - if (textFrame) { - nsCOMPtr quoteContent; - textFrame->GetContent(getter_AddRefs(quoteContent)); - if (quoteContent.get()) { - nsCOMPtr domText(do_QueryInterface(quoteContent)); - if (domText.get()) { - nsCOMPtr tc(do_QueryInterface(quoteContent)); - if (tc) { - tc->SetText(aValue, PR_FALSE); // no notify since we don't want a reflow yet - } - } - } - } -} - -NS_IMETHODIMP -nsMathMLmsFrame::TransmitAutomaticData(nsIPresContext* aPresContext) -{ - // It is assumed that the mathml.css file contains two rules: - // ms:before { content: open-quote; } - // ms:after { content: close-quote; } - // With these two rules, the frame construction code will - // create inline frames that contain text frames which themselves - // contain the text content of the quotes. - // So the main idea in this code is to see if there are lquote and - // rquote attributes. If these are there, we ovewrite the default - // quotes in the text frames. - - // But what if the mathml.css file wasn't loaded? - // We also check that we are not relying on null pointers... - - nsIFrame* rightFrame = nsnull; - nsIFrame* baseFrame = nsnull; - nsIFrame* leftFrame = mFrames.FirstChild(); - if (leftFrame) - leftFrame->GetNextSibling(&baseFrame); - if (baseFrame) - baseFrame->GetNextSibling(&rightFrame); - if (!leftFrame || !baseFrame || !rightFrame) - return NS_OK; - - nsAutoString value; - // lquote - if (NS_CONTENT_ATTR_NOT_THERE != GetAttribute(mContent, mPresentationData.mstyle, - nsMathMLAtoms::lquote_, value)) { - SetQuote(aPresContext, leftFrame, value); - } - // rquote - if (NS_CONTENT_ATTR_NOT_THERE != GetAttribute(mContent, mPresentationData.mstyle, - nsMathMLAtoms::rquote_, value)) { - SetQuote(aPresContext, rightFrame, value); - } - - return NS_OK; -} - -NS_IMETHODIMP -nsMathMLmsFrame::AttributeChanged(nsIPresContext* aPresContext, - nsIContent* aContent, - PRInt32 aNameSpaceID, - nsIAtom* aAttribute, - PRInt32 aModType, - PRInt32 aHint) -{ - if (nsMathMLAtoms::lquote_ == aAttribute || - nsMathMLAtoms::rquote_ == aAttribute) { - // When the automatic data to update are only within our - // children, we just re-layout them - return ReLayoutChildren(aPresContext, this); - } - - return nsMathMLContainerFrame:: - AttributeChanged(aPresContext, aContent, aNameSpaceID, - aAttribute, aModType, aHint); -} diff --git a/mozilla/layout/mathml/base/src/nsMathMLmsFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmsFrame.h deleted file mode 100644 index 65ebd128463..00000000000 --- a/mozilla/layout/mathml/base/src/nsMathMLmsFrame.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is Mozilla MathML Project. - * - * The Initial Developer of the Original Code is The University Of - * Queensland. Portions created by The University Of Queensland are - * Copyright (C) 1999 The University Of Queensland. All Rights Reserved. - * - * Contributor(s): - * Roger B. Sidje - */ - -#ifndef nsMathMLmsFrame_h___ -#define nsMathMLmsFrame_h___ - -#include "nsCOMPtr.h" -#include "nsMathMLContainerFrame.h" - -// -// -- string literal -// - -class nsMathMLmsFrame : public nsMathMLContainerFrame { -public: - friend nsresult NS_NewMathMLmsFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame); - - NS_IMETHOD - TransmitAutomaticData(nsIPresContext* aPresContext); - - NS_IMETHOD - AttributeChanged(nsIPresContext* aPresContext, - nsIContent* aChild, - PRInt32 aNameSpaceID, - nsIAtom* aAttribute, - PRInt32 aModType, - PRInt32 aHint); - -protected: - nsMathMLmsFrame(); - virtual ~nsMathMLmsFrame(); - - virtual PRIntn GetSkipSides() const { return 0; } -}; - -#endif /* nsMathMLmsFrame_h___ */ diff --git a/mozilla/layout/mathml/base/src/nsMathMLmtextFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmtextFrame.cpp deleted file mode 100644 index 8db762ef306..00000000000 --- a/mozilla/layout/mathml/base/src/nsMathMLmtextFrame.cpp +++ /dev/null @@ -1,78 +0,0 @@ -/* - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is Mozilla MathML Project. - * - * The Initial Developer of the The Original Code is The University Of - * Queensland. Portions created by The University Of Queensland are - * Copyright (C) 1999 The University Of Queensland. All Rights Reserved. - * - * Contributor(s): - * Roger B. Sidje - */ - -#include "nsCOMPtr.h" -#include "nsFrame.h" -#include "nsIPresContext.h" -#include "nsUnitConversion.h" -#include "nsIStyleContext.h" -#include "nsStyleConsts.h" -#include "nsIRenderingContext.h" -#include "nsIFontMetrics.h" - -#include "nsMathMLmtextFrame.h" - -// -// -- text - implementation -// - -nsresult -NS_NewMathMLmtextFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame) -{ - NS_PRECONDITION(aNewFrame, "null OUT ptr"); - if (nsnull == aNewFrame) { - return NS_ERROR_NULL_POINTER; - } - nsMathMLmtextFrame* it = new (aPresShell) nsMathMLmtextFrame; - if (nsnull == it) { - return NS_ERROR_OUT_OF_MEMORY; - } - *aNewFrame = it; - return NS_OK; -} - -nsMathMLmtextFrame::nsMathMLmtextFrame() -{ -} - -nsMathMLmtextFrame::~nsMathMLmtextFrame() -{ -} - -NS_IMETHODIMP -nsMathMLmtextFrame::Reflow(nsIPresContext* aPresContext, - nsHTMLReflowMetrics& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus) -{ - return ReflowTokenFor(this, aPresContext, aDesiredSize, - aReflowState, aStatus); -} - -NS_IMETHODIMP -nsMathMLmtextFrame::Place(nsIPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - PRBool aPlaceOrigin, - nsHTMLReflowMetrics& aDesiredSize) -{ - return PlaceTokenFor(this, aPresContext, aRenderingContext, - aPlaceOrigin, aDesiredSize); -} diff --git a/mozilla/layout/mathml/base/src/nsMathMLmtextFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmtextFrame.h deleted file mode 100644 index 72335be3371..00000000000 --- a/mozilla/layout/mathml/base/src/nsMathMLmtextFrame.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is Mozilla MathML Project. - * - * The Initial Developer of the Original Code is The University Of - * Queensland. Portions created by The University Of Queensland are - * Copyright (C) 1999 The University Of Queensland. All Rights Reserved. - * - * Contributor(s): - * Roger B. Sidje - */ - -#ifndef nsMathMLmtextFrame_h___ -#define nsMathMLmtextFrame_h___ - -#include "nsCOMPtr.h" -#include "nsMathMLContainerFrame.h" - -// -// -- text -// - -class nsMathMLmtextFrame : public nsMathMLContainerFrame { -public: - friend nsresult NS_NewMathMLmtextFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame); - - NS_IMETHOD - Reflow(nsIPresContext* aPresContext, - nsHTMLReflowMetrics& aDesiredSize, - const nsHTMLReflowState& aReflowState, - nsReflowStatus& aStatus); - - NS_IMETHOD - Place(nsIPresContext* aPresContext, - nsIRenderingContext& aRenderingContext, - PRBool aPlaceOrigin, - nsHTMLReflowMetrics& aDesiredSize); - -protected: - nsMathMLmtextFrame(); - virtual ~nsMathMLmtextFrame(); - - virtual PRIntn GetSkipSides() const { return 0; } -}; - -#endif /* nsMathMLmtextFrame_h___ */