author | Frédéric Wang <fred.wang@free.fr> |
Wed, 23 Apr 2014 06:57:41 -0700 | |
changeset 179766 | cb4deaae3336865e25b83a42a8d2a130d93ea659 |
parent 179765 | bfd16de7bf251bb0184a3f4baf6c76552abc8dc1 |
child 179767 | de506f4610749e5082f238768635da06d12e204f |
push id | 26639 |
push user | ryanvm@gmail.com |
push date | Wed, 23 Apr 2014 20:42:51 +0000 |
treeherder | mozilla-central@ed0236a51ed3 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | karlt |
bugs | 407059 |
milestone | 31.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/layout/mathml/nsMathMLChar.cpp +++ b/layout/mathml/nsMathMLChar.cpp @@ -958,18 +958,16 @@ private: // Always updates the char if a better match is found. bool nsMathMLChar::StretchEnumContext::TryVariants(nsGlyphTable* aGlyphTable, const nsAString& aFamily) { // Use our stretchy style context now that stretching is in progress nsStyleContext *sc = mChar->mStyleContext; nsFont font = sc->StyleFont()->mFont; - // Ensure SetFontFamily will set the font - font.name.Truncate(); bool isVertical = (mDirection == NS_STRETCH_DIRECTION_VERTICAL); bool largeop = (NS_STRETCH_LARGEOP & mStretchHint) != 0; bool largeopOnly = largeop && (NS_STRETCH_VARIABLE_MASK & mStretchHint) == 0; bool maxWidth = (NS_STRETCH_MAXWIDTH & mStretchHint) != 0; nscoord bestSize = @@ -1059,18 +1057,16 @@ nsMathMLChar::StretchEnumContext::TryPar { if (!aGlyphTable->HasPartsOf(mChar->mData[0])) return false; // to next table // See if the parts of this table fit in the desired space ////////////////// // Use our stretchy style context now that stretching is in progress nsFont font = mChar->mStyleContext->StyleFont()->mFont; - // Ensure SetFontFamily will set the font - font.name.Truncate(); // Compute the bounding metrics of all partial glyphs nsAutoPtr<gfxTextRun> textRun[4]; nsGlyphCode chdata[4]; nsBoundingMetrics bmdata[4]; nscoord sizedata[4]; bool isVertical = (mDirection == NS_STRETCH_DIRECTION_VERTICAL);