☠☠ backed out by 7c7dc8193692 ☠ ☠ | |
author | L. David Baron <dbaron@dbaron.org> |
Tue, 15 Nov 2011 17:02:00 +1300 | |
changeset 80254 | 74f32abaa8c0b03f89df765fd071f27ddf454251 |
parent 80253 | 46669afabd153fb9b1db2ec5eaffc8a5ccb8edba |
child 80255 | f197554cf98965efdfafa9b7c7b9d0c2b04c7a25 |
push id | 21481 |
push user | bmo@edmorley.co.uk |
push date | Tue, 15 Nov 2011 19:07:44 +0000 |
treeherder | mozilla-central@fd478c02c29c [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | roc |
bugs | 627842 |
milestone | 11.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
|
layout/base/nsLayoutUtils.cpp | file | annotate | diff | comparison | revisions | |
layout/base/nsLayoutUtils.h | file | annotate | diff | comparison | revisions |
--- a/layout/base/nsLayoutUtils.cpp +++ b/layout/base/nsLayoutUtils.cpp @@ -1923,32 +1923,36 @@ nsLayoutUtils::GetTextShadowRectsUnion(c resultRect.UnionRect(resultRect, tmpRect); } return resultRect; } nsresult nsLayoutUtils::GetFontMetricsForFrame(const nsIFrame* aFrame, - nsFontMetrics** aFontMetrics) + nsFontMetrics** aFontMetrics, + float aInflation) { return nsLayoutUtils::GetFontMetricsForStyleContext(aFrame->GetStyleContext(), - aFontMetrics); + aFontMetrics, + aInflation); } nsresult nsLayoutUtils::GetFontMetricsForStyleContext(nsStyleContext* aStyleContext, - nsFontMetrics** aFontMetrics) + nsFontMetrics** aFontMetrics, + float aInflation) { // pass the user font set object into the device context to pass along to CreateFontGroup gfxUserFontSet* fs = aStyleContext->PresContext()->GetUserFontSet(); + nsFont font = aStyleContext->GetStyleFont()->mFont; + font.size = NSToCoordRound(font.size * aInflation); return aStyleContext->PresContext()->DeviceContext()->GetMetricsFor( - aStyleContext->GetStyleFont()->mFont, - aStyleContext->GetStyleVisibility()->mLanguage, + font, aStyleContext->GetStyleVisibility()->mLanguage, fs, *aFontMetrics); } nsIFrame* nsLayoutUtils::FindChildContainingDescendant(nsIFrame* aParent, nsIFrame* aDescendantFrame) { nsIFrame* result = aDescendantFrame;
--- a/layout/base/nsLayoutUtils.h +++ b/layout/base/nsLayoutUtils.h @@ -737,29 +737,33 @@ public: static nsRect GetTextShadowRectsUnion(const nsRect& aTextAndDecorationsRect, nsIFrame* aFrame, PRUint32 aFlags = 0); /** * Get the font metrics corresponding to the frame's style data. * @param aFrame the frame * @param aFontMetrics the font metrics result + * @param aSizeInflation number to multiply font size by * @return success or failure code */ static nsresult GetFontMetricsForFrame(const nsIFrame* aFrame, - nsFontMetrics** aFontMetrics); + nsFontMetrics** aFontMetrics, + float aSizeInflation = 1.0f); /** * Get the font metrics corresponding to the given style data. * @param aStyleContext the style data * @param aFontMetrics the font metrics result + * @param aSizeInflation number to multiply font size by * @return success or failure code */ static nsresult GetFontMetricsForStyleContext(nsStyleContext* aStyleContext, - nsFontMetrics** aFontMetrics); + nsFontMetrics** aFontMetrics, + float aSizeInflation = 1.0f); /** * Find the immediate child of aParent whose frame subtree contains * aDescendantFrame. Returns null if aDescendantFrame is not a descendant * of aParent. */ static nsIFrame* FindChildContainingDescendant(nsIFrame* aParent, nsIFrame* aDescendantFrame);