corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge m-c to graphics

Browse Source 
MozReview-Commit-ID: 3tWI3srj2uj
This commit is contained in:
Kartikaya Gupta
2017-02-01 08:48:31 -05:00
parent 610775e692 d5d481f3a6
commit bf02e9ff78
552 changed files with 25263 additions and 24337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
layout/base/nsLayoutUtils.cpp
View File

@@ -5733,13 +5733,14 @@ nsLayoutUtils::AppUnitBoundsOfString(const char16_t* aString,
}
void
nsLayoutUtils::DrawString(const nsIFrame* aFrame,
nsFontMetrics& aFontMetrics,
nsRenderingContext* aContext,
const char16_t* aString,
int32_t aLength,
nsPoint aPoint,
nsStyleContext* aStyleContext)
nsLayoutUtils::DrawString(const nsIFrame* aFrame,
nsFontMetrics& aFontMetrics,
nsRenderingContext* aContext,
const char16_t* aString,
int32_t aLength,
nsPoint aPoint,
nsStyleContext* aStyleContext,
DrawStringFlags aFlags)
{
nsresult rv = NS_ERROR_FAILURE;
@@ -5747,7 +5748,13 @@ nsLayoutUtils::DrawString(const nsIFrame* aFrame,
if (!aStyleContext) {
aStyleContext = aFrame->StyleContext();
}
aFontMetrics.SetVertical(WritingMode(aStyleContext).IsVertical());
if (aFlags & DrawStringFlags::eForceHorizontal) {
aFontMetrics.SetVertical(false);
} else {
aFontMetrics.SetVertical(WritingMode(aStyleContext).IsVertical());
}
aFontMetrics.SetTextOrientation(
aStyleContext->StyleVisibility()->mTextOrientation);